From bac08eb43577faa851eb3725250e25fa6b61ed80 Mon Sep 17 00:00:00 2001
From: Stanislav Kinsbursky <skinsbursky@parallels.com>
Date: Mon, 10 Dec 2012 12:19:09 +0300
Subject: [PATCH] --- yaml --- r: 347711 b: refs/heads/master c:
 db6e182c17cb1a7069f7f8924721ce58ac05d9a3 h: refs/heads/master i:   347709:
 b1d010168bc76c3dcf7093fc2077f73b949c8274   347707:
 f148fed2ea5808f3d7611da77467c8257be4d152   347703:
 ba4f3dd05aa63c16d7686842090a23509659c2ff   347695:
 9f7d58ff671be1b1291e3880f3750cf2c9c5fcee   347679:
 78e3cf0993b9a552cce7d807f5c2c289c4d9b0e5   347647:
 599f33f8154fdadcbcf3c3110b267ed5f78a014a v: v3

---
 [refs]                 | 2 +-
 trunk/fs/nfsd/nfssvc.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 7c54a35a2de1..eef87887bf5f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f7fb86c6e639360ad9c253cec534819ef928a674
+refs/heads/master: db6e182c17cb1a7069f7f8924721ce58ac05d9a3
diff --git a/trunk/fs/nfsd/nfssvc.c b/trunk/fs/nfsd/nfssvc.c
index 9beace6a868c..9fd8496d5b84 100644
--- a/trunk/fs/nfsd/nfssvc.c
+++ b/trunk/fs/nfsd/nfssvc.c
@@ -182,18 +182,18 @@ int nfsd_nrthreads(void)
 	return rv;
 }
 
-static int nfsd_init_socks(void)
+static int nfsd_init_socks(struct net *net)
 {
 	int error;
 	if (!list_empty(&nfsd_serv->sv_permsocks))
 		return 0;
 
-	error = svc_create_xprt(nfsd_serv, "udp", &init_net, PF_INET, NFS_PORT,
+	error = svc_create_xprt(nfsd_serv, "udp", net, PF_INET, NFS_PORT,
 					SVC_SOCK_DEFAULTS);
 	if (error < 0)
 		return error;
 
-	error = svc_create_xprt(nfsd_serv, "tcp", &init_net, PF_INET, NFS_PORT,
+	error = svc_create_xprt(nfsd_serv, "tcp", net, PF_INET, NFS_PORT,
 					SVC_SOCK_DEFAULTS);
 	if (error < 0)
 		return error;
@@ -218,7 +218,7 @@ static int nfsd_startup(int nrservs)
 	ret = nfsd_racache_init(2*nrservs);
 	if (ret)
 		return ret;
-	ret = nfsd_init_socks();
+	ret = nfsd_init_socks(net);
 	if (ret)
 		goto out_racache;
 	ret = lockd_up(net);