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

Commit b224f7cb authored by Tigran Mkrtchyan's avatar Tigran Mkrtchyan Committed by Trond Myklebust
Browse files

nfs4: flexfiles: respect noresvport when establishing connections to DSes 



Signed-off-by: default avatarTigran Mkrtchyan <tigran.mkrtchyan@desy.de>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent 3fc75f12

fs/nfs/internal.h

+1 −1
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ extern struct nfs_client *nfs4_set_ds_client(struct nfs_server *mds_srv, 
					     rpc_authflavor_t au_flavor);

extern struct rpc_clnt *nfs4_find_or_create_ds_client(struct nfs_client *,

						struct inode *);

extern struct nfs_client *nfs3_set_ds_client(struct nfs_client *mds_clp,

extern struct nfs_client *nfs3_set_ds_client(struct nfs_server *mds_srv,

			const struct sockaddr *ds_addr, int ds_addrlen,

			int ds_proto, unsigned int ds_timeo,

			unsigned int ds_retrans, rpc_authflavor_t au_flavor);

fs/nfs/nfs3client.c

+5 −1
Original line number Diff line number Diff line
@@ -76,12 +76,13 @@ struct nfs_server *nfs3_clone_server(struct nfs_server *source, 
 * low timeout interval so that if a connection is lost, we retry through

 * the MDS.

 */

struct nfs_client *nfs3_set_ds_client(struct nfs_client *mds_clp,

struct nfs_client *nfs3_set_ds_client(struct nfs_server *mds_srv,

		const struct sockaddr *ds_addr, int ds_addrlen,

		int ds_proto, unsigned int ds_timeo, unsigned int ds_retrans,

		rpc_authflavor_t au_flavor)

{

	struct rpc_timeout ds_timeout;

	struct nfs_client *mds_clp = mds_srv->nfs_client;

	struct nfs_client_initdata cl_init = {

		.addr = ds_addr,

		.addrlen = ds_addrlen,
@@ -100,6 +101,9 @@ struct nfs_client *nfs3_set_ds_client(struct nfs_client *mds_clp, 
		return ERR_PTR(-EINVAL);

	cl_init.hostname = buf;



	if (mds_srv->flags & NFS_MOUNT_NORESVPORT)

		set_bit(NFS_CS_NORESVPORT, &cl_init.init_flags);



	/* Use the MDS nfs_client cl_ipaddr. */

	nfs_init_timeout_values(&ds_timeout, ds_proto, ds_timeo, ds_retrans);

	clp = nfs_get_client(&cl_init, au_flavor);

fs/nfs/pnfs_nfs.c

+2 −2
Original line number Diff line number Diff line
@@ -595,7 +595,7 @@ static void nfs4_clear_ds_conn_bit(struct nfs4_pnfs_ds *ds) 
}



static struct nfs_client *(*get_v3_ds_connect)(

			struct nfs_client *mds_clp,

			struct nfs_server *mds_srv,

			const struct sockaddr *ds_addr,

			int ds_addrlen,

			int ds_proto,
@@ -654,7 +654,7 @@ static int _nfs4_pnfs_v3_ds_connect(struct nfs_server *mds_srv, 
			rpc_clnt_add_xprt(clp->cl_rpcclient, &xprt_args,

					rpc_clnt_test_and_add_xprt, NULL);

		} else

			clp = get_v3_ds_connect(mds_srv->nfs_client,

			clp = get_v3_ds_connect(mds_srv,

					(struct sockaddr *)&da->da_addr,

					da->da_addrlen, IPPROTO_TCP,

					timeo, retrans, au_flavor);