From 42de1c3c34235785245e56149531d7ad5a30f5b4 Mon Sep 17 00:00:00 2001
From: Weston Andros Adamson <dros@netapp.com>
Date: Thu, 28 Feb 2013 20:30:08 -0500
Subject: [PATCH] --- yaml --- r: 360511 b: refs/heads/master c:
 eb97cbb459c656b542101091f67ce112b3e56183 h: refs/heads/master i:   360509:
 f28bb790abbff32d41157ba0162497df43156f27   360507:
 ebad3dd4f1de588824065ebf6676709be6524e64   360503:
 965b67cf1b643a8bdeda6fa958b37a6d77b055e0   360495:
 62bb13ad9a87527905daa62786ca70a5e78a30b4   360479:
 de80d9d5c72df6c1d43576bb8b8a40d359f6059c   360447:
 3a4bf497e7a843cc50db413d30171c18d46750c0 v: v3

---
 [refs]                        | 2 +-
 trunk/fs/nfs/nfs4filelayout.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 3b5f6e6955e2..5113bd04e96c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7aa262b522ee5a7f1bf9b8fe34539b262ba6da0a
+refs/heads/master: eb97cbb459c656b542101091f67ce112b3e56183
diff --git a/trunk/fs/nfs/nfs4filelayout.h b/trunk/fs/nfs/nfs4filelayout.h
index 8c07241fe52b..b8da95548d3d 100644
--- a/trunk/fs/nfs/nfs4filelayout.h
+++ b/trunk/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
 
 /*