emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mkswap: do not do extra seek

Browse Source 
mount: add another mount helper call method
This commit is contained in:
Denis Vlasenko 2008-02-03 23:52:41 +00:00
parent c85bfcad52
commit 32d49bc70f
3 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
util-linux/Config.in
View File

@ -392,9 +392,11 @@ config FEATURE_MOUNT_HELPERS
depends on MOUNT depends on MOUNT
help help
Enable mounting of virtual file systems via external helpers. Enable mounting of virtual file systems via external helpers.
E.g. mount obexfs#-b00.11.22.33.44.55 /mnt will in effect call E.g. "mount obexfs#-b00.11.22.33.44.55 /mnt" will in effect call
obexfs -b00.11.22.33.44.55 /mnt "obexfs -b00.11.22.33.44.55 /mnt"
The idea is to use such virtual filesystems in /etc/fstab Also "mount -t sometype [-o opts] fs /mnt" will try
"sometype [-o opts] fs /mnt" if simple mount syscall fails.
The idea is to use such virtual filesystems in /etc/fstab.
config FEATURE_MOUNT_NFS config FEATURE_MOUNT_NFS
bool "Support mounting NFS file systems" bool "Support mounting NFS file systems"

2
util-linux/mkswap.c
View File

@ -66,7 +66,9 @@ int mkswap_main(int argc, char **argv)
fd = xopen(argv[1], O_RDWR); fd = xopen(argv[1], O_RDWR);
/* fdlength was reported to be unreliable - use seek */ /* fdlength was reported to be unreliable - use seek */
len = xlseek(fd, 0, SEEK_END); len = xlseek(fd, 0, SEEK_END);
#if ENABLE_SELINUX
xlseek(fd, 0, SEEK_SET); xlseek(fd, 0, SEEK_SET);
#endif
pagesize = getpagesize(); pagesize = getpagesize();
printf("Setting up swapspace version 1, size = %"OFF_FMT"u bytes\n", printf("Setting up swapspace version 1, size = %"OFF_FMT"u bytes\n",
len - pagesize); len - pagesize);

21
util-linux/mount.c
View File

@ -309,6 +309,27 @@ static int mount_it_now(struct mntent *mp, int vfsflags, char *filteropts)
for (;;) { for (;;) {
rc = mount(mp->mnt_fsname, mp->mnt_dir, mp->mnt_type, rc = mount(mp->mnt_fsname, mp->mnt_dir, mp->mnt_type,
vfsflags, filteropts); vfsflags, filteropts);
// If mount failed, try
// helper program <mnt_type>
if (ENABLE_FEATURE_MOUNT_HELPERS && rc) {
char *args[6];
int errno_save = errno;
args[0] = mp->mnt_type;
rc = 1;
if (filteropts) {
args[rc++] = (char *)"-o";
args[rc++] = filteropts;
}
args[rc++] = mp->mnt_fsname;
args[rc++] = mp->mnt_dir;
args[rc] = NULL;
rc = wait4pid(spawn(args));
if (!rc)
break;
errno = errno_save;
}
if (!rc || (vfsflags & MS_RDONLY) || (errno != EACCES && errno != EROFS)) if (!rc || (vfsflags & MS_RDONLY) || (errno != EACCES && errno != EROFS))
break; break;
if (!(vfsflags & MS_SILENT)) if (!(vfsflags & MS_SILENT))