diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2010-04-16 16:42:12 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2010-05-14 15:09:30 -0400 |
| commit | a8ce4a8f37fef0a09a1e920c2e09f67a80426c7e (patch) | |
| tree | cd3c11c87fa63c8bf15e74f311560a83637fc3fa /net/sunrpc/xprt.c | |
| parent | 0b9e79431377df452348e78262dd5a3dc359eeef (diff) | |
| download | linux-3.10-a8ce4a8f37fef0a09a1e920c2e09f67a80426c7e.tar.gz linux-3.10-a8ce4a8f37fef0a09a1e920c2e09f67a80426c7e.tar.bz2 linux-3.10-a8ce4a8f37fef0a09a1e920c2e09f67a80426c7e.zip | |
SUNRPC: Fail over more quickly on connect errors
We should not allow soft tasks to wait for longer than the major timeout
period when waiting for a reconnect to occur.
Remove the field xprt->connect_timeout since it has been obsoleted by
xprt->reestablish_timeout.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'net/sunrpc/xprt.c')
| -rw-r--r-- | net/sunrpc/xprt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c index c71d835165e..6c9997ef386 100644 --- a/net/sunrpc/xprt.c +++ b/net/sunrpc/xprt.c @@ -710,7 +710,7 @@ void xprt_connect(struct rpc_task *task) if (task->tk_rqstp) task->tk_rqstp->rq_bytes_sent = 0; - task->tk_timeout = xprt->connect_timeout; + task->tk_timeout = task->tk_rqstp->rq_timeout; rpc_sleep_on(&xprt->pending, task, xprt_connect_status); if (test_bit(XPRT_CLOSING, &xprt->state)) |