SUNRPC: Ensure that call_bind times out correctly

If the rpcbind server is unavailable, we still want the RPC client
to respect the timeout.

Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>

1 files changed, 2 insertions, 3 deletions

diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index 5a1b8fa9ca13..cea1308a6fda 100644
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -1728,9 +1728,7 @@ call_bind_status(struct rpc_task *task)
         case -EPROTONOSUPPORT:
                 dprintk("RPC: %5u remote rpcbind version unavailable, retrying\n",
                                 task->tk_pid);
-                task->tk_status = 0;
-                task->tk_action = call_bind;
-                return;
+                goto retry_timeout;
         case -ECONNREFUSED:             /* connection problems */
         case -ECONNRESET:
         case -ECONNABORTED:
@@ -1756,6 +1754,7 @@ call_bind_status(struct rpc_task *task)
         return;
 
 retry_timeout:
+        task->tk_status = 0;
         task->tk_action = call_timeout;
 }