NFS: Have nfs4_proc_setclientid() call nfs4_call_sync_custom() (dae40965) · Commits · 戴 / test

fs/nfs/nfs4proc.c

+2 −8

Original line number	Original line	Diff line number	Diff line
	@@ -6023,7 +6023,6 @@ int nfs4_proc_setclientid(struct nfs_client *clp, u32 program,
	.rpc_resp = res,		.rpc_resp = res,
	.rpc_cred = cred,		.rpc_cred = cred,
	};		};
	struct rpc_task *task;
	struct rpc_task_setup task_setup_data = {		struct rpc_task_setup task_setup_data = {
	.rpc_client = clp->cl_rpcclient,		.rpc_client = clp->cl_rpcclient,
	.rpc_message = &msg,		.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",		dprintk("NFS call setclientid auth=%s, '%s'\n",
	clp->cl_rpcclient->cl_auth->au_ops->au_name,		clp->cl_rpcclient->cl_auth->au_ops->au_name,
	clp->cl_owner_id);		clp->cl_owner_id);
	task = rpc_run_task(&task_setup_data);
	if (IS_ERR(task)) {		status = nfs4_call_sync_custom(&task_setup_data);
	status = PTR_ERR(task);
	goto out;
	}
	status = task->tk_status;
	if (setclientid.sc_cred) {		if (setclientid.sc_cred) {
	clp->cl_acceptor = rpcauth_stringify_acceptor(setclientid.sc_cred);		clp->cl_acceptor = rpcauth_stringify_acceptor(setclientid.sc_cred);
	put_rpccred(setclientid.sc_cred);		put_rpccred(setclientid.sc_cred);
	}		}
	rpc_put_task(task);
	out:		out:
	trace_nfs4_setclientid(clp, status);		trace_nfs4_setclientid(clp, status);
	dprintk("NFS reply setclientid: %d\n", status);		dprintk("NFS reply setclientid: %d\n", status);