UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: 561ec16031 (SUNRPC: call_connect_status should recheck bind..)
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
This commit is contained in:
Trond Myklebust 2014-03-17 12:51:44 -04:00
parent f7be728468
commit 485f225178
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net/sunrpc/clnt.c
View File

@ -1798,10 +1798,6 @@ call_connect_status(struct rpc_task *task)
trace_rpc_connect_status(task, status); trace_rpc_connect_status(task, status);
task->tk_status = 0; task->tk_status = 0;
switch (status) { switch (status) {
/* if soft mounted, test if we've timed out */
case -ETIMEDOUT:
task->tk_action = call_timeout;
return;
case -ECONNREFUSED: case -ECONNREFUSED:
case -ECONNRESET: case -ECONNRESET:
case -ECONNABORTED: case -ECONNABORTED:
@ -1812,7 +1808,9 @@ call_connect_status(struct rpc_task *task)
if (RPC_IS_SOFTCONN(task)) if (RPC_IS_SOFTCONN(task))
break; break;
case -EAGAIN: case -EAGAIN:
task->tk_action = call_bind; /* Check for timeouts before looping back to call_bind */
case -ETIMEDOUT:
task->tk_action = call_timeout;
return; return;
case 0: case 0:
clnt->cl_stats->netreconn++; clnt->cl_stats->netreconn++;