Merge 3.15 bugfixes for 3.16
commit
f35ea0d4b6
|
@ -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);
|
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++;
|
||||||
pace->e_tag = ACL_MASK;
|
pace->e_tag = ACL_MASK;
|
||||||
low_mode_from_nfs4(state->mask.allow, &pace->e_perm, flags);
|
low_mode_from_nfs4(state->mask.allow, &pace->e_perm, flags);
|
||||||
|
|
|
@ -3716,9 +3716,16 @@ out:
|
||||||
static __be32
|
static __be32
|
||||||
nfsd4_free_lock_stateid(struct nfs4_ol_stateid *stp)
|
nfsd4_free_lock_stateid(struct nfs4_ol_stateid *stp)
|
||||||
{
|
{
|
||||||
if (check_for_locks(stp->st_file, lockowner(stp->st_stateowner)))
|
struct nfs4_lockowner *lo = lockowner(stp->st_stateowner);
|
||||||
|
|
||||||
|
if (check_for_locks(stp->st_file, lo))
|
||||||
return nfserr_locks_held;
|
return nfserr_locks_held;
|
||||||
release_lock_stateid(stp);
|
/*
|
||||||
|
* Currently there's a 1-1 lock stateid<->lockowner
|
||||||
|
* correspondance, and we have to delete the lockowner when we
|
||||||
|
* delete the lock stateid:
|
||||||
|
*/
|
||||||
|
unhash_lockowner(lo);
|
||||||
return nfs_ok;
|
return nfs_ok;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -4158,6 +4165,10 @@ static bool same_lockowner_ino(struct nfs4_lockowner *lo, struct inode *inode, c
|
||||||
|
|
||||||
if (!same_owner_str(&lo->lo_owner, owner, clid))
|
if (!same_owner_str(&lo->lo_owner, owner, clid))
|
||||||
return false;
|
return false;
|
||||||
|
if (list_empty(&lo->lo_owner.so_stateids)) {
|
||||||
|
WARN_ON_ONCE(1);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
lst = list_first_entry(&lo->lo_owner.so_stateids,
|
lst = list_first_entry(&lo->lo_owner.so_stateids,
|
||||||
struct nfs4_ol_stateid, st_perstateowner);
|
struct nfs4_ol_stateid, st_perstateowner);
|
||||||
return lst->st_file->fi_inode == inode;
|
return lst->st_file->fi_inode == inode;
|
||||||
|
|
Loading…
Reference in New Issue