From owner-p4-projects@FreeBSD.ORG  Sun Aug  3 09:40:01 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 820F3106567A; Sun,  3 Aug 2008 09:40:01 +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 475151065671
	for <perforce@freebsd.org>; Sun,  3 Aug 2008 09:40:01 +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 355648FC0C
	for <perforce@freebsd.org>; Sun,  3 Aug 2008 09:40:01 +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 m739e1vK097148
	for <perforce@freebsd.org>; Sun, 3 Aug 2008 09:40:01 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m739e1LE097146
	for perforce@freebsd.org; Sun, 3 Aug 2008 09:40:01 GMT
	(envelope-from trasz@freebsd.org)
Date: Sun, 3 Aug 2008 09:40:01 GMT
Message-Id: <200808030940.m739e1LE097146@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 146507 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: Sun, 03 Aug 2008 09:40:01 -0000

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

Change 146507 by trasz@trasz_traszkan on 2008/08/03 09:39:40

	Fix build.

Affected files ...

.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#4 edit

Differences ...

==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#4 (text+ko) ====

@@ -3569,13 +3569,13 @@
 	if (error != 0)
 		goto errout;
 
-	if (vsecattr.vsa_aclcnt != NULL)
+	if (vsecattr.vsa_aclcnt != 0)
 		kmem_free(vsecattr.vsa_aclentp, vsecattr.vsa_aclentsz);
 
 	return (0);
 
 errout:
-        if (aclbsize != NULL && vsecattr.vsa_aclentp != NULL)
+        if (aclbsize != 0 && vsecattr.vsa_aclentp != NULL)
                 kmem_free(vsecattr.vsa_aclentp, aclbsize);
         return (error);
 }