Commit 6d59b8d5 authored by Stanislav Kinsbursky's avatar Stanislav Kinsbursky Committed by Trond Myklebust
Browse files

NFS: pass NFS client owner network namespace to RPC client creation routine 



This patch replaces static "init_net" with nfs_client->net pointer in RPC
client creation calls.

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

fs/nfs/client.c

+1 −1
Original line number Diff line number Diff line
@@ -647,7 +647,7 @@ static int nfs_create_rpc_client(struct nfs_client *clp, 
{

	struct rpc_clnt		*clnt = NULL;

	struct rpc_create_args args = {

		.net		= &init_net,

		.net		= clp->net,

		.protocol	= clp->cl_proto,

		.address	= (struct sockaddr *)&clp->cl_addr,

		.addrsize	= clp->cl_addrlen,

fs/nfs/internal.h

+1 −0
Original line number Diff line number Diff line
@@ -138,6 +138,7 @@ struct nfs_mount_request { 
	int			noresvport;

	unsigned int		*auth_flav_len;

	rpc_authflavor_t	*auth_flavs;

	struct net		*net;

};



extern int nfs_mount(struct nfs_mount_request *info);

fs/nfs/mount_clnt.c

+2 −2
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ int nfs_mount(struct nfs_mount_request *info) 
		.rpc_resp	= &result,

	};

	struct rpc_create_args args = {

		.net		= &init_net,

		.net		= info->net,

		.protocol	= info->protocol,

		.address	= info->sap,

		.addrsize	= info->salen,
@@ -225,7 +225,7 @@ void nfs_umount(const struct nfs_mount_request *info) 
		.to_retries = 2,

	};

	struct rpc_create_args args = {

		.net		= &init_net,

		.net		= info->net,

		.protocol	= IPPROTO_UDP,

		.address	= info->sap,

		.addrsize	= info->salen,

fs/nfs/super.c

+1 −0
Original line number Diff line number Diff line
@@ -1625,6 +1625,7 @@ static int nfs_try_mount(struct nfs_parsed_mount_data *args, 
		.noresvport	= args->flags & NFS_MOUNT_NORESVPORT,

		.auth_flav_len	= &server_authlist_len,

		.auth_flavs	= server_authlist,

		.net		= args->net,

	};

	int status;