Commit 5a0ec8ac authored by Trond Myklebust's avatar Trond Myklebust

NFSv4.1: Pin the inode and super block in asynchronous layoutreturns

If we're sending an asynchronous layoutreturn, then we need to ensure
that the inode and the super block remain pinned.

Cc: Peng Tao <tao.peng@primarydata.com>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
Reviewed-by: default avatarPeng Tao <tao.peng@primarydata.com>
parent 472e2594
...@@ -7856,6 +7856,7 @@ static void nfs4_layoutreturn_release(void *calldata) ...@@ -7856,6 +7856,7 @@ static void nfs4_layoutreturn_release(void *calldata)
lo->plh_block_lgets--; lo->plh_block_lgets--;
spin_unlock(&lo->plh_inode->i_lock); spin_unlock(&lo->plh_inode->i_lock);
pnfs_put_layout_hdr(lrp->args.layout); pnfs_put_layout_hdr(lrp->args.layout);
nfs_iput_and_deactive(lrp->inode);
kfree(calldata); kfree(calldata);
dprintk("<-- %s\n", __func__); dprintk("<-- %s\n", __func__);
} }
...@@ -7880,23 +7881,25 @@ int nfs4_proc_layoutreturn(struct nfs4_layoutreturn *lrp, bool sync) ...@@ -7880,23 +7881,25 @@ int nfs4_proc_layoutreturn(struct nfs4_layoutreturn *lrp, bool sync)
.rpc_message = &msg, .rpc_message = &msg,
.callback_ops = &nfs4_layoutreturn_call_ops, .callback_ops = &nfs4_layoutreturn_call_ops,
.callback_data = lrp, .callback_data = lrp,
.flags = RPC_TASK_ASYNC,
}; };
int status = 0; int status = 0;
dprintk("--> %s\n", __func__); dprintk("--> %s\n", __func__);
if (!sync) {
lrp->inode = nfs_igrab_and_active(lrp->args.inode);
if (!lrp->inode) {
nfs4_layoutreturn_release(lrp);
return -EAGAIN;
}
task_setup_data.flags |= RPC_TASK_ASYNC;
}
nfs4_init_sequence(&lrp->args.seq_args, &lrp->res.seq_res, 1); nfs4_init_sequence(&lrp->args.seq_args, &lrp->res.seq_res, 1);
task = rpc_run_task(&task_setup_data); task = rpc_run_task(&task_setup_data);
if (IS_ERR(task)) if (IS_ERR(task))
return PTR_ERR(task); return PTR_ERR(task);
if (sync == false) if (sync)
goto out;
status = nfs4_wait_for_completion_rpc_task(task);
if (status != 0)
goto out;
status = task->tk_status; status = task->tk_status;
trace_nfs4_layoutreturn(lrp->args.inode, status); trace_nfs4_layoutreturn(lrp->args.inode, status);
out:
dprintk("<-- %s status=%d\n", __func__, status); dprintk("<-- %s status=%d\n", __func__, status);
rpc_put_task(task); rpc_put_task(task);
return status; return status;
......
...@@ -310,6 +310,7 @@ struct nfs4_layoutreturn { ...@@ -310,6 +310,7 @@ struct nfs4_layoutreturn {
struct nfs4_layoutreturn_res res; struct nfs4_layoutreturn_res res;
struct rpc_cred *cred; struct rpc_cred *cred;
struct nfs_client *clp; struct nfs_client *clp;
struct inode *inode;
int rpc_status; int rpc_status;
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment