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

1 files changed, 0 insertions, 10 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);