diff options
| author | Anna Schumaker <Anna.Schumaker@Netapp.com> | 2019-08-14 21:28:28 +0200 |
|---|---|---|
| committer | Anna Schumaker <Anna.Schumaker@Netapp.com> | 2019-08-22 16:05:11 +0200 |
| commit | dae40965d51e563603222aa8d4fad7ab3cec0e2d (patch) | |
| tree | d917109bcc2230ef2347c93e5de3b727f78b3f48 /fs/nfs | |
| parent | NFS: Add an nfs4_call_sync_custom() function (diff) | |
| download | linux-dae40965d51e563603222aa8d4fad7ab3cec0e2d.tar.xz linux-dae40965d51e563603222aa8d4fad7ab3cec0e2d.zip | |
NFS: Have nfs4_proc_setclientid() call nfs4_call_sync_custom()
Rather than running the task manually
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Diffstat (limited to 'fs/nfs')
| -rw-r--r-- | fs/nfs/nfs4proc.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index e5b6499c0b8b..234312240f33 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -6023,7 +6023,6 @@ int nfs4_proc_setclientid(struct nfs_client *clp, u32 program, .rpc_resp = res, .rpc_cred = cred, }; - struct rpc_task *task; struct rpc_task_setup task_setup_data = { .rpc_client = clp->cl_rpcclient, .rpc_message = &msg, @@ -6056,17 +6055,12 @@ int nfs4_proc_setclientid(struct nfs_client *clp, u32 program, dprintk("NFS call setclientid auth=%s, '%s'\n", clp->cl_rpcclient->cl_auth->au_ops->au_name, clp->cl_owner_id); - task = rpc_run_task(&task_setup_data); - if (IS_ERR(task)) { - status = PTR_ERR(task); - goto out; - } - status = task->tk_status; + + status = nfs4_call_sync_custom(&task_setup_data); if (setclientid.sc_cred) { clp->cl_acceptor = rpcauth_stringify_acceptor(setclientid.sc_cred); put_rpccred(setclientid.sc_cred); } - rpc_put_task(task); out: trace_nfs4_setclientid(clp, status); dprintk("NFS reply setclientid: %d\n", status); |