diff options
author | Peng Tao <tao.peng@primarydata.com> | 2014-05-29 09:07:00 -0400 |
---|---|---|
committer | Tom Haynes <loghyr@primarydata.com> | 2015-02-03 14:06:33 -0500 |
commit | 064172f3459a914277aa309b2afd3bd5d1c3289a (patch) | |
tree | 1365bcc2407efe393cbe7fa39aa8a8fef3cfdf02 | |
parent | 7405f9e195aab95e147cc225f203d11fa74b65a8 (diff) |
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>
-rw-r--r-- | fs/nfs/filelayout/filelayoutdev.c | 3 | ||||
-rw-r--r-- | fs/nfs/internal.h | 3 | ||||
-rw-r--r-- | fs/nfs/nfs4client.c | 5 | ||||
-rw-r--r-- | fs/nfs/pnfs.h | 2 | ||||
-rw-r--r-- | fs/nfs/pnfs_nfs.c | 10 |
5 files changed, 14 insertions, 9 deletions
diff --git a/fs/nfs/filelayout/filelayoutdev.c b/fs/nfs/filelayout/filelayoutdev.c index 27bdd8ce177e..5e4b0cea84c8 100644 --- a/fs/nfs/filelayout/filelayoutdev.c +++ b/fs/nfs/filelayout/filelayoutdev.c | |||
@@ -278,7 +278,8 @@ nfs4_fl_prepare_ds(struct pnfs_layout_segment *lseg, u32 ds_idx) | |||
278 | goto out_test_devid; | 278 | goto out_test_devid; |
279 | 279 | ||
280 | nfs4_pnfs_ds_connect(s, ds, devid, dataserver_timeo, | 280 | nfs4_pnfs_ds_connect(s, ds, devid, dataserver_timeo, |
281 | dataserver_retrans); | 281 | dataserver_retrans, |
282 | s->nfs_client->cl_rpcclient->cl_auth->au_flavor); | ||
282 | 283 | ||
283 | out_test_devid: | 284 | out_test_devid: |
284 | if (filelayout_test_devid_unavailable(devid)) | 285 | if (filelayout_test_devid_unavailable(devid)) |
diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h index efaa31c70fbe..7d7c36ff09fa 100644 --- a/fs/nfs/internal.h +++ b/fs/nfs/internal.h | |||
@@ -189,7 +189,8 @@ extern struct nfs_client *nfs4_set_ds_client(struct nfs_client* mds_clp, | |||
189 | const struct sockaddr *ds_addr, | 189 | const struct sockaddr *ds_addr, |
190 | int ds_addrlen, int ds_proto, | 190 | int ds_addrlen, int ds_proto, |
191 | unsigned int ds_timeo, | 191 | unsigned int ds_timeo, |
192 | unsigned int ds_retrans); | 192 | unsigned int ds_retrans, |
193 | rpc_authflavor_t au_flavor); | ||
193 | extern struct rpc_clnt *nfs4_find_or_create_ds_client(struct nfs_client *, | 194 | extern struct rpc_clnt *nfs4_find_or_create_ds_client(struct nfs_client *, |
194 | struct inode *); | 195 | struct inode *); |
195 | #ifdef CONFIG_PROC_FS | 196 | #ifdef CONFIG_PROC_FS |
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: | |||
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 | 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, |
@@ -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; |
diff --git a/fs/nfs/pnfs.h b/fs/nfs/pnfs.h index 9a8937c31d97..2ea9e9a7d85e 100644 --- a/fs/nfs/pnfs.h +++ b/fs/nfs/pnfs.h | |||
@@ -314,7 +314,7 @@ struct nfs4_pnfs_ds *nfs4_pnfs_ds_add(struct list_head *dsaddrs, | |||
314 | gfp_t gfp_flags); | 314 | gfp_t gfp_flags); |
315 | void nfs4_pnfs_ds_connect(struct nfs_server *mds_srv, struct nfs4_pnfs_ds *ds, | 315 | void nfs4_pnfs_ds_connect(struct nfs_server *mds_srv, struct nfs4_pnfs_ds *ds, |
316 | struct nfs4_deviceid_node *devid, unsigned int timeo, | 316 | struct nfs4_deviceid_node *devid, unsigned int timeo, |
317 | unsigned int retrans); | 317 | unsigned int retrans, rpc_authflavor_t au_flavor); |
318 | struct nfs4_pnfs_ds_addr *nfs4_decode_mp_ds_addr(struct net *net, | 318 | struct nfs4_pnfs_ds_addr *nfs4_decode_mp_ds_addr(struct net *net, |
319 | struct xdr_stream *xdr, | 319 | struct xdr_stream *xdr, |
320 | gfp_t gfp_flags); | 320 | gfp_t gfp_flags); |
diff --git a/fs/nfs/pnfs_nfs.c b/fs/nfs/pnfs_nfs.c index 5a92e76c6c53..106ee08ef52f 100644 --- a/fs/nfs/pnfs_nfs.c +++ b/fs/nfs/pnfs_nfs.c | |||
@@ -553,7 +553,8 @@ static void nfs4_clear_ds_conn_bit(struct nfs4_pnfs_ds *ds) | |||
553 | static int _nfs4_pnfs_ds_connect(struct nfs_server *mds_srv, | 553 | static int _nfs4_pnfs_ds_connect(struct nfs_server *mds_srv, |
554 | struct nfs4_pnfs_ds *ds, | 554 | struct nfs4_pnfs_ds *ds, |
555 | unsigned int timeo, | 555 | unsigned int timeo, |
556 | unsigned int retrans) | 556 | unsigned int retrans, |
557 | rpc_authflavor_t au_flavor) | ||
557 | { | 558 | { |
558 | struct nfs_client *clp = ERR_PTR(-EIO); | 559 | struct nfs_client *clp = ERR_PTR(-EIO); |
559 | struct nfs4_pnfs_ds_addr *da; | 560 | struct nfs4_pnfs_ds_addr *da; |
@@ -569,7 +570,7 @@ static int _nfs4_pnfs_ds_connect(struct nfs_server *mds_srv, | |||
569 | clp = nfs4_set_ds_client(mds_srv->nfs_client, | 570 | clp = nfs4_set_ds_client(mds_srv->nfs_client, |
570 | (struct sockaddr *)&da->da_addr, | 571 | (struct sockaddr *)&da->da_addr, |
571 | da->da_addrlen, IPPROTO_TCP, | 572 | da->da_addrlen, IPPROTO_TCP, |
572 | timeo, retrans); | 573 | timeo, retrans, au_flavor); |
573 | if (!IS_ERR(clp)) | 574 | if (!IS_ERR(clp)) |
574 | break; | 575 | break; |
575 | } | 576 | } |
@@ -600,12 +601,13 @@ out_put: | |||
600 | */ | 601 | */ |
601 | void nfs4_pnfs_ds_connect(struct nfs_server *mds_srv, struct nfs4_pnfs_ds *ds, | 602 | void nfs4_pnfs_ds_connect(struct nfs_server *mds_srv, struct nfs4_pnfs_ds *ds, |
602 | struct nfs4_deviceid_node *devid, unsigned int timeo, | 603 | struct nfs4_deviceid_node *devid, unsigned int timeo, |
603 | unsigned int retrans) | 604 | unsigned int retrans, rpc_authflavor_t au_flavor) |
604 | { | 605 | { |
605 | if (test_and_set_bit(NFS4DS_CONNECTING, &ds->ds_state) == 0) { | 606 | if (test_and_set_bit(NFS4DS_CONNECTING, &ds->ds_state) == 0) { |
606 | int err = 0; | 607 | int err = 0; |
607 | 608 | ||
608 | err = _nfs4_pnfs_ds_connect(mds_srv, ds, timeo, retrans); | 609 | err = _nfs4_pnfs_ds_connect(mds_srv, ds, timeo, |
610 | retrans, au_flavor); | ||
609 | if (err) | 611 | if (err) |
610 | nfs4_mark_deviceid_unavailable(devid); | 612 | nfs4_mark_deviceid_unavailable(devid); |
611 | nfs4_clear_ds_conn_bit(ds); | 613 | nfs4_clear_ds_conn_bit(ds); |