From owner-p4-projects@FreeBSD.ORG  Wed Nov 26 14:25:05 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 209951065674; Wed, 26 Nov 2008 14:25:05 +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 D1E521065670
	for <perforce@freebsd.org>; Wed, 26 Nov 2008 14:25:04 +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 B68718FC1B
	for <perforce@freebsd.org>; Wed, 26 Nov 2008 14:25:04 +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 mAQEP4VC073000
	for <perforce@freebsd.org>; Wed, 26 Nov 2008 14:25:04 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAQEP4IG072998
	for perforce@freebsd.org; Wed, 26 Nov 2008 14:25:04 GMT
	(envelope-from trasz@freebsd.org)
Date: Wed, 26 Nov 2008 14:25:04 GMT
Message-Id: <200811261425.mAQEP4IG072998@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 153610 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, 26 Nov 2008 14:25:05 -0000

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

Change 153610 by trasz@trasz_victim7 on 2008/11/26 14:24:12

	Remove bogus check that broke 02.t.  Access is checked by zfs_setacl().

Affected files ...

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

Differences ...

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

@@ -4845,12 +4845,6 @@
 	if (ap->a_type != ACL_TYPE_NFS4)
 		return (EOPNOTSUPP);
 
-	/* Mostly taken from common/syscall/acl.c. */
-
-	error = VOP_ACCESS(ap->a_vp, VWRITE_ACL, ap->a_cred, ap->a_td);
-	if (error != 0)
-		return (error);
-
 	if (ap->a_aclp->acl_cnt < 1 || ap->a_aclp->acl_cnt > MAX_ACL_ENTRIES)
 		return (EINVAL);