diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-12-20 16:03:54 -0500 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-01-30 02:05:58 -0500 |
commit | 2881ae74e68ecfe3b32a90936e5d93a9ba598c3a (patch) | |
tree | d454fdf3b5da159935ca268648d45b5d1a29027d /net/sunrpc/xprtrdma | |
parent | 698b6d088e8a5d907596c689d5ae9109611c5b59 (diff) |
SUNRPC: Clean up the transport timeout initialisation
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'net/sunrpc/xprtrdma')
-rw-r--r-- | net/sunrpc/xprtrdma/transport.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/net/sunrpc/xprtrdma/transport.c b/net/sunrpc/xprtrdma/transport.c index 73033d824eed..39f10016c86b 100644 --- a/net/sunrpc/xprtrdma/transport.c +++ b/net/sunrpc/xprtrdma/transport.c | |||
@@ -289,6 +289,11 @@ xprt_rdma_destroy(struct rpc_xprt *xprt) | |||
289 | module_put(THIS_MODULE); | 289 | module_put(THIS_MODULE); |
290 | } | 290 | } |
291 | 291 | ||
292 | static const struct rpc_timeout xprt_rdma_default_timeout = { | ||
293 | .to_initval = 60 * HZ, | ||
294 | .to_maxval = 60 * HZ, | ||
295 | }; | ||
296 | |||
292 | /** | 297 | /** |
293 | * xprt_setup_rdma - Set up transport to use RDMA | 298 | * xprt_setup_rdma - Set up transport to use RDMA |
294 | * | 299 | * |
@@ -327,7 +332,7 @@ xprt_setup_rdma(struct xprt_create *args) | |||
327 | } | 332 | } |
328 | 333 | ||
329 | /* 60 second timeout, no retries */ | 334 | /* 60 second timeout, no retries */ |
330 | xprt_set_timeout(&xprt->timeout, 0, 60UL * HZ); | 335 | memcpy(&xprt->timeout, &xprt_rdma_default_timeout, sizeof(xprt->timeout)); |
331 | xprt->bind_timeout = (60U * HZ); | 336 | xprt->bind_timeout = (60U * HZ); |
332 | xprt->connect_timeout = (60U * HZ); | 337 | xprt->connect_timeout = (60U * HZ); |
333 | xprt->reestablish_timeout = (5U * HZ); | 338 | xprt->reestablish_timeout = (5U * HZ); |