1 files changed, 4 insertions, 8 deletions

diff --git a/fs/nfs/client.c b/fs/nfs/client.c
index 8f1c65210afb..b4e2199c32b3 100644
--- a/fs/nfs/client.c
+++ b/fs/nfs/client.c
@@ -1477,8 +1477,8 @@ error:
  * the MDS.
  */
 struct nfs_client *nfs4_set_ds_client(struct nfs_client* mds_clp,
-                const struct sockaddr *ds_addr,
-                int ds_addrlen, int ds_proto)
+                const struct sockaddr *ds_addr, int ds_addrlen,
+                int ds_proto, unsigned int ds_timeo, unsigned int ds_retrans)
 {
         struct nfs_client_initdata cl_init = {
                 .addr = ds_addr,
@@ -1488,12 +1488,7 @@ struct nfs_client *nfs4_set_ds_client(struct nfs_client* mds_clp,
                 .minorversion = mds_clp->cl_minorversion,
                 .net = mds_clp->net,
         };
-        struct rpc_timeout ds_timeout = {
-                .to_initval = 15 * HZ,
-                .to_maxval = 15 * HZ,
-                .to_retries = 1,
-                .to_exponential = 1,
-        };
+        struct rpc_timeout ds_timeout;
         struct nfs_client *clp;
 
         /*
@@ -1501,6 +1496,7 @@ struct nfs_client *nfs4_set_ds_client(struct nfs_client* mds_clp,
          * cl_ipaddr so as to use the same EXCHANGE_ID co_ownerid as the MDS
          * (section 13.1 RFC 5661).
          */
+        nfs_init_timeout_values(&ds_timeout, ds_proto, ds_timeo, ds_retrans);
         clp = nfs_get_client(&cl_init, &ds_timeout, mds_clp->cl_ipaddr,
                              mds_clp->cl_rpcclient->cl_auth->au_flavor, 0);