From owner-p4-projects@FreeBSD.ORG  Tue Apr 28 15:31:59 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 329E7106568A; Tue, 28 Apr 2009 15:31:59 +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 E61C7106567C
	for <perforce@freebsd.org>; Tue, 28 Apr 2009 15:31:58 +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 D45138FC17
	for <perforce@freebsd.org>; Tue, 28 Apr 2009 15:31:58 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3SFVwNG039210
	for <perforce@freebsd.org>; Tue, 28 Apr 2009 15:31:58 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3SFVwin039208
	for perforce@freebsd.org; Tue, 28 Apr 2009 15:31:58 GMT
	(envelope-from trasz@freebsd.org)
Date: Tue, 28 Apr 2009 15:31:58 GMT
Message-Id: <200904281531.n3SFVwin039208@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 161254 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, 28 Apr 2009 15:31:59 -0000

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

Change 161254 by trasz@trasz_victim on 2009/04/28 15:31:57

	Remove acl_size_for_cnt().

Affected files ...

.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_acl.c#15 edit
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/acl.h#33 edit
.. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_acl.c#16 edit

Differences ...

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

@@ -571,18 +571,6 @@
 	return (error);
 }
 
-/*
- * Return the size, in bytes, required to store ACL with "cnt" entries.
- */
-int
-acl_size_for_cnt(int cnt)
-{
-	int size = sizeof(struct acl) - (ACL_MAX_ENTRIES - cnt) *
-		sizeof(struct acl_entry);
-
-	return size;
-}
-
 struct acl *
 acl_alloc(int flags)
 {

==== //depot/projects/soc2008/trasz_nfs4acl/sys/sys/acl.h#33 (text+ko) ====

@@ -278,7 +278,6 @@
 			    struct acl *dacl);
 struct acl		*acl_alloc(int flags);
 void			acl_free(struct acl *aclp);
-int			acl_size_for_cnt(int cnt);
 
 void			acl_nfs4_sync_acl_from_mode(struct acl *aclp,
 			    mode_t mode, int file_owner_id);

==== //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_acl.c#16 (text+ko) ====

@@ -171,7 +171,7 @@
 	if (error)
 		return (error);
 
-	if (len != acl_size_for_cnt(ap->a_aclp->acl_cnt)) {
+	if (len != sizeof(*ap->a_aclp)) {
 		/*
 		 * A short (or long) read, meaning that for
 		 * some reason the ACL is corrupted.  Return
@@ -425,7 +425,7 @@
 		error = vn_extattr_set(ap->a_vp, IO_NODELOCKED,
 		    NFS4_ACL_EXTATTR_NAMESPACE,
 		    NFS4_ACL_EXTATTR_NAME,
-		    acl_size_for_cnt(ap->a_aclp->acl_cnt),
+		    sizeof(*ap->a_aclp),
 		    (char *) ap->a_aclp, ap->a_td);
 	}