From: Trond Myklebust <trond.myklebust@primarydata.com>
Date: Mon, 17 Mar 2014 16:51:44 +0000 (-0400)
Subject: SUNRPC: Ensure that call_connect times out correctly
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=485f2251782f7c44299c491d4676a8a01428d191;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

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>
---

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++;