From owner-p4-projects@FreeBSD.ORG  Wed Apr 29 16:18:41 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id F16DE1065674; Wed, 29 Apr 2009 16:18:40 +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 AF5331065672
	for <perforce@freebsd.org>; Wed, 29 Apr 2009 16:18:40 +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 9D1208FC0A
	for <perforce@freebsd.org>; Wed, 29 Apr 2009 16:18:40 +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 n3TGIesj010383
	for <perforce@freebsd.org>; Wed, 29 Apr 2009 16:18:40 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3TGIeP7010381
	for perforce@freebsd.org; Wed, 29 Apr 2009 16:18:40 GMT
	(envelope-from trasz@freebsd.org)
Date: Wed, 29 Apr 2009 16:18:40 GMT
Message-Id: <200904291618.n3TGIeP7010381@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 161331 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, 29 Apr 2009 16:18:41 -0000

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

Change 161331 by trasz@trasz_victim on 2009/04/29 16:17:53

	Last IFC brought in acl_alloc() that behaves in a slightly different
	way - it does no longer clear the memory by default.  Fix the code
	so that it doesn't trip on assertions.

Affected files ...

.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_nfs4.c#40 edit
.. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_vnops.c#27 edit

Differences ...

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

@@ -1015,7 +1015,7 @@
 	 *      critical for performance to not use EA when they are not
 	 *      needed.
 	 */
-	tmpaclp = acl_alloc(M_WAITOK);
+	tmpaclp = acl_alloc(M_WAITOK | M_ZERO);
 	acl_nfs4_sync_mode_from_acl(&tmpmode, aclp);
 	acl_nfs4_sync_acl_from_mode(tmpaclp, tmpmode, file_owner_id);
 	trivial = _acls_are_equal(aclp, tmpaclp);

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

@@ -1475,7 +1475,7 @@
 	struct acl *parent_aclp, *child_aclp;
 
 	parent_aclp = acl_alloc(M_WAITOK);
-	child_aclp = acl_alloc(M_WAITOK);
+	child_aclp = acl_alloc(M_WAITOK | M_ZERO);
 
 	error = VOP_GETACL(dvp, ACL_TYPE_NFS4, parent_aclp, cred, td);
 	if (error)