sunrpc: remove unnecessary test in rpc_task_set_client()

In rpc_task_set_client(), testing for a NULL clnt is not necessary, as
clnt should always be a valid pointer to a rpc_client.

Signed-off-by: Thiago Rafael Becker <trbecker@gmail.com>
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>

diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index f056ff93144427da8f9dcf5c74da2629b1f66b0a..a312ea2bc4405917e6e9ec6b41974a32e931f729 100644 (file)
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -1076,24 +1076,21 @@ void rpc_task_set_transport(struct rpc_task *task, struct rpc_clnt *clnt)
 static
 void rpc_task_set_client(struct rpc_task *task, struct rpc_clnt *clnt)
 {
-
-       if (clnt != NULL) {
-               rpc_task_set_transport(task, clnt);
-               task->tk_client = clnt;
-               refcount_inc(&clnt->cl_count);
-               if (clnt->cl_softrtry)
-                       task->tk_flags |= RPC_TASK_SOFT;
-               if (clnt->cl_softerr)
-                       task->tk_flags |= RPC_TASK_TIMEOUT;
-               if (clnt->cl_noretranstimeo)
-                       task->tk_flags |= RPC_TASK_NO_RETRANS_TIMEOUT;
-               if (atomic_read(&clnt->cl_swapper))
-                       task->tk_flags |= RPC_TASK_SWAPPER;
-               /* Add to the client's list of all tasks */
-               spin_lock(&clnt->cl_lock);
-               list_add_tail(&task->tk_task, &clnt->cl_tasks);
-               spin_unlock(&clnt->cl_lock);
-       }
+       rpc_task_set_transport(task, clnt);
+       task->tk_client = clnt;
+       refcount_inc(&clnt->cl_count);
+       if (clnt->cl_softrtry)
+               task->tk_flags |= RPC_TASK_SOFT;
+       if (clnt->cl_softerr)
+               task->tk_flags |= RPC_TASK_TIMEOUT;
+       if (clnt->cl_noretranstimeo)
+               task->tk_flags |= RPC_TASK_NO_RETRANS_TIMEOUT;
+       if (atomic_read(&clnt->cl_swapper))
+               task->tk_flags |= RPC_TASK_SWAPPER;
+       /* Add to the client's list of all tasks */
+       spin_lock(&clnt->cl_lock);
+       list_add_tail(&task->tk_task, &clnt->cl_tasks);
+       spin_unlock(&clnt->cl_lock);
 }
 
 static void