Revert "SUNRPC: Remove unreachable error condition"

This reverts commit 079b1b1bf67d57d3af767492ba7684e4bd2eb5c2.

The assumption that it is impossible to return an ERR pointer from
rpc_run_task() no longer holds due to commit 4c22bccac1fd ("SUNRPC:
Handle allocation failure in rpc_new_task()").

Fixes: 4c22bccac1fd ('SUNRPC: Handle allocation failure in rpc_new_task()')
Fixes: 079b1b1bf67d ('SUNRPC: Remove unreachable error condition')
Signed-off-by: Dan Aloni <dan.aloni@vastdata.com>
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>

diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index 7d268a291486ba54f692cbc8dfd1a8dd79529530..c284efa3d1efc2ef4ccab136911365ead224f22d 100644 (file)
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -2873,6 +2873,9 @@ int rpc_clnt_test_and_add_xprt(struct rpc_clnt *clnt,
 
        task = rpc_call_null_helper(clnt, xprt, NULL, RPC_TASK_ASYNC,
                        &rpc_cb_add_xprt_call_ops, data);
+       if (IS_ERR(task))
+               return PTR_ERR(task);
+
        data->xps->xps_nunique_destaddr_xprts++;
        rpc_put_task(task);
 success: