summaryrefslogtreecommitdiffstats
path: root/net/sunrpc
diff options
context:
space:
mode:
authorTrond Myklebust2014-03-17 17:51:44 +0100
committerTrond Myklebust2014-03-17 20:14:18 +0100
commit485f2251782f7c44299c491d4676a8a01428d191 (patch)
tree560c2aab7afbb9401f7831936d4cace7fa257df0 /net/sunrpc
parentnfs: emit a fsnotify_nameremove call in sillyrename codepath (diff)
downloadkernel-qcow2-linux-485f2251782f7c44299c491d4676a8a01428d191.tar.gz
kernel-qcow2-linux-485f2251782f7c44299c491d4676a8a01428d191.tar.xz
kernel-qcow2-linux-485f2251782f7c44299c491d4676a8a01428d191.zip
SUNRPC: Ensure that call_connect times out correctly
When the server is unavailable due to a networking error, etc, we want the RPC client to respect the timeout delays when attempting to reconnect. Reported-by: Neil Brown <neilb@suse.de> Fixes: 561ec1603171 (SUNRPC: call_connect_status should recheck bind..) Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Diffstat (limited to 'net/sunrpc')
-rw-r--r--net/sunrpc/clnt.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index 0edada973434..5a1b8fa9ca13 100644
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -1798,10 +1798,6 @@ call_connect_status(struct rpc_task *task)
trace_rpc_connect_status(task, status);
task->tk_status = 0;
switch (status) {
- /* if soft mounted, test if we've timed out */
- case -ETIMEDOUT:
- task->tk_action = call_timeout;
- return;
case -ECONNREFUSED:
case -ECONNRESET:
case -ECONNABORTED:
@@ -1812,7 +1808,9 @@ call_connect_status(struct rpc_task *task)
if (RPC_IS_SOFTCONN(task))
break;
case -EAGAIN:
- task->tk_action = call_bind;
+ /* Check for timeouts before looping back to call_bind */
+ case -ETIMEDOUT:
+ task->tk_action = call_timeout;
return;
case 0:
clnt->cl_stats->netreconn++;