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

Commit 6677d095 authored by Chuck Lever's avatar Chuck Lever Committed by Trond Myklebust
Browse files

NFS: Adjust nfs_clone_mount structure to store "struct sockaddr *" 



Change the addr field in the nfs_clone_mount structure to store a "struct
sockaddr *" to support non-IPv4 addresses in the NFS client.

Note this is mostly a cosmetic change, and does not actually allow
referrals using IPv6 addresses.  The existing referral code assumes that
the server returns a string that represents an IPv4 address.  This code
needs to support hostnames and IPv6 addresses as well as IPv4 addresses,
thus it will need to be reorganized completely (to handle DNS resolution
in user space).

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Cc: Aurelien Charbon <aurelien.charbon@ext.bull.net>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent dcecae0f

fs/nfs/client.c

+2 −2
Original line number Diff line number Diff line
@@ -1094,8 +1094,8 @@ struct nfs_server *nfs4_create_referral_server(struct nfs_clone_mount *data, 
	/* Get a client representation.

	 * Note: NFSv4 always uses TCP, */

	error = nfs4_set_client(server, data->hostname,

				(struct sockaddr *)data->addr,

				sizeof(*data->addr),

				data->addr,

				data->addrlen,

				parent_client->cl_ipaddr,

				data->authflavor,

				parent_server->client->cl_xprt->prot,

fs/nfs/internal.h

+2 −1
Original line number Diff line number Diff line
@@ -21,7 +21,8 @@ struct nfs_clone_mount { 
	struct nfs_fattr *fattr;

	char *hostname;

	char *mnt_path;

	struct sockaddr_in *addr;

	struct sockaddr *addr;

	size_t addrlen;

	rpc_authflavor_t authflavor;

};

fs/nfs/nfs4namespace.c

+7 −5
Original line number Diff line number Diff line
@@ -172,7 +172,10 @@ static struct vfsmount *nfs_follow_referral(const struct vfsmount *mnt_parent, 


		s = 0;

		while (s < location->nservers) {

			struct sockaddr_in addr = {};

			struct sockaddr_in addr = {

				.sin_family	= AF_INET,

				.sin_port	= htons(NFS_PORT),

			};



			if (location->servers[s].len <= 0 ||

			    valid_ipaddr4(location->servers[s].data) < 0) {
@@ -181,10 +184,9 @@ static struct vfsmount *nfs_follow_referral(const struct vfsmount *mnt_parent, 
			}



			mountdata.hostname = location->servers[s].data;

			addr.sin_addr.s_addr = in_aton(mountdata.hostname);

			addr.sin_family = AF_INET;

			addr.sin_port = htons(NFS_PORT);

			mountdata.addr = &addr;

			addr.sin_addr.s_addr = in_aton(mountdata.hostname),

			mountdata.addr = (struct sockaddr *)&addr;

			mountdata.addrlen = sizeof(addr);



			snprintf(page, PAGE_SIZE, "%s:%s",

					mountdata.hostname,