From owner-p4-projects@FreeBSD.ORG  Wed Sep 23 18:20:47 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6A5D41065672; Wed, 23 Sep 2009 18:20:46 +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 25A181065670
	for <perforce@freebsd.org>; Wed, 23 Sep 2009 18:20:46 +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 15B0D8FC17
	for <perforce@freebsd.org>; Wed, 23 Sep 2009 18:20:46 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8NIKjrs077351
	for <perforce@freebsd.org>; Wed, 23 Sep 2009 18:20:45 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8NIKj7F077349
	for perforce@freebsd.org; Wed, 23 Sep 2009 18:20:45 GMT
	(envelope-from trasz@freebsd.org)
Date: Wed, 23 Sep 2009 18:20:45 GMT
Message-Id: <200909231820.n8NIKj7F077349@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 168831 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: Wed, 23 Sep 2009 18:20:47 -0000

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

Change 168831 by trasz@trasz_victim on 2009/09/23 18:20:02

	Cosmetic fixes.

Affected files ...

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

Differences ...

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

@@ -179,7 +179,8 @@
 
 	if (vfs_getopt(mp->mnt_optnew, "nfs4acls", NULL, NULL) == 0) {
 		if (mntorflags & MNT_ACLS) {
-			printf("WARNING: both acls and nfs4acls specified\n");
+			printf("WARNING: \"acls\" and \"nfs4acls\" "
+			    "options are mutually exclusive\n");
 			return (EINVAL);
 		}
 		mntorflags |= MNT_NFS4ACLS;
@@ -844,7 +845,8 @@
 		MNT_ILOCK(mp);
 
 		if (mp->mnt_flag & MNT_NFS4ACLS)
-			printf("WARNING: ACLs flag on fs conflicts with nfs4acls mount option; flag ignored\n");
+			printf("WARNING: ACLs flag on fs conflicts with "
+			    "\"nfs4acls\" mount option; flag ignored\n");
 		else
 			mp->mnt_flag |= MNT_ACLS;