OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Peng Tao 2014-05-29 21:07:00 +08:00 committed by Tom Haynes
parent 7405f9e195
commit 064172f345
5 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fs/nfs/filelayout/filelayoutdev.c
View File

@ -278,7 +278,8 @@ nfs4_fl_prepare_ds(struct pnfs_layout_segment *lseg, u32 ds_idx)
goto out_test_devid; goto out_test_devid;
nfs4_pnfs_ds_connect(s, ds, devid, dataserver_timeo, nfs4_pnfs_ds_connect(s, ds, devid, dataserver_timeo,
dataserver_retrans); dataserver_retrans,
s->nfs_client->cl_rpcclient->cl_auth->au_flavor);
out_test_devid: out_test_devid:
if (filelayout_test_devid_unavailable(devid)) if (filelayout_test_devid_unavailable(devid))

3
fs/nfs/internal.h
View File

@ -189,7 +189,8 @@ extern struct nfs_client *nfs4_set_ds_client(struct nfs_client* mds_clp,
const struct sockaddr *ds_addr, const struct sockaddr *ds_addr,
int ds_addrlen, int ds_proto, int ds_addrlen, int ds_proto,
unsigned int ds_timeo, unsigned int ds_timeo,
unsigned int ds_retrans); unsigned int ds_retrans,
rpc_authflavor_t au_flavor);
extern struct rpc_clnt *nfs4_find_or_create_ds_client(struct nfs_client *, extern struct rpc_clnt *nfs4_find_or_create_ds_client(struct nfs_client *,
struct inode *); struct inode *);
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS

5
fs/nfs/nfs4client.c
View File

@ -849,7 +849,8 @@ error:
*/ */
struct nfs_client *nfs4_set_ds_client(struct nfs_client* mds_clp, struct nfs_client *nfs4_set_ds_client(struct nfs_client* mds_clp,
const struct sockaddr *ds_addr, int ds_addrlen, 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 = { struct nfs_client_initdata cl_init = {
.addr = ds_addr, .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); nfs_init_timeout_values(&ds_timeout, ds_proto, ds_timeo, ds_retrans);
clp = nfs_get_client(&cl_init, &ds_timeout, mds_clp->cl_ipaddr, 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); dprintk("<-- %s %p\n", __func__, clp);
return clp; return clp;

2
fs/nfs/pnfs.h
View File

@ -314,7 +314,7 @@ struct nfs4_pnfs_ds *nfs4_pnfs_ds_add(struct list_head *dsaddrs,
gfp_t gfp_flags); gfp_t gfp_flags);
void nfs4_pnfs_ds_connect(struct nfs_server *mds_srv, struct nfs4_pnfs_ds *ds, void nfs4_pnfs_ds_connect(struct nfs_server *mds_srv, struct nfs4_pnfs_ds *ds,
struct nfs4_deviceid_node *devid, unsigned int timeo, struct nfs4_deviceid_node *devid, unsigned int timeo,
unsigned int retrans); unsigned int retrans, rpc_authflavor_t au_flavor);
struct nfs4_pnfs_ds_addr *nfs4_decode_mp_ds_addr(struct net *net, struct nfs4_pnfs_ds_addr *nfs4_decode_mp_ds_addr(struct net *net,
struct xdr_stream *xdr, struct xdr_stream *xdr,
gfp_t gfp_flags); gfp_t gfp_flags);

10
fs/nfs/pnfs_nfs.c
View File

@ -553,7 +553,8 @@ static void nfs4_clear_ds_conn_bit(struct nfs4_pnfs_ds *ds)
static int _nfs4_pnfs_ds_connect(struct nfs_server *mds_srv, static int _nfs4_pnfs_ds_connect(struct nfs_server *mds_srv,
struct nfs4_pnfs_ds *ds, struct nfs4_pnfs_ds *ds,
unsigned int timeo, unsigned int timeo,
unsigned int retrans) unsigned int retrans,
rpc_authflavor_t au_flavor)
{ {
struct nfs_client *clp = ERR_PTR(-EIO); struct nfs_client *clp = ERR_PTR(-EIO);
struct nfs4_pnfs_ds_addr *da; struct nfs4_pnfs_ds_addr *da;
@ -569,7 +570,7 @@ static int _nfs4_pnfs_ds_connect(struct nfs_server *mds_srv,
clp = nfs4_set_ds_client(mds_srv->nfs_client, clp = nfs4_set_ds_client(mds_srv->nfs_client,
(struct sockaddr *)&da->da_addr, (struct sockaddr *)&da->da_addr,
da->da_addrlen, IPPROTO_TCP, da->da_addrlen, IPPROTO_TCP,
timeo, retrans); timeo, retrans, au_flavor);
if (!IS_ERR(clp)) if (!IS_ERR(clp))
break; break;
} }
@ -600,12 +601,13 @@ out_put:
*/ */
void nfs4_pnfs_ds_connect(struct nfs_server *mds_srv, struct nfs4_pnfs_ds *ds, void nfs4_pnfs_ds_connect(struct nfs_server *mds_srv, struct nfs4_pnfs_ds *ds,
struct nfs4_deviceid_node *devid, unsigned int timeo, struct nfs4_deviceid_node *devid, unsigned int timeo,
unsigned int retrans) unsigned int retrans, rpc_authflavor_t au_flavor)
{ {
if (test_and_set_bit(NFS4DS_CONNECTING, &ds->ds_state) == 0) { if (test_and_set_bit(NFS4DS_CONNECTING, &ds->ds_state) == 0) {
int err = 0; int err = 0;
err = _nfs4_pnfs_ds_connect(mds_srv, ds, timeo, retrans); err = _nfs4_pnfs_ds_connect(mds_srv, ds, timeo,
retrans, au_flavor);
if (err) if (err)
nfs4_mark_deviceid_unavailable(devid); nfs4_mark_deviceid_unavailable(devid);
nfs4_clear_ds_conn_bit(ds); nfs4_clear_ds_conn_bit(ds);