PERFORCE change 171981 for review

[Edward Tomasz Napierala]

http://p4web.freebsd.org/chv.cgi?CH=171981

Change 171981 by trasz at trasz_victim on 2009/12/20 14:43:21

	NFSv4 is generally spelled with 'v', so s/nfs4acls/nfsv4acls/.

Affected files ...

.. //depot/projects/soc2008/trasz_nfs4acl/sbin/dumpfs/dumpfs.c#5 edit
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/mount/mntopts.h#3 edit
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/mount/mount.8#10 edit
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/mount/mount.c#11 edit
.. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ffs/ffs_vfsops.c#26 edit
.. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/02.t#6 edit

Differences ...

==== //depot/projects/soc2008/trasz_nfs4acl/sbin/dumpfs/dumpfs.c#5 (text+ko) ====

@@ -252,7 +252,7 @@
 	if (fsflags & FS_FLAGS_UPDATED)
 		printf("fs_flags expanded ");
 	if (fsflags & FS_NFS4ACLS)
-		printf("nfs4acls ");
+		printf("nfsv4acls ");
 	fsflags &= ~(FS_UNCLEAN | FS_DOSOFTDEP | FS_NEEDSFSCK | FS_INDEXDIRS |
 		     FS_ACLS | FS_MULTILABEL | FS_GJOURNAL | FS_FLAGS_UPDATED |
 		     FS_NFS4ACLS);

==== //depot/projects/soc2008/trasz_nfs4acl/sbin/mount/mntopts.h#3 (text+ko) ====

@@ -54,7 +54,7 @@
 #define MOPT_SNAPSHOT		{ "snapshot",	0, MNT_SNAPSHOT, 0 }
 #define MOPT_MULTILABEL		{ "multilabel",	0, MNT_MULTILABEL, 0 }
 #define MOPT_ACLS		{ "acls",	0, MNT_ACLS, 0 }
-#define MOPT_NFS4ACLS		{ "nfs4acls",	0, MNT_NFS4ACLS, 0 }
+#define MOPT_NFS4ACLS		{ "nfsv4acls",	0, MNT_NFS4ACLS, 0 }
 
 /* Control flags. */
 #define MOPT_FORCE		{ "force",	0, MNT_FORCE, 0 }

==== //depot/projects/soc2008/trasz_nfs4acl/sbin/mount/mount.8#10 (text+ko) ====

@@ -126,7 +126,7 @@
 .Xr getfacl 1
 commands.
 This flag is mutually exclusive with
-.Cm nfs4acls
+.Cm nfsv4acls
 flag.
 .It Cm async
 All
@@ -189,7 +189,7 @@
 .Xr mac 4
 for more information, which cause the multilabel mount flag to be set
 automatically at mount-time.
-.It Cm nfs4acls
+.It Cm nfsv4acls
 Enable NFSv4 ACLs, which can be customized via the
 .Xr setfacl 1
 and

==== //depot/projects/soc2008/trasz_nfs4acl/sbin/mount/mount.c#11 (text+ko) ====

@@ -111,7 +111,7 @@
 	{ MNT_SOFTDEP,		"soft-updates" },
 	{ MNT_MULTILABEL,	"multilabel" },
 	{ MNT_ACLS,		"acls" },
-	{ MNT_NFS4ACLS,		"nfs4acls" },
+	{ MNT_NFS4ACLS,		"nfsv4acls" },
 	{ MNT_GJOURNAL,		"gjournal" },
 	{ 0, NULL }
 };
@@ -919,7 +919,7 @@
 	if (flags & MNT_SUIDDIR)	res = catopt(res, "suiddir");
 	if (flags & MNT_MULTILABEL)	res = catopt(res, "multilabel");
 	if (flags & MNT_ACLS)		res = catopt(res, "acls");
-	if (flags & MNT_NFS4ACLS)	res = catopt(res, "nfs4acls");
+	if (flags & MNT_NFS4ACLS)	res = catopt(res, "nfsv4acls");
 
 	return (res);
 }

==== //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ffs/ffs_vfsops.c#26 (text+ko) ====

@@ -128,7 +128,7 @@
 static const char *ffs_opts[] = { "acls", "async", "noatime", "noclusterr",
     "noclusterw", "noexec", "export", "force", "from", "multilabel", 
     "snapshot", "nosuid", "suiddir", "nosymfollow", "sync",
-    "union", "nfs4acls", NULL };
+    "union", "nfsv4acls", NULL };
 
 static int
 ffs_mount(struct mount *mp)
@@ -177,9 +177,9 @@
 		vfs_deleteopt(mp->mnt_opt, "snapshot");
 	}
 
-	if (vfs_getopt(mp->mnt_optnew, "nfs4acls", NULL, NULL) == 0) {
+	if (vfs_getopt(mp->mnt_optnew, "nfsv4acls", NULL, NULL) == 0) {
 		if (mntorflags & MNT_ACLS) {
-			printf("WARNING: \"acls\" and \"nfs4acls\" "
+			printf("WARNING: \"acls\" and \"nfsv4acls\" "
 			    "options are mutually exclusive\n");
 			return (EINVAL);
 		}
@@ -853,7 +853,7 @@
 
 		if (mp->mnt_flag & MNT_NFS4ACLS)
 			printf("WARNING: ACLs flag on fs conflicts with "
-			    "\"nfs4acls\" mount option; option ignored\n");
+			    "\"nfsv4acls\" mount option; option ignored\n");
 		mp->mnt_flag &= ~MNT_NFS4ACLS;
 		mp->mnt_flag |= MNT_ACLS;
 

==== //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/02.t#6 (text+ko) ====

@@ -23,7 +23,7 @@
 MD=`mdconfig -at swap -s 10m`
 MNT=`mktemp -dt acltools`
 newfs /dev/$MD > /dev/null
-mount -o nfs4acls /dev/$MD $MNT
+mount -o nfsv4acls /dev/$MD $MNT
 if [ $? -ne 0 ]; then
 	echo "not ok 1 - mount failed."
 	exit 1