OSDN Git Service

NFS/flexfiles: Use the correct TCP timeout for flexfiles I/O
authorTrond Myklebust <trondmy@gmail.com>
Tue, 25 Jun 2019 20:41:16 +0000 (16:41 -0400)
committerAnna Schumaker <Anna.Schumaker@Netapp.com>
Fri, 28 Jun 2019 15:48:52 +0000 (11:48 -0400)
Fix a typo where we're confusing the default TCP retrans value
(NFS_DEF_TCP_RETRANS) for the default TCP timeout value.

Fixes: 15d03055cf39f ("pNFS/flexfiles: Set reasonable default ...")
Cc: stable@vger.kernel.org # 4.8+
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
fs/nfs/flexfilelayout/flexfilelayoutdev.c

index a809989..19f856f 100644 (file)
@@ -18,7 +18,7 @@
 
 #define NFSDBG_FACILITY                NFSDBG_PNFS_LD
 
-static unsigned int dataserver_timeo = NFS_DEF_TCP_RETRANS;
+static unsigned int dataserver_timeo = NFS_DEF_TCP_TIMEO;
 static unsigned int dataserver_retrans;
 
 static bool ff_layout_has_available_ds(struct pnfs_layout_segment *lseg);