summaryrefslogtreecommitdiffstats
path: root/fs/nfsd/nfs4acl.c
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@redhat.com>2014-05-22 15:48:11 -0400
committerJ. Bruce Fields <bfields@redhat.com>2014-05-22 15:48:15 -0400
commitf35ea0d4b66b789e0edcea634238e9aa31924516 (patch)
tree2de32d027b8dab67153d7133f42c732c5d9e0ffe /fs/nfsd/nfs4acl.c
parentcbf7a75bc58a2458bd6e47476e47819ba3f40b00 (diff)
parent27b11428b7de097c42f205beabb1764f4365443b (diff)
downloadlinux-stable-f35ea0d4b66b789e0edcea634238e9aa31924516.tar.gz
linux-stable-f35ea0d4b66b789e0edcea634238e9aa31924516.tar.bz2
linux-stable-f35ea0d4b66b789e0edcea634238e9aa31924516.zip
Merge 3.15 bugfixes for 3.16
Diffstat (limited to 'fs/nfsd/nfs4acl.c')
-rw-r--r--fs/nfsd/nfs4acl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfsd/nfs4acl.c b/fs/nfsd/nfs4acl.c
index 05c9b2f9427b..7c7c02554a81 100644
--- a/fs/nfsd/nfs4acl.c
+++ b/fs/nfsd/nfs4acl.c
@@ -589,7 +589,7 @@ posix_state_to_acl(struct posix_acl_state *state, unsigned int flags)
add_to_mask(state, &state->groups->aces[i].perms);
}
- if (!state->users->n && !state->groups->n) {
+ if (state->users->n || state->groups->n) {
pace++;
pace->e_tag = ACL_MASK;
low_mode_from_nfs4(state->mask.allow, &pace->e_perm, flags);