d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove workaround for ZFS bug; fix was committed to the //depot/user/pjd/zfs/...

Browse Source 
branch some time ago.

MFC after:	two weeks
This commit is contained in:
Edward Tomasz Napierala 2010-10-23 14:22:50 +00:00
parent 0d036d55e7
commit 880cb81c5a
1 changed files with 0 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sys/kern/subr_acl_nfs4.c
View File

@ -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)