diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-05-25 10:08:48 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-05-25 10:08:48 -0700 |
| commit | 80a1de29a5a67abac02cb10c32545eb231e0e778 (patch) | |
| tree | e66ae4c98b1c4b09df1bed1c91661d8017c3f9e5 /fs/nfsd/nfs4acl.c | |
| parent | 037430078fbbb956a9bd6ada00f528e9d1e4c92c (diff) | |
| parent | 27b11428b7de097c42f205beabb1764f4365443b (diff) | |
| download | op-kernel-dev-80a1de29a5a67abac02cb10c32545eb231e0e778.zip op-kernel-dev-80a1de29a5a67abac02cb10c32545eb231e0e778.tar.gz | |
Merge branch 'for-3.15' of git://linux-nfs.org/~bfields/linux
Pull two nfsd bugfixes from Bruce Fields:
"Just two bugfixes, one for a merge-window-introduced ACL regression,
the other for a longer-standing v4 state bug"
* 'for-3.15' of git://linux-nfs.org/~bfields/linux:
nfsd4: warn on finding lockowner without stateid's
nfsd4: remove lockowner when removing lock stateid
nfsd4: fix corruption on setting an ACL.
Diffstat (limited to 'fs/nfsd/nfs4acl.c')
| -rw-r--r-- | fs/nfsd/nfs4acl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfsd/nfs4acl.c b/fs/nfsd/nfs4acl.c index b6f4601..f66c66b 100644 --- a/fs/nfsd/nfs4acl.c +++ b/fs/nfsd/nfs4acl.c @@ -590,7 +590,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); |
