From owner-p4-projects@FreeBSD.ORG  Fri Jul 11 11:35:51 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5B3271065673; Fri, 11 Jul 2008 11:35:51 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1F067106564A
	for <perforce@freebsd.org>; Fri, 11 Jul 2008 11:35:51 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 060218FC15
	for <perforce@freebsd.org>; Fri, 11 Jul 2008 11:35:51 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m6BBZoum033144
	for <perforce@freebsd.org>; Fri, 11 Jul 2008 11:35:50 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m6BBZo6V033142
	for perforce@freebsd.org; Fri, 11 Jul 2008 11:35:50 GMT
	(envelope-from trasz@freebsd.org)
Date: Fri, 11 Jul 2008 11:35:50 GMT
Message-Id: <200807111135.m6BBZo6V033142@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	trasz@freebsd.org using -f
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 145061 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 11 Jul 2008 11:35:51 -0000

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

Change 145061 by trasz@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;
 	}