Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 064172f3 authored by Peng Tao's avatar Peng Tao Committed by Tom Haynes
Browse files

nfs41: allow LD to choose DS connection auth flavor 



flexfile layout may use different auth flavor as specified by MDS.

Reviewed-by: default avatarJeff Layton <jlayton@primarydata.com>
Signed-off-by: default avatarPeng Tao <tao.peng@primarydata.com>
Signed-off-by: default avatarTom Haynes <Thomas.Haynes@primarydata.com>
parent 7405f9e1

fs/nfs/filelayout/filelayoutdev.c

+2 −1
Original line number Diff line number Diff line
@@ -278,7 +278,8 @@ nfs4_fl_prepare_ds(struct pnfs_layout_segment *lseg, u32 ds_idx) 
		goto out_test_devid;



	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:

	if (filelayout_test_devid_unavailable(devid))

fs/nfs/internal.h

+2 −1
Original line number Diff line number Diff line
@@ -189,7 +189,8 @@ extern 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);

					     unsigned int ds_retrans,

					     rpc_authflavor_t au_flavor);

extern struct rpc_clnt *nfs4_find_or_create_ds_client(struct nfs_client *,

						struct inode *);

#ifdef CONFIG_PROC_FS

fs/nfs/nfs4client.c

+3 −2
Original line number Diff line number Diff line
@@ -849,7 +849,8 @@ static int nfs4_set_client(struct nfs_server *server, 
 */

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;

fs/nfs/pnfs.h

+1 −1
Original line number Diff line number Diff line
@@ -314,7 +314,7 @@ struct nfs4_pnfs_ds *nfs4_pnfs_ds_add(struct list_head *dsaddrs, 
				      gfp_t gfp_flags);

void nfs4_pnfs_ds_connect(struct nfs_server *mds_srv, struct nfs4_pnfs_ds *ds,

			  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 xdr_stream *xdr,

						 gfp_t gfp_flags);

fs/nfs/pnfs_nfs.c

+6 −4
Original line number Diff line number Diff line
@@ -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,

				 struct nfs4_pnfs_ds *ds,

				 unsigned int timeo,

				 unsigned int retrans)

				 unsigned int retrans,

				 rpc_authflavor_t au_flavor)

{

	struct nfs_client *clp = ERR_PTR(-EIO);

	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,

					(struct sockaddr *)&da->da_addr,

					da->da_addrlen, IPPROTO_TCP,

					timeo, retrans);

					timeo, retrans, au_flavor);

		if (!IS_ERR(clp))

			break;

	}
@@ -600,12 +601,13 @@ static int _nfs4_pnfs_ds_connect(struct nfs_server *mds_srv, 
 */

void nfs4_pnfs_ds_connect(struct nfs_server *mds_srv, struct nfs4_pnfs_ds *ds,

			  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) {

		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)

			nfs4_mark_deviceid_unavailable(devid);

		nfs4_clear_ds_conn_bit(ds);