Commit 2d8ae84f authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFSv4.1/pnfs: Remove redundant lo->plh_block_lgets in layoutreturn 



The NFS_LAYOUT_RETURN bit already suffices to ensure that layoutget
is blocked.

Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent 5c4a79fb

fs/nfs/pnfs.c

+0 −2
Original line number Diff line number Diff line
@@ -368,7 +368,6 @@ pnfs_prepare_layoutreturn(struct pnfs_layout_hdr *lo) 
	if (test_and_set_bit(NFS_LAYOUT_RETURN, &lo->plh_flags))

		return false;

	lo->plh_return_iomode = 0;

	lo->plh_block_lgets++;

	pnfs_get_layout_hdr(lo);

	clear_bit(NFS_LAYOUT_RETURN_BEFORE_CLOSE, &lo->plh_flags);

	return true;
@@ -954,7 +953,6 @@ pnfs_send_layoutreturn(struct pnfs_layout_hdr *lo, nfs4_stateid stateid, 
	if (unlikely(lrp == NULL)) {

		status = -ENOMEM;

		spin_lock(&ino->i_lock);

		lo->plh_block_lgets--;

		pnfs_clear_layoutreturn_waitbit(lo);

		rpc_wake_up(&NFS_SERVER(ino)->roc_rpcwaitq);

		spin_unlock(&ino->i_lock);