git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Pull asus into release branch
[pandora-kernel.git]
/
fs
/
nfsd
/
nfs4acl.c
diff --git
a/fs/nfsd/nfs4acl.c
b/fs/nfsd/nfs4acl.c
index
832673b
..
673a53c
100644
(file)
--- 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);