Skip to content

Commit

Permalink
[PATCH] knfsd: nfsd4: fix inheritance flags on v4 ace derived from po…
Browse files Browse the repository at this point in the history
…six default ace

A regression introduced in the last set of acl patches removed the
INHERIT_ONLY flag from aces derived from the posix acl.  Fix.

Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
Signed-off-by: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Bruce Fields authored and Linus Torvalds committed Mar 27, 2007
1 parent 598b9a5 commit 54c0440
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion fs/nfsd/nfs4acl.c
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ _posix_to_nfsv4_one(struct posix_acl *pacl, struct nfs4_acl *acl,
struct posix_acl_summary pas;
unsigned short deny;
int eflag = ((flags & NFS4_ACL_TYPE_DEFAULT) ?
NFS4_INHERITANCE_FLAGS : 0);
NFS4_INHERITANCE_FLAGS | NFS4_ACE_INHERIT_ONLY_ACE : 0);

BUG_ON(pacl->a_count < 3);
summarize_posix_acl(pacl, &pas);
Expand Down

0 comments on commit 54c0440

Please sign in to comment.