Author: trasz
Date: Mon Nov 1 15:43:42 2010
New Revision: 214627
URL: http://svn.freebsd.org/changeset/base/214627
Log:
MFC r214245:
Remove workaround for ZFS bug; fix was committed to the
//depot/user/pjd/zfs/...
branch some time ago.
Modified:
stable/8/sys/kern/subr_acl_nfs4.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
stable/8/sys/dev/xen/xenpci/ (props changed)
Modified: stable/8/sys/kern/subr_acl_nfs4.c
==============================================================================
--- stable/8/sys/kern/subr_acl_nfs4.c Mon Nov 1 15:36:47 2010
(r214626)
+++ stable/8/sys/kern/subr_acl_nfs4.c Mon Nov 1 15:43:42 2010
(r214627)
@@ -367,28 +367,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)
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
