Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 986fa92b authored by Trond Myklebust's avatar Trond Myklebust Committed by Greg Kroah-Hartman
Browse files

NFS: Fix a typo in nfs_init_timeout_values() 



[ Upstream commit 5a698243930c441afccec04e4d5dc8febfd2b775 ]

Specifying a retrans=0 mount parameter to a NFS/TCP mount, is
inadvertently causing the NFS client to rewrite any specified
timeout parameter to the default of 60 seconds.

Fixes: a956beda ("NFS: Allow the mount option retrans=0")
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: default avatarSasha Levin (Microsoft) <sashal@kernel.org>
parent 63bbfd06

fs/nfs/client.c

+1 −1
Original line number Diff line number Diff line
@@ -440,7 +440,7 @@ void nfs_init_timeout_values(struct rpc_timeout *to, int proto, 
	case XPRT_TRANSPORT_RDMA:

		if (retrans == NFS_UNSPEC_RETRANS)

			to->to_retries = NFS_DEF_TCP_RETRANS;

		if (timeo == NFS_UNSPEC_TIMEO || to->to_retries == 0)

		if (timeo == NFS_UNSPEC_TIMEO || to->to_initval == 0)

			to->to_initval = NFS_DEF_TCP_TIMEO * HZ / 10;

		if (to->to_initval > NFS_MAX_TCP_TIMEOUT)

			to->to_initval = NFS_MAX_TCP_TIMEOUT;