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>

diff --git a/net/sunrpc/auth_gss/auth_gss.c b/net/sunrpc/auth_gss/auth_gss.c
index 429f17459ae395699d122bbca950f3dfb4f3b6a0..4ecc2a9595674a783140cc22e862fe5e6c5dc34e 100644 (file)
--- a/net/sunrpc/auth_gss/auth_gss.c
+++ b/net/sunrpc/auth_gss/auth_gss.c
@@ -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);
 

diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index db2eaac1c1ef8bc40a3e473bf8f3952726e61ccc..056606839f521edb12008dd6bc9e2b77a76b4b2f 100644 (file)
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -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);