From owner-p4-projects@FreeBSD.ORG  Thu Nov 20 16:47:19 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id EB4AB1065674; Thu, 20 Nov 2008 16:47:18 +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 AEDF21065672
	for <perforce@freebsd.org>; Thu, 20 Nov 2008 16:47:18 +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 99CBD8FC0C
	for <perforce@freebsd.org>; Thu, 20 Nov 2008 16:47:18 +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 mAKGlIwM035795
	for <perforce@freebsd.org>; Thu, 20 Nov 2008 16:47:18 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAKGlImY035793
	for perforce@freebsd.org; Thu, 20 Nov 2008 16:47:18 GMT
	(envelope-from trasz@freebsd.org)
Date: Thu, 20 Nov 2008 16:47:18 GMT
Message-Id: <200811201647.mAKGlImY035793@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 153265 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: Thu, 20 Nov 2008 16:47:19 -0000

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

Change 153265 by trasz@trasz_victim7 on 2008/11/20 16:46:26

	Tweaked a previous tweak to match new ZFS behaviour wrt ACL inheritance.
	I'm not sure about this - I have no idea why the Sun guys do it this
	way - but regression tests coverage is pretty good for this code
	and they pass, so anyway.
	
	Right now ZFS passes all the tests, and UFS fails few of
	fstest/tests/granular, by returning EACCES instead of EPERM in situations
	involving DELETE and DELETE_CHILD.

Affected files ...

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

Differences ...

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

@@ -876,7 +876,6 @@
 		 * apparently does that.
 		 */
 		if (((entry->ae_flags & ACL_ENTRY_LIMIT_INHERIT) ||
-		    (entry->ae_flags & ACL_ENTRY_DIRECTORY_INHERIT) == 0 ||
 		    !is_directory) &&
 		    entry->ae_extended == ACL_EXTENDED_ALLOW)
 			entry->ae_perm &= ~(ACL_WRITE_ACL | ACL_WRITE_OWNER);