summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorWeston Andros Adamson <dros@netapp.com>2013-03-01 02:30:08 +0100
committerTrond Myklebust <Trond.Myklebust@netapp.com>2013-03-01 02:35:00 +0100
commiteb97cbb459c656b542101091f67ce112b3e56183 (patch)
treeda960d98b0b2c26f72379855859ddf23081b4dfe /fs
parentNFSv4: Fix another open/open_recovery deadlock (diff)
downloadlinux-eb97cbb459c656b542101091f67ce112b3e56183.tar.xz
linux-eb97cbb459c656b542101091f67ce112b3e56183.zip
PNFS: set the default DS timeout to 60 seconds
The client should have 60 second default timeouts for DS operations, not 6 seconds. NFS4_DEF_DS_TIMEO is used as "timeout in tenths of a second" in nfs_init_timeout_values (and is not used anywhere else). This matches up with the description of the module param dataserver_timeo. Signed-off-by: Weston Andros Adamson <dros@netapp.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/nfs/nfs4filelayout.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/nfs4filelayout.h b/fs/nfs/nfs4filelayout.h
index 8c07241fe52b..b8da95548d3d 100644
--- a/fs/nfs/nfs4filelayout.h
+++ b/fs/nfs/nfs4filelayout.h
@@ -36,7 +36,7 @@
* Default data server connection timeout and retrans vaules.
* Set by module paramters dataserver_timeo and dataserver_retrans.
*/
-#define NFS4_DEF_DS_TIMEO 60
+#define NFS4_DEF_DS_TIMEO 600 /* in tenths of a second */
#define NFS4_DEF_DS_RETRANS 5
/*