NFSv4: Ensure that we disable the resend timeout for NFSv4

The spec states that the client should not resend requests because
the server will disconnect if it needs to drop an RPC request.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

2 files changed, 3 insertions, 0 deletions

diff --git a/fs/nfs/client.c b/fs/nfs/client.c
index 2dceee4db076..af0325864df6 100644
--- a/fs/nfs/client.c
+++ b/fs/nfs/client.c
@@ -590,6 +590,8 @@ int nfs_create_rpc_client(struct nfs_client *clp,
 
         if (test_bit(NFS_CS_DISCRTRY, &clp->cl_flags))
                 args.flags |= RPC_CLNT_CREATE_DISCRTRY;
+        if (test_bit(NFS_CS_NO_RETRANS_TIMEOUT, &clp->cl_flags))
+                args.flags |= RPC_CLNT_CREATE_NO_RETRANS_TIMEOUT;
         if (test_bit(NFS_CS_NORESVPORT, &clp->cl_flags))
                 args.flags |= RPC_CLNT_CREATE_NONPRIVPORT;
         if (test_bit(NFS_CS_INFINITE_SLOTS, &clp->cl_flags))
diff --git a/fs/nfs/nfs4client.c b/fs/nfs/nfs4client.c
index a860ab566d6e..511cdce6ecf2 100644
--- a/fs/nfs/nfs4client.c
+++ b/fs/nfs/nfs4client.c
@@ -368,6 +368,7 @@ struct nfs_client *nfs4_init_client(struct nfs_client *clp,
         if (clp->cl_minorversion != 0)
                 __set_bit(NFS_CS_INFINITE_SLOTS, &clp->cl_flags);
         __set_bit(NFS_CS_DISCRTRY, &clp->cl_flags);
+        __set_bit(NFS_CS_NO_RETRANS_TIMEOUT, &clp->cl_flags);
         error = nfs_create_rpc_client(clp, timeparms, RPC_AUTH_GSS_KRB5I);
         if (error == -EINVAL)
                 error = nfs_create_rpc_client(clp, timeparms, RPC_AUTH_UNIX);