leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SUNRPC: call_connect_status should recheck bind and connect status on error

Browse Source 
Currently, we go directly to call_transmit which sends us to call_status
on error. If we know that the connect attempt failed, we should rather
just jump straight back to call_bind and call_connect.

Ditto for EAGAIN, except do not delay.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
Trond Myklebust 2013-09-26 15:22:45 -04:00
parent 9255194817
commit 561ec16031
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
net/sunrpc/clnt.c
View File

@ -1692,6 +1692,7 @@ call_connect_status(struct rpc_task *task)
dprint_status(task); dprint_status(task);
trace_rpc_connect_status(task, status); trace_rpc_connect_status(task, status);
task->tk_status = 0;
switch (status) { switch (status) {
/* if soft mounted, test if we've timed out */ /* if soft mounted, test if we've timed out */
case -ETIMEDOUT: case -ETIMEDOUT:
@ -1700,12 +1701,14 @@ call_connect_status(struct rpc_task *task)
case -ECONNREFUSED: case -ECONNREFUSED:
case -ECONNRESET: case -ECONNRESET:
case -ENETUNREACH: case -ENETUNREACH:
/* retry with existing socket, after a delay */
rpc_delay(task, 3*HZ);
if (RPC_IS_SOFTCONN(task)) if (RPC_IS_SOFTCONN(task))
break; break;
/* retry with existing socket, after a delay */
case 0:
case -EAGAIN: case -EAGAIN:
task->tk_status = 0; task->tk_action = call_bind;
return;
case 0:
clnt->cl_stats->netreconn++; clnt->cl_stats->netreconn++;
task->tk_action = call_transmit; task->tk_action = call_transmit;
return; return;