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

Commit 90100b17 authored by Stanislav Kinsbursky's avatar Stanislav Kinsbursky Committed by Trond Myklebust
Browse files

SUNRPC: parametrize rpc_pton() by network context 



Parametrize rpc_pton() by network context and thus force it's callers to pass
in network context instead of using hard-coded "init_net".

Signed-off-by: default avatarStanislav Kinsbursky <skinsbursky@parallels.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 8b147f74

fs/nfs/dns_resolve.c

+2 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ ssize_t nfs_dns_resolve_name(struct net *net, char *name, size_t namelen, 


	ip_len = dns_query(NULL, name, namelen, NULL, &ip_addr, NULL);

	if (ip_len > 0)

		ret = rpc_pton(ip_addr, ip_len, sa, salen);

		ret = rpc_pton(&init_net, ip_addr, ip_len, sa, salen);

	else

		ret = -ESRCH;

	kfree(ip_addr);
@@ -224,7 +224,7 @@ static int nfs_dns_parse(struct cache_detail *cd, char *buf, int buflen) 
	len = qword_get(&buf, buf1, sizeof(buf1));

	if (len <= 0)

		goto out;

	key.addrlen = rpc_pton(buf1, len,

	key.addrlen = rpc_pton(&init_net, buf1, len,

			(struct sockaddr *)&key.addr,

			sizeof(key.addr));

fs/nfs/nfs4filelayoutdev.c

+1 −1
Original line number Diff line number Diff line
@@ -457,7 +457,7 @@ decode_ds_addr(struct xdr_stream *streamp, gfp_t gfp_flags) 


	INIT_LIST_HEAD(&da->da_node);



	if (!rpc_pton(buf, portstr-buf, (struct sockaddr *)&da->da_addr,

	if (!rpc_pton(&init_net, buf, portstr-buf, (struct sockaddr *)&da->da_addr,

		      sizeof(da->da_addr))) {

		dprintk("%s: error parsing address %s\n", __func__, buf);

		goto out_free_da;

fs/nfs/nfs4namespace.c

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ static size_t nfs_parse_server_name(char *string, size_t len, 
{

	ssize_t ret;



	ret = rpc_pton(string, len, sa, salen);

	ret = rpc_pton(&init_net, string, len, sa, salen);

	if (ret == 0) {

		ret = nfs_dns_resolve_name(server->client->cl_xprt->xprt_net,

					   string, len, sa, salen);

fs/nfs/super.c

+2 −2
Original line number Diff line number Diff line
@@ -1408,7 +1408,7 @@ static int nfs_parse_mount_options(char *raw, 
			if (string == NULL)

				goto out_nomem;

			mnt->nfs_server.addrlen =

				rpc_pton(string, strlen(string),

				rpc_pton(&init_net, string, strlen(string),

					(struct sockaddr *)

					&mnt->nfs_server.address,

					sizeof(mnt->nfs_server.address));
@@ -1430,7 +1430,7 @@ static int nfs_parse_mount_options(char *raw, 
			if (string == NULL)

				goto out_nomem;

			mnt->mount_server.addrlen =

				rpc_pton(string, strlen(string),

				rpc_pton(&init_net, string, strlen(string),

					(struct sockaddr *)

					&mnt->mount_server.address,

					sizeof(mnt->mount_server.address));

fs/nfsd/nfsctl.c

+1 −1
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ static ssize_t write_unlock_ip(struct file *file, char *buf, size_t size) 
	if (qword_get(&buf, fo_path, size) < 0)

		return -EINVAL;



	if (rpc_pton(fo_path, size, sap, salen) == 0)

	if (rpc_pton(&init_net, fo_path, size, sap, salen) == 0)

		return -EINVAL;



	return nlmsvc_unlock_all_by_ip(sap);