aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-06-29 09:02:22 (GMT)
committerLinus Torvalds <torvalds@linux-foundation.org>2019-06-29 09:02:22 (GMT)
commitc949c30b2640e52b580e1a230e3561d1662195ba (patch)
tree6961f9310be5e9595cf9c115b197197cda9fdf36 /fs
parent43251dbd6ac278a8bdaaee43ec5e299c1a5dafdd (diff)
parent68f461593f76bd5f17e87cdd0bea28f4278c7268 (diff)
downloadkernel_replicant_linux-c949c30b2640e52b580e1a230e3561d1662195ba.zip
kernel_replicant_linux-c949c30b2640e52b580e1a230e3561d1662195ba.tar.gz
kernel_replicant_linux-c949c30b2640e52b580e1a230e3561d1662195ba.tar.bz2
Merge tag 'nfs-for-5.2-4' of git://git.linux-nfs.org/projects/anna/linux-nfs
Pull two more NFS client fixes from Anna Schumaker: "These are both stable fixes. One to calculate the correct client message length in the case of partial transmissions. And the other to set the proper TCP timeout for flexfiles" * tag 'nfs-for-5.2-4' of git://git.linux-nfs.org/projects/anna/linux-nfs: NFS/flexfiles: Use the correct TCP timeout for flexfiles I/O SUNRPC: Fix up calculation of client message length
Diffstat (limited to 'fs')
-rw-r--r--fs/nfs/flexfilelayout/flexfilelayoutdev.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/flexfilelayout/flexfilelayoutdev.c b/fs/nfs/flexfilelayout/flexfilelayoutdev.c
index a809989..19f856f 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);