From owner-p4-projects@FreeBSD.ORG  Mon Sep  1 20:39:34 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 85C7C1065679; Mon,  1 Sep 2008 20:39:34 +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 485DB1065671
	for <perforce@freebsd.org>; Mon,  1 Sep 2008 20:39:34 +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 3220C8FC17
	for <perforce@freebsd.org>; Mon,  1 Sep 2008 20:39:34 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m81KdYTU008215
	for <perforce@freebsd.org>; Mon, 1 Sep 2008 20:39:34 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m81KdY7F008213
	for perforce@freebsd.org; Mon, 1 Sep 2008 20:39:34 GMT
	(envelope-from trasz@freebsd.org)
Date: Mon, 1 Sep 2008 20:39:34 GMT
Message-Id: <200809012039.m81KdY7F008213@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 149016 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: Mon, 01 Sep 2008 20:39:34 -0000

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

Change 149016 by trasz@trasz_traszkan on 2008/09/01 20:39:02

	Wrap too long lines.

Affected files ...

.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_nfs4.c#32 edit

Differences ...

==== //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_nfs4.c#32 (text+ko) ====

@@ -238,13 +238,15 @@
 	    !priv_check_cred(cred, PRIV_VFS_WRITE, 0))
 		priv_granted |= (VWRITE | VAPPEND | VDELETE_CHILD);
 
-	if ((acc_mode & VADMIN_PERMS) && !priv_check_cred(cred, PRIV_VFS_ADMIN, 0))
+	if ((acc_mode & VADMIN_PERMS) &&
+	    !priv_check_cred(cred, PRIV_VFS_ADMIN, 0))
 		priv_granted |= VADMIN_PERMS;
 
 	/*
 	 * XXX: PRIV_VFS_STAT?
 	 */
-	if ((acc_mode & VSTAT_PERMS) && !priv_check_cred(cred, PRIV_VFS_READ, 0))
+	if ((acc_mode & VSTAT_PERMS) &&
+	    !priv_check_cred(cred, PRIV_VFS_READ, 0))
 		priv_granted |= VSTAT_PERMS;
 
 	if ((acc_mode & priv_granted) == acc_mode) {
@@ -392,7 +394,8 @@
 			 *        ACL_ENTRY_LIMIT_INHERIT.
 			 */
 			copy->ae_flags &= ~(ACL_ENTRY_FILE_INHERIT |
-			    ACL_ENTRY_DIRECTORY_INHERIT | ACL_ENTRY_LIMIT_INHERIT);
+			    ACL_ENTRY_DIRECTORY_INHERIT |
+			    ACL_ENTRY_LIMIT_INHERIT);
 
 			/*
 			 * The algorithm continues on with the second ACE.