summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChuck Lever <chuck.lever@oracle.com>2020-05-12 23:13:44 +0200
committerAnna Schumaker <Anna.Schumaker@Netapp.com>2020-06-11 19:33:48 +0200
commiteefc536dbdf1c55777bb192dfac2faf0993d8e10 (patch)
tree04a05724108bfe084f3cb93a4f122d4dc4429c92
parentSUNRPC: trace RPC client lifetime events (diff)
downloadlinux-eefc536dbdf1c55777bb192dfac2faf0993d8e10.tar.xz
linux-eefc536dbdf1c55777bb192dfac2faf0993d8e10.zip
SUNRPC: rpc_call_null_helper() already sets RPC_TASK_NULLCREDS
Clean up. Commit a52458b48af1 ("NFS/NFSD/SUNRPC: replace generic creds with 'struct cred'.") made rpc_call_null_helper() set RPC_TASK_NULLCREDS unconditionally. Therefore there's no need for rpc_call_null_helper()'s call sites to set RPC_TASK_NULLCREDS. Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
-rw-r--r--net/sunrpc/clnt.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index 4614a6eebfe1..db2eaac1c1ef 100644
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -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_NULLCREDS,
+ RPC_TASK_SOFT|RPC_TASK_SOFTCONN|RPC_TASK_ASYNC,
&rpc_cb_add_xprt_call_ops, data);
rpc_put_task(task);
@@ -2860,7 +2860,7 @@ int rpc_clnt_setup_test_and_add_xprt(struct rpc_clnt *clnt,
/* Test the connection */
task = rpc_call_null_helper(clnt, xprt, NULL,
- RPC_TASK_SOFT | RPC_TASK_SOFTCONN | RPC_TASK_NULLCREDS,
+ RPC_TASK_SOFT | RPC_TASK_SOFTCONN,
NULL, NULL);
if (IS_ERR(task)) {
status = PTR_ERR(task);