summaryrefslogtreecommitdiffstats
path: root/fs/nfs/nfs4client.c
diff options
context:
space:
mode:
authorPeng Tao2014-05-29 15:07:00 +0200
committerTom Haynes2015-02-03 20:06:33 +0100
commit064172f3459a914277aa309b2afd3bd5d1c3289a (patch)
tree1365bcc2407efe393cbe7fa39aa8a8fef3cfdf02 /fs/nfs/nfs4client.c
parentnfs41: pull nfs4_ds_connect from file layout to generic pnfs (diff)
downloadkernel-qcow2-linux-064172f3459a914277aa309b2afd3bd5d1c3289a.tar.gz
kernel-qcow2-linux-064172f3459a914277aa309b2afd3bd5d1c3289a.tar.xz
kernel-qcow2-linux-064172f3459a914277aa309b2afd3bd5d1c3289a.zip
nfs41: allow LD to choose DS connection auth flavor
flexfile layout may use different auth flavor as specified by MDS. Reviewed-by: Jeff Layton <jlayton@primarydata.com> Signed-off-by: Peng Tao <tao.peng@primarydata.com> Signed-off-by: Tom Haynes <Thomas.Haynes@primarydata.com>
Diffstat (limited to 'fs/nfs/nfs4client.c')
-rw-r--r--fs/nfs/nfs4client.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/nfs/nfs4client.c b/fs/nfs/nfs4client.c
index 953daa44a282..62d93a116790 100644
--- a/fs/nfs/nfs4client.c
+++ b/fs/nfs/nfs4client.c
@@ -849,7 +849,8 @@ error:
*/
struct nfs_client *nfs4_set_ds_client(struct nfs_client* mds_clp,
const struct sockaddr *ds_addr, int ds_addrlen,
- int ds_proto, unsigned int ds_timeo, unsigned int ds_retrans)
+ int ds_proto, unsigned int ds_timeo, unsigned int ds_retrans,
+ rpc_authflavor_t au_flavor)
{
struct nfs_client_initdata cl_init = {
.addr = ds_addr,
@@ -874,7 +875,7 @@ struct nfs_client *nfs4_set_ds_client(struct nfs_client* mds_clp,
*/
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);
+ au_flavor);
dprintk("<-- %s %p\n", __func__, clp);
return clp;