diff options
| author | Trond Myklebust <trondmy@gmail.com> | 2019-06-25 16:41:16 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-07-03 13:14:46 +0200 |
| commit | 27380331755f1b17a49cb3d2c7db43d10ec8749a (patch) | |
| tree | 34ae12839331e9426967f5f90c0620c7ebcc7930 /fs | |
| parent | 01a02a98ab1c503298864f565d7cab1af5561497 (diff) | |
| download | linux-stable-27380331755f1b17a49cb3d2c7db43d10ec8749a.tar.gz linux-stable-27380331755f1b17a49cb3d2c7db43d10ec8749a.tar.bz2 linux-stable-27380331755f1b17a49cb3d2c7db43d10ec8749a.zip | |
NFS/flexfiles: Use the correct TCP timeout for flexfiles I/O
commit 68f461593f76bd5f17e87cdd0bea28f4278c7268 upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/nfs/flexfilelayout/flexfilelayoutdev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/flexfilelayout/flexfilelayoutdev.c b/fs/nfs/flexfilelayout/flexfilelayoutdev.c index a8df2f496898..364028c710a8 100644 --- a/fs/nfs/flexfilelayout/flexfilelayoutdev.c +++ b/fs/nfs/flexfilelayout/flexfilelayoutdev.c @@ -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); |