diff options
| author | trasz <trasz@FreeBSD.org> | 2010-10-23 14:22:50 +0000 |
|---|---|---|
| committer | trasz <trasz@FreeBSD.org> | 2010-10-23 14:22:50 +0000 |
| commit | 06405a0e7b5d067ad9d61ed2852e7de3dba30c96 (patch) | |
| tree | cc9958efeb3d8a9743a85fdc4d12d75bbd682fbb /sys/kern | |
| parent | 841633e7b6a19e5a095062370dd1a64cbe0d84ff (diff) | |
| download | FreeBSD-src-06405a0e7b5d067ad9d61ed2852e7de3dba30c96.zip FreeBSD-src-06405a0e7b5d067ad9d61ed2852e7de3dba30c96.tar.gz | |
Remove workaround for ZFS bug; fix was committed to the //depot/user/pjd/zfs/...
branch some time ago.
MFC after: two weeks
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/subr_acl_nfs4.c | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/sys/kern/subr_acl_nfs4.c b/sys/kern/subr_acl_nfs4.c index 3498ddf..cf664bf 100644 --- a/sys/kern/subr_acl_nfs4.c +++ b/sys/kern/subr_acl_nfs4.c @@ -393,28 +393,6 @@ acl_nfs4_trivial_from_mode(struct acl *aclp, mode_t mode) 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) |
