summaryrefslogtreecommitdiffstats
path: root/include/linux/sunrpc/xprt.h
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2010-04-16 16:42:12 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2010-05-14 15:09:30 -0400
commita8ce4a8f37fef0a09a1e920c2e09f67a80426c7e (patch)
treecd3c11c87fa63c8bf15e74f311560a83637fc3fa /include/linux/sunrpc/xprt.h
parent0b9e79431377df452348e78262dd5a3dc359eeef (diff)
downloadlinux-stable-a8ce4a8f37fef0a09a1e920c2e09f67a80426c7e.tar.gz
linux-stable-a8ce4a8f37fef0a09a1e920c2e09f67a80426c7e.tar.bz2
linux-stable-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 'include/linux/sunrpc/xprt.h')
-rw-r--r--include/linux/sunrpc/xprt.h3
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 {
/*
* Connection of transports
*/
- unsigned long connect_timeout,
- bind_timeout,
+ unsigned long bind_timeout,
reestablish_timeout;
unsigned int connect_cookie; /* A cookie that gets bumped
every time the transport