From owner-p4-projects@FreeBSD.ORG  Tue Jul  8 12:58:38 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3A81E106567D; Tue,  8 Jul 2008 12:58:38 +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 ECDAD1065673
	for <perforce@freebsd.org>; Tue,  8 Jul 2008 12:58:37 +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 DA4C08FC1F
	for <perforce@freebsd.org>; Tue,  8 Jul 2008 12:58:37 +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 m68CwbqF048385
	for <perforce@freebsd.org>; Tue, 8 Jul 2008 12:58:37 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m68CwbWE048383
	for perforce@freebsd.org; Tue, 8 Jul 2008 12:58:37 GMT
	(envelope-from trasz@freebsd.org)
Date: Tue, 8 Jul 2008 12:58:37 GMT
Message-Id: <200807081258.m68CwbWE048383@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 144881 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: Tue, 08 Jul 2008 12:58:38 -0000

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

Change 144881 by trasz@trasz_traszkan on 2008/07/08 12:58:06

	Tidy up the code in _match_acl.  Hopefully no functional changes.

Affected files ...

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

Differences ...

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

@@ -88,25 +88,6 @@
 }
 
 /*
- * Remove bits that are set in entry->ae_perm from *needed_bits.
- * Return -1 if entry type is "deny" and bits match, 0 otherwise.
- *
- * XXX: Find a better name.
- */
-static int
-_match_bits(const struct acl_entry *entry, int *needed_bits)
-{
-	if (entry->ae_extended == ACL_EXTENDED_DENY) {
-		if (entry->ae_perm & *needed_bits)
-			return (-1);
-	}
-
-	*needed_bits &= ~(entry->ae_perm);
-
-	return (0);
-}
-
-/*
  * Return 1, if access is explicitly denied, -1, if its implicitly
  * denied (not allowed), or 0, if allowed.
  *
@@ -130,56 +111,37 @@
 		case ACL_USER_OBJ:
 			if (file_uid != cred->cr_uid)
 				continue;
-
-			if (_match_bits(entry, &needed_bits))
-				return (1);
-			if (needed_bits == 0)
-				return (0);
-
 			break;
 
 		case ACL_USER:
 			if (entry->ae_id != cred->cr_uid)
 				continue;
-
-			if (_match_bits(entry, &needed_bits))
-				return (1);
-			if (needed_bits == 0)
-				return (0);
-
 			break;
 
 		case ACL_GROUP_OBJ:
 			if (!groupmember(file_gid, cred))
 				continue;
-
-			if (_match_bits(entry, &needed_bits))
-				return (1);
-			if (needed_bits == 0)
-				return (0);
-
 			break;
 
 		case ACL_GROUP:
 			if (!groupmember(entry->ae_id, cred))
 				continue;
-
-			if (_match_bits(entry, &needed_bits))
-				return (1);
-			if (needed_bits == 0)
-				return (0);
-
 			break;
 
 		default:
 			KASSERT(entry->ae_tag == ACL_EVERYONE,
 			    "entry->ae_tag == ACL_EVERYONE");
+		}
 
-			if (_match_bits(entry, &needed_bits))
+		if (entry->ae_extended == ACL_EXTENDED_DENY) {
+			if (entry->ae_perm & needed_bits)
 				return (1);
-			if (needed_bits == 0)
-				return (0);
 		}
+
+		needed_bits &= ~(entry->ae_perm);
+
+		if (needed_bits == 0)
+			return (0);
 	}
 
 	return (-1);