From: Stanislav Kinsbursky <skinsbursky@parallels.com>
To: Trond.Myklebust@netapp.com
Cc: linux-nfs@vger.kernel.org, xemul@parallels.com, neilb@suse.de,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
bfields@fieldses.org, davem@davemloft.net
Subject: [PATCH v4 6/8] NFSd: call svc rpcbind cleanup explicitly
Date: Tue, 20 Sep 2011 14:14:19 +0400 [thread overview]
Message-ID: <20110920101419.9861.47122.stgit@localhost6.localdomain6> (raw)
In-Reply-To: <20110920101031.9861.18444.stgit@localhost6.localdomain6>
We have to call svc_rpcb_cleanup() explicitly from nfsd_last_thread() since
this function is registered as service shutdown callback and thus nobody else
will done it for us.
Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com>
---
fs/nfsd/nfssvc.c | 2 ++
include/linux/sunrpc/svc.h | 1 +
net/sunrpc/svc.c | 3 ++-
3 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c
index dc5a1bf..52cd976 100644
--- a/fs/nfsd/nfssvc.c
+++ b/fs/nfsd/nfssvc.c
@@ -256,6 +256,8 @@ static void nfsd_last_thread(struct svc_serv *serv)
nfsd_serv = NULL;
nfsd_shutdown();
+ svc_rpcb_cleanup(serv);
+
printk(KERN_WARNING "nfsd: last server has exited, flushing export "
"cache\n");
nfsd_export_flush();
diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h
index 223588a..5e71a30 100644
--- a/include/linux/sunrpc/svc.h
+++ b/include/linux/sunrpc/svc.h
@@ -401,6 +401,7 @@ struct svc_procedure {
/*
* Function prototypes.
*/
+void svc_rpcb_cleanup(struct svc_serv *serv);
struct svc_serv *svc_create(struct svc_program *, unsigned int,
void (*shutdown)(struct svc_serv *));
struct svc_rqst *svc_prepare_thread(struct svc_serv *serv,
diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
index 407462f..252552a 100644
--- a/net/sunrpc/svc.c
+++ b/net/sunrpc/svc.c
@@ -367,11 +367,12 @@ static int svc_rpcb_setup(struct svc_serv *serv)
return 0;
}
-static void svc_rpcb_cleanup(struct svc_serv *serv)
+void svc_rpcb_cleanup(struct svc_serv *serv)
{
svc_unregister(serv);
rpcb_put_local();
}
+EXPORT_SYMBOL_GPL(svc_rpcb_cleanup);
static int svc_uses_rpcbind(struct svc_serv *serv)
{
next prev parent reply other threads:[~2011-09-20 10:14 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-20 10:13 [PATCH v4 0/8] SUNRPC: make rpcbind clients allocated and destroyed dynamically Stanislav Kinsbursky
2011-09-20 10:13 ` [PATCH v4 1/8] SUNRPC: introduce helpers for reference counted rpcbind clients Stanislav Kinsbursky
2011-09-20 13:05 ` Bryan Schumaker
2011-09-20 13:15 ` Myklebust, Trond
2011-09-20 13:34 ` Stanislav Kinsbursky
2011-09-20 14:14 ` Myklebust, Trond
2011-09-20 14:35 ` Stanislav Kinsbursky
2011-09-20 14:38 ` Myklebust, Trond
2011-09-20 15:03 ` Stanislav Kinsbursky
2011-09-20 16:20 ` Stanislav Kinsbursky
2011-09-20 17:13 ` Myklebust, Trond
2011-09-20 17:26 ` Stanislav Kinsbursky
2011-09-20 13:49 ` [PATCH v5 " Stanislav Kinsbursky
2011-09-20 14:24 ` Jeff Layton
2011-09-20 14:41 ` Myklebust, Trond
2011-09-20 15:58 ` Stanislav Kinsbursky
2011-09-20 14:43 ` Stanislav Kinsbursky
2011-09-20 14:58 ` Bryan Schumaker
2011-09-20 15:38 ` Stanislav Kinsbursky
2011-09-20 16:06 ` Bryan Schumaker
2011-09-20 15:11 ` Jeff Layton
2011-09-20 16:20 ` Stanislav Kinsbursky
2011-09-21 9:07 ` [PATCH v6 " Stanislav Kinsbursky
2011-09-23 14:41 ` Stanislav Kinsbursky
2011-09-23 17:26 ` Myklebust, Trond
2011-09-20 10:13 ` [PATCH v4 2/8] SUNRPC: use rpcbind reference counting helpers Stanislav Kinsbursky
2011-09-20 10:13 ` [PATCH v4 3/8] SUNRPC: introduce svc helpers for prepairing rpcbind infrastructure Stanislav Kinsbursky
2011-09-20 10:14 ` [PATCH v4 4/8] SUNRPC: setup rpcbind clients if service requires it Stanislav Kinsbursky
2011-09-20 11:22 ` Jeff Layton
2011-09-20 10:14 ` [PATCH v4 5/8] SUNRPC: cleanup service destruction Stanislav Kinsbursky
2011-09-20 10:14 ` Stanislav Kinsbursky [this message]
2011-09-20 10:14 ` [PATCH v4 7/8] SUNRPC: remove rpcbind clients creation during service registering Stanislav Kinsbursky
2011-09-20 10:14 ` [PATCH v4 8/8] SUNRPC: remove rpcbind clients destruction on module cleanup Stanislav Kinsbursky
2011-09-20 11:24 ` [PATCH v4 0/8] SUNRPC: make rpcbind clients allocated and destroyed dynamically Jeff Layton
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=20110920101419.9861.47122.stgit@localhost6.localdomain6 \
--to=skinsbursky@parallels.com \
--cc=Trond.Myklebust@netapp.com \
--cc=bfields@fieldses.org \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
--cc=neilb@suse.de \
--cc=netdev@vger.kernel.org \
--cc=xemul@parallels.com \
/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).