diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2013-09-26 15:22:45 -0400 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2015-02-16 15:07:42 +0100 |
| commit | 5a88b3915463423b14e19d50e96f35fa2a6f96d1 (patch) | |
| tree | 8481f9b4f2af474559bdab4ea5455e04f26792d5 /net | |
| parent | e204d37abbe3f0de038c750ba75c39250a061cb2 (diff) | |
SUNRPC: call_connect_status should recheck bind and connect status on error
commit 561ec1603171cd9b38dcf6cac53e8710f437a48d upstream.
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>
Acked-by: NeilBrown <neilb@suse.de>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'net')
| -rw-r--r-- | net/sunrpc/clnt.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c index f318a95ec64d..27826e1471ff 100644 --- a/net/sunrpc/clnt.c +++ b/net/sunrpc/clnt.c @@ -1699,6 +1699,7 @@ call_connect_status(struct rpc_task *task) dprint_status(task); trace_rpc_connect_status(task, status); + task->tk_status = 0; switch (status) { /* if soft mounted, test if we've timed out */ case -ETIMEDOUT: @@ -1707,12 +1708,14 @@ call_connect_status(struct rpc_task *task) case -ECONNREFUSED: case -ECONNRESET: case -ENETUNREACH: + /* retry with existing socket, after a delay */ + rpc_delay(task, 3*HZ); if (RPC_IS_SOFTCONN(task)) break; - /* retry with existing socket, after a delay */ - case 0: case -EAGAIN: - task->tk_status = 0; + task->tk_action = call_bind; + return; + case 0: clnt->cl_stats->netreconn++; task->tk_action = call_transmit; return; |