Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f35ea0d4 authored by J. Bruce Fields's avatar J. Bruce Fields
Browse files

Merge 3.15 bugfixes for 3.16

parents cbf7a75b 27b11428

fs/nfsd/nfs4acl.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

fs/nfsd/nfs4state.c

+13 −2
Original line number Diff line number Diff line
@@ -3716,9 +3716,16 @@ nfs4_preprocess_stateid_op(struct net *net, struct nfsd4_compound_state *cstate, 
static __be32

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;

	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;

}
@@ -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))

		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,

			       struct nfs4_ol_stateid, st_perstateowner);

	return lst->st_file->fi_inode == inode;