From 9f9840dbbc7cf3c997f9a667c0d3797c76a2c859 Mon Sep 17 00:00:00 2001
From: Stanislav Kinsbursky <skinsbursky@parallels.com>
Date: Tue, 10 Jan 2012 16:12:54 +0400
Subject: [PATCH] --- yaml --- r: 294386 b: refs/heads/master c:
 6d59b8d599d594bc314026c6856424fe49df5513 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/fs/nfs/client.c     | 2 +-
 trunk/fs/nfs/internal.h   | 1 +
 trunk/fs/nfs/mount_clnt.c | 4 ++--
 trunk/fs/nfs/super.c      | 1 +
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 078e21bea435..b11942cb3f26 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e50a7a1a42335243c94eeea4a8d23413cb02370d
+refs/heads/master: 6d59b8d599d594bc314026c6856424fe49df5513
diff --git a/trunk/fs/nfs/client.c b/trunk/fs/nfs/client.c
index ca016fe44602..64815b725409 100644
--- a/trunk/fs/nfs/client.c
+++ b/trunk/fs/nfs/client.c
@@ -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,
diff --git a/trunk/fs/nfs/internal.h b/trunk/fs/nfs/internal.h
index 02fb2001a283..d602188f889f 100644
--- a/trunk/fs/nfs/internal.h
+++ b/trunk/fs/nfs/internal.h
@@ -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);
diff --git a/trunk/fs/nfs/mount_clnt.c b/trunk/fs/nfs/mount_clnt.c
index d4c2d6b7507e..4fbe3a8e5e6b 100644
--- a/trunk/fs/nfs/mount_clnt.c
+++ b/trunk/fs/nfs/mount_clnt.c
@@ -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,
diff --git a/trunk/fs/nfs/super.c b/trunk/fs/nfs/super.c
index 73aa75649bf8..e45feb0fee59 100644
--- a/trunk/fs/nfs/super.c
+++ b/trunk/fs/nfs/super.c
@@ -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;