diff options
| author | rodrigc <rodrigc@FreeBSD.org> | 2006-06-01 02:25:00 +0000 |
|---|---|---|
| committer | rodrigc <rodrigc@FreeBSD.org> | 2006-06-01 02:25:00 +0000 |
| commit | f00265f1ccdb2962efbd975f701707ee440c3d2c (patch) | |
| tree | f0d42e1a04e4b5102490929afe44c9f5d09cc9b9 | |
| parent | 987bc104a2f8192f833a6c6a6760b0707e1afa43 (diff) | |
| download | FreeBSD-src-f00265f1ccdb2962efbd975f701707ee440c3d2c.zip FreeBSD-src-f00265f1ccdb2962efbd975f701707ee440c3d2c.tar.gz | |
mount_msdosfs.c:
- remove call to getmntopts(), and just pass -o options to
nmount(). This removes some confusion as to what options
msdosfs can parse, by pushing the responsibility of option parsing
to the VFS and FS specific code in the kernel.
msdosfs_vfsops.c:
- add "force" and "sync" to msdosfs_opts. They used to be specified
in mount_msdosfs.c, so move them here. It's not clear whethere these
options should be placed into global_opts in vfs_mount.c or not.
Motivated by: marcus
| -rw-r--r-- | sbin/mount_msdosfs/mount_msdosfs.c | 10 | ||||
| -rw-r--r-- | sys/fs/msdosfs/msdosfs_vfsops.c | 2 |
2 files changed, 1 insertions, 11 deletions
diff --git a/sbin/mount_msdosfs/mount_msdosfs.c b/sbin/mount_msdosfs/mount_msdosfs.c index a4e29d8..e0c056a 100644 --- a/sbin/mount_msdosfs/mount_msdosfs.c +++ b/sbin/mount_msdosfs/mount_msdosfs.c @@ -57,14 +57,6 @@ static const char rcsid[] = #include "mntopts.h" -static struct mntopt mopts[] = { - MOPT_STDOPTS, - MOPT_FORCE, - MOPT_SYNC, - MOPT_UPDATE, - MOPT_END -}; - static gid_t a_gid(char *); static uid_t a_uid(char *); static mode_t a_mask(char *); @@ -78,7 +70,6 @@ main(int argc, char **argv) int iovlen = 0; struct stat sb; int c, mntflags, set_gid, set_uid, set_mask, set_dirmask; - int optflags = 0; char *dev, *dir, mntpath[MAXPATHLEN], *csp; char fstype[] = "msdosfs"; char *cs_dos = NULL; @@ -136,7 +127,6 @@ main(int argc, char **argv) case 'o': { char *p = NULL; char *val = strdup(""); - getmntopts(optarg, mopts, &mntflags, &optflags); p = strchr(optarg, '='); if (p != NULL) { free(val); diff --git a/sys/fs/msdosfs/msdosfs_vfsops.c b/sys/fs/msdosfs/msdosfs_vfsops.c index a07b567..c9efa90 100644 --- a/sys/fs/msdosfs/msdosfs_vfsops.c +++ b/sys/fs/msdosfs/msdosfs_vfsops.c @@ -79,7 +79,7 @@ /* List of mount options we support */ static const char *msdosfs_opts[] = { "from", - "export", + "export", "force", "sync", "uid", "gid", "mask", "dirmask", "shortname", "shortnames", "longname", "longnames", "nowin95", "win95", "kiconv", "cs_win", "cs_dos", "cs_local", |
