From: Stanislav Kinsbursky <skinsbursky@parallels.com>
To: bfields@fieldses.org
Cc: linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org,
devel@openvz.org
Subject: [PATCH 3/7] nfsd: pass net to nfsd_startup() and nfsd_shutdown()
Date: Mon, 10 Dec 2012 12:19:14 +0300 [thread overview]
Message-ID: <20121210091914.8855.60002.stgit@localhost.localdomain> (raw)
In-Reply-To: <20121210091832.8855.26672.stgit@localhost.localdomain>
Precursor patch. Hard-coded "init_net" will be replaced by proper one in
future.
Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com>
---
fs/nfsd/nfssvc.c | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c
index 9fd8496..21cba3d 100644
--- a/fs/nfsd/nfssvc.c
+++ b/fs/nfsd/nfssvc.c
@@ -203,10 +203,9 @@ static int nfsd_init_socks(struct net *net)
static bool nfsd_up = false;
-static int nfsd_startup(int nrservs)
+static int nfsd_startup(int nrservs, struct net *net)
{
int ret;
- struct net *net = &init_net;
if (nfsd_up)
return 0;
@@ -237,16 +236,14 @@ static int nfsd_startup(int nrservs)
out_net_state:
nfs4_state_shutdown();
out_lockd:
- lockd_down(&init_net);
+ lockd_down(net);
out_racache:
nfsd_racache_shutdown();
return ret;
}
-static void nfsd_shutdown(void)
+static void nfsd_shutdown(struct net *net)
{
- struct net *net = &init_net;
-
/*
* write_ports can create the server without actually starting
* any threads--if we get shut down before any threads are
@@ -264,7 +261,7 @@ static void nfsd_shutdown(void)
static void nfsd_last_thread(struct svc_serv *serv, struct net *net)
{
- nfsd_shutdown();
+ nfsd_shutdown(net);
svc_rpcb_cleanup(serv, net);
@@ -468,7 +465,7 @@ nfsd_svc(int nrservs)
nfsd_up_before = nfsd_up;
- error = nfsd_startup(nrservs);
+ error = nfsd_startup(nrservs, net);
if (error)
goto out_destroy;
error = svc_set_num_threads(nfsd_serv, NULL, nrservs);
@@ -481,7 +478,7 @@ nfsd_svc(int nrservs)
error = nfsd_serv->sv_nrthreads - 1;
out_shutdown:
if (error < 0 && !nfsd_up_before)
- nfsd_shutdown();
+ nfsd_shutdown(net);
out_destroy:
nfsd_destroy(net); /* Release server */
out:
next prev parent reply other threads:[~2012-12-10 9:18 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-10 9:18 [PATCH 0/7] nfsd: cleanup "init_net" references Stanislav Kinsbursky
2012-12-10 9:19 ` [PATCH 1/7] nfsd: use "init_net" for portmapper Stanislav Kinsbursky
2012-12-10 9:19 ` [PATCH 2/7] nfsd: pass net to nfsd_init_socks() Stanislav Kinsbursky
2012-12-10 9:19 ` Stanislav Kinsbursky [this message]
2012-12-10 9:19 ` [PATCH 4/7] nfsd: pass net to nfsd_create_serv() Stanislav Kinsbursky
2012-12-10 9:19 ` [PATCH 5/7] nfsd: pass net to nfsd_svc() Stanislav Kinsbursky
2012-12-10 9:19 ` [PATCH 6/7] nfsd: pass net to nfsd_set_nrthreads() Stanislav Kinsbursky
2012-12-10 9:19 ` [PATCH 7/7] nfsd: pass net to __write_ports() and down Stanislav Kinsbursky
2012-12-10 12:34 ` [PATCH 0/7] nfsd: cleanup "init_net" references J. Bruce Fields
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20121210091914.8855.60002.stgit@localhost.localdomain \
--to=skinsbursky@parallels.com \
--cc=bfields@fieldses.org \
--cc=devel@openvz.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).