lkml.org 
[lkml]   [2019]   [Apr]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.19 39/68] NFS: Fix a typo in nfs_init_timeout_values()
    Date
    From: Trond Myklebust <trond.myklebust@hammerspace.com>

    [ 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: a956beda19a6 ("NFS: Allow the mount option retrans=0")
    Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
    Signed-off-by: Sasha Levin (Microsoft) <sashal@kernel.org>
    ---
    fs/nfs/client.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/fs/nfs/client.c b/fs/nfs/client.c
    index 96d5f8135eb9..751ca65da8a3 100644
    --- a/fs/nfs/client.c
    +++ b/fs/nfs/client.c
    @@ -459,7 +459,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;
    --
    2.19.1
    \
     
     \ /
      Last update: 2019-04-22 22:03    [W:4.130 / U:2.348 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site