PERFORCE change 145061 for review

[Edward Tomasz Napierala]

http://perforce.freebsd.org/chv.cgi?CH=145061

Change 145061 by trasz at trasz_traszkan on 2008/07/11 11:35:17

	Make "acls" and "nfs4acls" mount options mutually exclusive.

Affected files ...

.. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ffs/ffs_vfsops.c#6 edit

Differences ...

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

@@ -175,9 +175,7 @@
 	if (vfs_getopt(mp->mnt_optnew, "nfs4acls", NULL, NULL) == 0) {
 		if (mntorflags & MNT_ACLS) {
 			printf("WARNING: both acls and nfs4acls specified\n");
-#if 0
 			return (EINVAL);
-#endif
 		}
 		mntorflags |= MNT_NFS4ACLS;
 	}