svn commit: r218036 - stable/7/sys/gnu/fs/ext2fs

[John Baldwin]

Author: jhb
Date: Fri Jan 28 20:22:03 2011
New Revision: 218036
URL: http://svn.freebsd.org/changeset/base/218036

Log:
  MFC 217702:
  Restore support for the 'async' and 'sync' mount options lost when
  switching to nmount(2).  While here, sort the options.

Modified:
  stable/7/sys/gnu/fs/ext2fs/ext2_vfsops.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/gnu/fs/ext2fs/ext2_vfsops.c
==============================================================================
--- stable/7/sys/gnu/fs/ext2fs/ext2_vfsops.c	Fri Jan 28 20:21:41 2011	(r218035)
+++ stable/7/sys/gnu/fs/ext2fs/ext2_vfsops.c	Fri Jan 28 20:22:03 2011	(r218036)
@@ -114,9 +114,9 @@ static int	ext2_check_sb_compat(struct e
 static int	compute_sb_data(struct vnode * devvp,
 		    struct ext2_super_block * es, struct ext2_sb_info * fs);
 
-static const char *ext2_opts[] = { "from", "export", "acls", "noexec",
-    "noatime", "union", "suiddir", "multilabel", "nosymfollow",
-    "noclusterr", "noclusterw", "force", NULL };
+static const char *ext2_opts[] = { "acls", "async", "noatime", "noclusterr", 
+    "noclusterw", "noexec", "export", "force", "from", "multilabel",
+    "suiddir", "nosymfollow", "sync", "union", NULL };
 
 /*
  * VFS Operations.