Merge 3.15 bugfixes for 3.16

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);