SUNRPC: rpc_call_null_helper() should set RPC_TASK_SOFT
Clean up. All of rpc_call_null_helper() call sites assert RPC_TASK_SOFT, so move that setting into rpc_call_null_helper() itself. Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
This commit is contained in:
parent
eefc536dbd
commit
6fc3737aac
|
@ -1288,7 +1288,7 @@ gss_send_destroy_context(struct rpc_cred *cred)
|
|||
|
||||
trace_rpcgss_ctx_destroy(gss_cred);
|
||||
task = rpc_call_null(gss_auth->client, &new->gc_base,
|
||||
RPC_TASK_ASYNC|RPC_TASK_SOFT);
|
||||
RPC_TASK_ASYNC);
|
||||
if (!IS_ERR(task))
|
||||
rpc_put_task(task);
|
||||
|
||||
|
|
|
@ -2752,7 +2752,7 @@ struct rpc_task *rpc_call_null_helper(struct rpc_clnt *clnt,
|
|||
.rpc_op_cred = cred,
|
||||
.callback_ops = (ops != NULL) ? ops : &rpc_default_ops,
|
||||
.callback_data = data,
|
||||
.flags = flags | RPC_TASK_NULLCREDS,
|
||||
.flags = flags | RPC_TASK_SOFT | RPC_TASK_NULLCREDS,
|
||||
};
|
||||
|
||||
return rpc_run_task(&task_setup_data);
|
||||
|
@ -2816,7 +2816,7 @@ int rpc_clnt_test_and_add_xprt(struct rpc_clnt *clnt,
|
|||
}
|
||||
|
||||
task = rpc_call_null_helper(clnt, xprt, NULL,
|
||||
RPC_TASK_SOFT|RPC_TASK_SOFTCONN|RPC_TASK_ASYNC,
|
||||
RPC_TASK_SOFTCONN|RPC_TASK_ASYNC,
|
||||
&rpc_cb_add_xprt_call_ops, data);
|
||||
|
||||
rpc_put_task(task);
|
||||
|
@ -2859,8 +2859,7 @@ int rpc_clnt_setup_test_and_add_xprt(struct rpc_clnt *clnt,
|
|||
goto out_err;
|
||||
|
||||
/* Test the connection */
|
||||
task = rpc_call_null_helper(clnt, xprt, NULL,
|
||||
RPC_TASK_SOFT | RPC_TASK_SOFTCONN,
|
||||
task = rpc_call_null_helper(clnt, xprt, NULL, RPC_TASK_SOFTCONN,
|
||||
NULL, NULL);
|
||||
if (IS_ERR(task)) {
|
||||
status = PTR_ERR(task);
|
||||
|
|
Loading…
Reference in a new issue