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 /include/linux/sunrpc | |
parent | 0b9e79431377df452348e78262dd5a3dc359eeef (diff) |
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 'include/linux/sunrpc')
-rw-r--r-- | include/linux/sunrpc/xprt.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/sunrpc/xprt.h b/include/linux/sunrpc/xprt.h index 6f9457a75b8f..8263f7aefedf 100644 --- a/include/linux/sunrpc/xprt.h +++ b/include/linux/sunrpc/xprt.h | |||
@@ -174,8 +174,7 @@ struct rpc_xprt { | |||
174 | /* | 174 | /* |
175 | * Connection of transports | 175 | * Connection of transports |
176 | */ | 176 | */ |
177 | unsigned long connect_timeout, | 177 | unsigned long bind_timeout, |
178 | bind_timeout, | ||
179 | reestablish_timeout; | 178 | reestablish_timeout; |
180 | unsigned int connect_cookie; /* A cookie that gets bumped | 179 | unsigned int connect_cookie; /* A cookie that gets bumped |
181 | every time the transport | 180 | every time the transport |