diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2013-09-26 21:22:45 +0200 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2013-10-02 00:22:12 +0200 |
| commit | 561ec1603171cd9b38dcf6cac53e8710f437a48d (patch) | |
| tree | ecb67db63fee0218833abbfaf21f0778ec743112 /net/sunrpc/clnt.c | |
| parent | SUNRPC: Remove redundant initialisations of request rq_bytes_sent (diff) | |
| download | linux-561ec1603171cd9b38dcf6cac53e8710f437a48d.tar.xz linux-561ec1603171cd9b38dcf6cac53e8710f437a48d.zip | |
SUNRPC: call_connect_status should recheck bind and connect status on error
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>
Diffstat (limited to 'net/sunrpc/clnt.c')
| -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 bde31159f632..7352aef8a254 100644 --- a/net/sunrpc/clnt.c +++ b/net/sunrpc/clnt.c @@ -1692,6 +1692,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: @@ -1700,12 +1701,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; |