Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 54c04409 authored by Bruce Fields's avatar Bruce Fields Committed by Linus Torvalds
Browse files

[PATCH] knfsd: nfsd4: fix inheritance flags on v4 ace derived from posix 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: default avatar"J. Bruce Fields" <bfields@citi.umich.edu>
Signed-off-by: default avatarNeil Brown <neilb@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 598b9a56

fs/nfsd/nfs4acl.c

+1 −1
Original line number Diff line number Diff line
@@ -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);