From owner-p4-projects@FreeBSD.ORG  Sat Aug  9 11:54:29 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id DB83E1065693; Sat,  9 Aug 2008 11:54:28 +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 9E657106566C
	for <perforce@freebsd.org>; Sat,  9 Aug 2008 11:54:28 +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 68E998FC1D
	for <perforce@freebsd.org>; Sat,  9 Aug 2008 11:54:28 +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 m79BsS3p064901
	for <perforce@freebsd.org>; Sat, 9 Aug 2008 11:54:28 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m79BsSmN064899
	for perforce@freebsd.org; Sat, 9 Aug 2008 11:54:28 GMT
	(envelope-from trasz@freebsd.org)
Date: Sat, 9 Aug 2008 11:54:28 GMT
Message-Id: <200808091154.m79BsSmN064899@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 146980 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: Sat, 09 Aug 2008 11:54:29 -0000

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

Change 146980 by trasz@trasz_traszkan on 2008/08/09 11:54:02

	Style fixes.

Affected files ...

.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_acl.c#8 edit

Differences ...

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

@@ -133,7 +133,7 @@
 	case ACL_TYPE_ACCESS_OLD:
 	case ACL_TYPE_DEFAULT_OLD:
 		error = copyin(user_acl, &old, sizeof(struct oldacl));
-		if (error)
+		if (error != 0)
 			break;
 		error = acl_copy_oldacl_into_acl(&old, kernel_acl);
 		break;
@@ -155,7 +155,7 @@
 	case ACL_TYPE_ACCESS_OLD:
 	case ACL_TYPE_DEFAULT_OLD:
 		error = acl_copy_acl_into_oldacl(kernel_acl, &old);
-		if (error)
+		if (error != 0)
 			break;
 
 		error = copyout(&old, user_acl, sizeof(struct oldacl));
@@ -204,7 +204,7 @@
 
 	inkernelacl = uma_zalloc(acl_zone, M_WAITOK);
 	error = copyin_acl(aclp, inkernelacl, type);
-	if (error)
+	if (error != 0)
 		goto out_free;
 	error = vn_start_write(vp, &mp, V_WAIT | PCATCH);
 	if (error != 0)
@@ -270,13 +270,13 @@
 	int error;
 
 	error = vn_start_write(vp, &mp, V_WAIT | PCATCH);
-	if (error)
+	if (error != 0)
 		return (error);
 	VOP_LEASE(vp, td, td->td_ucred, LEASE_WRITE);
 	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 #ifdef MAC
 	error = mac_vnode_check_deleteacl(td->td_ucred, vp, type);
-	if (error)
+	if (error != 0)
 		goto out;
 #endif
 	error = VOP_SETACL(vp, type_unold(type), 0, td->td_ucred, td);
@@ -300,7 +300,7 @@
 
 	inkernelacl = uma_zalloc(acl_zone, M_WAITOK);
 	error = copyin_acl(aclp, inkernelacl, type);
-	if (error)
+	if (error != 0)
 		goto out_free;
 	error = VOP_ACLCHECK(vp, type_unold(type), inkernelacl,
 	    td->td_ucred, td);