linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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 7/8] nfsd: replace boolean nfsd_up flag by users counter
Date: Thu, 06 Dec 2012 14:23:39 +0300	[thread overview]
Message-ID: <20121206112339.29559.46130.stgit@localhost.localdomain> (raw)
In-Reply-To: <20121206111903.29559.4853.stgit@localhost.localdomain>

Since we have generic NFSd resurces, we have to introduce some way how to
allocate and destroy those resources on first per-net NFSd start and on
last per-net NFSd stop respectively.
This patch replaces global boolean nfsd_up flag (which is unused now) by users
counter and use it to determine either we need to allocate generic resources
or destroy them.

Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com>
---
 fs/nfsd/nfssvc.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c
index 0c87b4e..5bb4a33 100644
--- a/fs/nfsd/nfssvc.c
+++ b/fs/nfsd/nfssvc.c
@@ -204,13 +204,13 @@ static int nfsd_init_socks(struct net *net)
 	return 0;
 }
 
-static bool nfsd_up = false;
+static int nfsd_users = 0;
 
 static int nfsd_startup_generic(int nrservs)
 {
 	int ret;
 
-	if (nfsd_up)
+	if (nfsd_users++)
 		return 0;
 
 	/*
@@ -233,9 +233,11 @@ out_racache:
 
 static void nfsd_shutdown_generic(void)
 {
+	if (--nfsd_users)
+		return;
+
 	nfs4_state_shutdown();
 	nfsd_racache_shutdown();
-	nfsd_up = false;
 }
 
 static int nfsd_startup_net(int nrservs, struct net *net)
@@ -260,7 +262,6 @@ static int nfsd_startup_net(int nrservs, struct net *net)
 		goto out_lockd;
 
 	nn->nfsd_net_up = true;
-	nfsd_up = true;
 	return 0;
 
 out_lockd:


  parent reply	other threads:[~2012-12-06 11:23 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-12-06 11:22 [PATCH 0/8] nfsd: make service created per net Stanislav Kinsbursky
2012-12-06 11:23 ` [PATCH 1/8] nfsd: move per-net startup code to separated function Stanislav Kinsbursky
2012-12-06 11:23 ` [PATCH 2/8] nfsd: per-net NFSd up flag introduced Stanislav Kinsbursky
2012-12-06 11:23 ` [PATCH 3/8] nfsd: make NFSd service boot time per-net Stanislav Kinsbursky
2012-12-06 11:23 ` [PATCH 4/8] nfsd: make NFSd service structure allocated per net Stanislav Kinsbursky
2012-12-06 11:23 ` [PATCH 5/8] nfsd: introduce helpers for generic resources init and shutdown Stanislav Kinsbursky
2012-12-06 11:23 ` [PATCH 6/8] nfsd: simplify NFSv4 state " Stanislav Kinsbursky
2012-12-06 11:23 ` Stanislav Kinsbursky [this message]
2012-12-06 11:23 ` [PATCH 8/8] nfsd: simplify service shutdown Stanislav Kinsbursky
2012-12-10 20:18 ` [PATCH 0/8] nfsd: make service created per net 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=20121206112339.29559.46130.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).