diff options
Diffstat (limited to 'fs/nfs/nfs4client.c')
-rw-r--r-- | fs/nfs/nfs4client.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/nfs/nfs4client.c b/fs/nfs/nfs4client.c index 706ad10b8186..8646af9b11d2 100644 --- a/fs/nfs/nfs4client.c +++ b/fs/nfs/nfs4client.c | |||
@@ -849,14 +849,15 @@ error: | |||
849 | */ | 849 | */ |
850 | struct nfs_client *nfs4_set_ds_client(struct nfs_client* mds_clp, | 850 | struct nfs_client *nfs4_set_ds_client(struct nfs_client* mds_clp, |
851 | const struct sockaddr *ds_addr, int ds_addrlen, | 851 | const struct sockaddr *ds_addr, int ds_addrlen, |
852 | int ds_proto, unsigned int ds_timeo, unsigned int ds_retrans) | 852 | int ds_proto, unsigned int ds_timeo, unsigned int ds_retrans, |
853 | u32 minor_version, rpc_authflavor_t au_flavor) | ||
853 | { | 854 | { |
854 | struct nfs_client_initdata cl_init = { | 855 | struct nfs_client_initdata cl_init = { |
855 | .addr = ds_addr, | 856 | .addr = ds_addr, |
856 | .addrlen = ds_addrlen, | 857 | .addrlen = ds_addrlen, |
857 | .nfs_mod = &nfs_v4, | 858 | .nfs_mod = &nfs_v4, |
858 | .proto = ds_proto, | 859 | .proto = ds_proto, |
859 | .minorversion = mds_clp->cl_minorversion, | 860 | .minorversion = minor_version, |
860 | .net = mds_clp->cl_net, | 861 | .net = mds_clp->cl_net, |
861 | }; | 862 | }; |
862 | struct rpc_timeout ds_timeout; | 863 | struct rpc_timeout ds_timeout; |
@@ -874,7 +875,7 @@ struct nfs_client *nfs4_set_ds_client(struct nfs_client* mds_clp, | |||
874 | */ | 875 | */ |
875 | nfs_init_timeout_values(&ds_timeout, ds_proto, ds_timeo, ds_retrans); | 876 | nfs_init_timeout_values(&ds_timeout, ds_proto, ds_timeo, ds_retrans); |
876 | clp = nfs_get_client(&cl_init, &ds_timeout, mds_clp->cl_ipaddr, | 877 | clp = nfs_get_client(&cl_init, &ds_timeout, mds_clp->cl_ipaddr, |
877 | mds_clp->cl_rpcclient->cl_auth->au_flavor); | 878 | au_flavor); |
878 | 879 | ||
879 | dprintk("<-- %s %p\n", __func__, clp); | 880 | dprintk("<-- %s %p\n", __func__, clp); |
880 | return clp; | 881 | return clp; |