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

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

nfs4: clnt: respect noresvport when establishing connections to DSes 



result:

$ mount -o vers=4.1 dcache-lab007:/ /pnfs
$ cp /etc/profile /pnfs
tcp        0      0 131.169.185.68:1005     131.169.191.141:32049   ESTABLISHED
tcp        0      0 131.169.185.68:751      131.169.191.144:2049    ESTABLISHED
$

$ mount -o vers=4.1,noresvport dcache-lab007:/ /pnfs
$ cp /etc/profile /pnfs
tcp        0      0 131.169.185.68:34894    131.169.191.141:32049   ESTABLISHED
tcp        0      0 131.169.185.68:35722    131.169.191.144:2049    ESTABLISHED
$

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

fs/nfs/internal.h

+1 −1
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ extern struct nfs_server *nfs_clone_server(struct nfs_server *, 
					   rpc_authflavor_t);

extern int nfs_wait_client_init_complete(const struct nfs_client *clp);

extern void nfs_mark_client_ready(struct nfs_client *clp, int state);

extern struct nfs_client *nfs4_set_ds_client(struct nfs_client* mds_clp,

extern struct nfs_client *nfs4_set_ds_client(struct nfs_server *mds_srv,

					     const struct sockaddr *ds_addr,

					     int ds_addrlen, int ds_proto,

					     unsigned int ds_timeo,

fs/nfs/nfs4client.c

+5 −1
Original line number Diff line number Diff line
@@ -844,12 +844,13 @@ static int nfs4_set_client(struct nfs_server *server, 
 * low timeout interval so that if a connection is lost, we retry through

 * the MDS.

 */

struct nfs_client *nfs4_set_ds_client(struct nfs_client* mds_clp,

struct nfs_client *nfs4_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,

		u32 minor_version, 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,
@@ -868,6 +869,9 @@ struct nfs_client *nfs4_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);



	/*

	 * Set an authflavor equual to the MDS value. Use the MDS nfs_client

	 * cl_ipaddr so as to use the same EXCHANGE_ID co_ownerid as the MDS

fs/nfs/pnfs_nfs.c

+1 −1
Original line number Diff line number Diff line
@@ -690,7 +690,7 @@ static int _nfs4_pnfs_v4_ds_connect(struct nfs_server *mds_srv, 
		dprintk("%s: DS %s: trying address %s\n",

			__func__, ds->ds_remotestr, da->da_remotestr);



		clp = nfs4_set_ds_client(mds_srv->nfs_client,

		clp = nfs4_set_ds_client(mds_srv,

					(struct sockaddr *)&da->da_addr,

					da->da_addrlen, IPPROTO_TCP,

					timeo, retrans, minor_version,