From: Stanislav Kinsbursky <skinsbursky@parallels.com>
To: Trond.Myklebust@netapp.com
Cc: bfields@fieldses.org, linux-nfs@vger.kernel.org,
linux-kernel@vger.kernel.org, devel@openvz.org
Subject: [PATCH v4 09/10] NFS: callback per-net usage counting introduced
Date: Mon, 20 Aug 2012 18:00:46 +0400 [thread overview]
Message-ID: <20120820140046.17404.26919.stgit@localhost.localdomain> (raw)
In-Reply-To: <20120820134734.17404.53946.stgit@localhost.localdomain>
This patch also introduces refcount-aware nfs_callback_down_net() wrapper for
svc_shutdown_net().
Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com>
---
fs/nfs/callback.c | 19 +++++++++++++++++--
fs/nfs/netns.h | 1 +
2 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/fs/nfs/callback.c b/fs/nfs/callback.c
index baafa0f..6dfdc83 100644
--- a/fs/nfs/callback.c
+++ b/fs/nfs/callback.c
@@ -260,10 +260,25 @@ static int nfs_callback_start_svc(int minorversion, struct rpc_xprt *xprt,
return 0;
}
+static void nfs_callback_down_net(u32 minorversion, struct svc_serv *serv, struct net *net)
+{
+ struct nfs_net *nn = net_generic(net, nfs_net_id);
+
+ if (--nn->cb_users[minorversion])
+ return;
+
+ dprintk("NFS: destroy per-net callback data; net=%p\n", net);
+ svc_shutdown_net(serv, net);
+}
+
static int nfs_callback_up_net(int minorversion, struct svc_serv *serv, struct net *net)
{
+ struct nfs_net *nn = net_generic(net, nfs_net_id);
int ret;
+ if (nn->cb_users[minorversion]++)
+ return 0;
+
dprintk("NFS: create per-net callback data; net=%p\n", net);
ret = svc_bind(serv, net);
@@ -378,7 +393,7 @@ err_create:
return ret;
err_start:
- svc_shutdown_net(serv, net);
+ nfs_callback_down_net(minorversion, serv, net);
dprintk("NFS: Couldn't create server thread; err = %d\n", ret);
goto err_net;
}
@@ -391,10 +406,10 @@ void nfs_callback_down(int minorversion, struct net *net)
struct nfs_callback_data *cb_info = &nfs_callback_info[minorversion];
mutex_lock(&nfs_callback_mutex);
+ nfs_callback_down_net(minorversion, cb_info->serv, net);
cb_info->users--;
if (cb_info->users == 0 && cb_info->task != NULL) {
kthread_stop(cb_info->task);
- svc_shutdown_net(cb_info->serv, net);
svc_exit_thread(cb_info->rqst);
cb_info->serv = NULL;
cb_info->rqst = NULL;
diff --git a/fs/nfs/netns.h b/fs/nfs/netns.h
index 137238b..b9c7f9b 100644
--- a/fs/nfs/netns.h
+++ b/fs/nfs/netns.h
@@ -24,6 +24,7 @@ struct nfs_net {
struct idr cb_ident_idr; /* Protected by nfs_client_lock */
unsigned short nfs_callback_tcpport;
unsigned short nfs_callback_tcpport6;
+ int cb_users[NFS4_MAX_MINOR_VERSION + 1];
#endif
spinlock_t nfs_client_lock;
struct timespec boot_time;
next prev parent reply other threads:[~2012-08-20 14:02 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-20 13:59 [PATCH v4 00/10] NFS: callback threads containerization Stanislav Kinsbursky
2012-08-20 14:00 ` [PATCH v4 01/10] NFS: pass net to nfs_callback_down() Stanislav Kinsbursky
2012-08-20 14:00 ` [PATCH v4 02/10] NFS: callback service creation function introduced Stanislav Kinsbursky
2012-08-20 14:00 ` [PATCH v4 03/10] NFS: move per-net callback thread initialization to nfs_callback_up_net() Stanislav Kinsbursky
2012-08-20 14:00 ` [PATCH v4 04/10] NFS: callback up - transport backchannel cleanup Stanislav Kinsbursky
2012-08-20 14:00 ` [PATCH v4 05/10] NFS: callback service start function introduced Stanislav Kinsbursky
2012-08-20 14:00 ` [PATCH v4 06/10] NFS: callback up - users counting cleanup Stanislav Kinsbursky
2012-08-20 14:00 ` [PATCH v4 07/10] NFS: make nfs_callback_tcpport per network context Stanislav Kinsbursky
2012-08-20 14:00 ` [PATCH v4 08/10] NFS: make nfs_callback_tcpport6 " Stanislav Kinsbursky
2012-08-20 14:00 ` Stanislav Kinsbursky [this message]
2012-08-20 14:00 ` [PATCH v4 10/10] NFS: add debug messages to callback down function Stanislav Kinsbursky
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=20120820140046.17404.26919.stgit@localhost.localdomain \
--to=skinsbursky@parallels.com \
--cc=Trond.Myklebust@netapp.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).