Commit 849b286f authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFSv4.1: nfs4_proc_layoutreturn must always drop the plh_block_lgets count 



Currently it does not do so if the RPC call failed to start. Fix is to
move the decrement of plh_block_lgets into nfs4_layoutreturn_release.

Also remove a redundant test of task->tk_status in nfs4_layoutreturn_done:
if lrp->res.lrs_present is set, then obviously the RPC call succeeded.

Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 65857d57

fs/nfs/nfs4proc.c

+6 −6
Original line number Diff line number Diff line
@@ -6346,7 +6346,6 @@ static void nfs4_layoutreturn_done(struct rpc_task *task, void *calldata) 
{

	struct nfs4_layoutreturn *lrp = calldata;

	struct nfs_server *server;

	struct pnfs_layout_hdr *lo = lrp->args.layout;



	dprintk("--> %s\n", __func__);
@@ -6358,19 +6357,20 @@ static void nfs4_layoutreturn_done(struct rpc_task *task, void *calldata) 
		rpc_restart_call_prepare(task);

		return;

	}

	spin_lock(&lo->plh_inode->i_lock);

	if (task->tk_status == 0 && lrp->res.lrs_present)

		pnfs_set_layout_stateid(lo, &lrp->res.stateid, true);

	lo->plh_block_lgets--;

	spin_unlock(&lo->plh_inode->i_lock);

	dprintk("<-- %s\n", __func__);

}



static void nfs4_layoutreturn_release(void *calldata)

{

	struct nfs4_layoutreturn *lrp = calldata;

	struct pnfs_layout_hdr *lo = lrp->args.layout;



	dprintk("--> %s\n", __func__);

	spin_lock(&lo->plh_inode->i_lock);

	if (lrp->res.lrs_present)

		pnfs_set_layout_stateid(lo, &lrp->res.stateid, true);

	lo->plh_block_lgets--;

	spin_unlock(&lo->plh_inode->i_lock);

	pnfs_put_layout_hdr(lrp->args.layout);

	kfree(calldata);

	dprintk("<-- %s\n", __func__);

CRA Git | Maintained and supported by SUSTech CRA and CCSE