svn commit: r214245 - head/sys/kern

Edward Tomasz Napierala trasz at FreeBSD.org
Sat Oct 23 14:22:51 UTC 2010


Author: trasz
Date: Sat Oct 23 14:22:50 2010
New Revision: 214245
URL: http://svn.freebsd.org/changeset/base/214245

Log:
  Remove workaround for ZFS bug; fix was committed to the //depot/user/pjd/zfs/...
  branch some time ago.
  
  MFC after:	two weeks

Modified:
  head/sys/kern/subr_acl_nfs4.c

Modified: head/sys/kern/subr_acl_nfs4.c
==============================================================================
--- head/sys/kern/subr_acl_nfs4.c	Sat Oct 23 14:16:33 2010	(r214244)
+++ head/sys/kern/subr_acl_nfs4.c	Sat Oct 23 14:22:50 2010	(r214245)
@@ -393,28 +393,6 @@ acl_nfs4_trivial_from_mode(struct acl *a
 	group_deny = everyone_allow & ~group_allow;
 	user_allow_first = group_deny & ~user_deny;
 
-#if 1
-	/*
-	 * This is a workaround for what looks like a bug in ZFS - trivial
-	 * ACL for mode 0077 should look like this:
-	 *
-	 *    owner@:rwxp----------:------:deny
-	 *    owner@:------aARWcCos:------:allow
-	 *    group@:rwxp--a-R-c--s:------:allow
-	 * everyone@:rwxp--a-R-c--s:------:allow
-	 *
-	 * Instead, ZFS makes it like this:
-	 *
-	 *    owner@:rwx-----------:------:deny
-	 *    owner@:------aARWcCos:------:allow
-	 *    group@:rwxp--a-R-c--s:------:allow
-	 * everyone@:rwxp--a-R-c--s:------:allow
-	 */
-	user_allow_first &= ~ACL_APPEND_DATA;
-	user_deny &= ~ACL_APPEND_DATA;
-	group_deny &= ~ACL_APPEND_DATA;
-#endif
-
 	if (user_allow_first != 0)
 		_acl_append(aclp, ACL_USER_OBJ, user_allow_first, ACL_ENTRY_TYPE_ALLOW);
 	if (user_deny != 0)


More information about the svn-src-all mailing list