From: Bruce Fields <bfields@citi.umich.edu>
Date: Tue, 27 Mar 2007 05:32:09 +0000 (-0800)
Subject: [PATCH] knfsd: nfsd4: fix inheritance flags on v4 ace derived from posix default ace
X-Git-Tag: v2.6.21-rc6~111
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=54c044094947826105317dadd01deca083627ea1;p=linux-2.6-omap-h63xx.git

[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: "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>
---

diff --git a/fs/nfsd/nfs4acl.c b/fs/nfsd/nfs4acl.c
index 832673b1458..673a53c014a 100644
--- a/fs/nfsd/nfs4acl.c
+++ b/fs/nfsd/nfs4acl.c
@@ -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);