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, devel@openvz.org
Subject: [PATCH v7 4/7] SUNRPC: setup rpcbind clients if service requires it
Date: Fri, 28 Oct 2011 14:53:18 +0300 [thread overview]
Message-ID: <20111028105307.24628.89889.stgit@localhost6.localdomain6> (raw)
In-Reply-To: <20111028104530.24628.23631.stgit@localhost6.localdomain6>
New function ("svc_uses_rpcbind") will be used to detect, that new service will
send portmapper register calls. For such services we will create rpcbind
clients and remove all stale portmap registrations.
Also, svc_rpcb_cleanup() will be set as sv_shutdown callback for such services
in case of this field wasn't initialized earlier. This will allow to destroy
rpcbind clients when no other users of them left.
Note: Currently, any creating service will be detected as portmap user.
Probably, this is wrong. But now it depends on program versions "vs_hidden"
flag.
Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com>
---
net/sunrpc/svc.c | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
index d2d61bf..87a67b2 100644
--- a/net/sunrpc/svc.c
+++ b/net/sunrpc/svc.c
@@ -436,10 +436,8 @@ __svc_create(struct svc_program *prog, unsigned int bufsize, int npools,
serv->sv_pools =
kcalloc(serv->sv_nrpools, sizeof(struct svc_pool),
GFP_KERNEL);
- if (!serv->sv_pools) {
- kfree(serv);
- return NULL;
- }
+ if (!serv->sv_pools)
+ goto err_serv;
for (i = 0; i < serv->sv_nrpools; i++) {
struct svc_pool *pool = &serv->sv_pools[i];
@@ -454,10 +452,20 @@ __svc_create(struct svc_program *prog, unsigned int bufsize, int npools,
spin_lock_init(&pool->sp_lock);
}
- /* Remove any stale portmap registrations */
- svc_unregister(serv);
+ if (svc_uses_rpcbind(serv)) {
+ if (svc_rpcb_setup(serv) < 0)
+ goto err_rpcb;
+ if (!serv->sv_shutdown)
+ serv->sv_shutdown = svc_rpcb_cleanup;
+ }
return serv;
+
+err_rpcb:
+ kfree(serv->sv_pools);
+err_serv:
+ kfree(serv);
+ return NULL;
}
struct svc_serv *
next prev parent reply other threads:[~2011-10-28 11:53 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-28 11:52 [PATCH v7 0/7] SUNRPC: make rpcbind clients allocated and destroyed dynamically Stanislav Kinsbursky
2011-10-28 11:52 ` [PATCH v7 1/7] SUNRPC: introduce helpers for reference counted rpcbind clients Stanislav Kinsbursky
2011-10-28 11:52 ` [PATCH v7 2/7] SUNRPC: use rpcbind reference counting helpers Stanislav Kinsbursky
2011-10-28 11:52 ` [PATCH v7 3/7] SUNRPC: introduce svc helpers for prepairing rpcbind infrastructure Stanislav Kinsbursky
2011-10-28 14:22 ` J. Bruce Fields
2011-10-28 11:53 ` Stanislav Kinsbursky [this message]
2011-10-28 14:22 ` [PATCH v7 4/7] SUNRPC: setup rpcbind clients if service requires it J. Bruce Fields
2011-10-28 11:53 ` [PATCH v7 5/7] SUNRPC: cleanup service destruction Stanislav Kinsbursky
[not found] ` <20111028105326.24628.81582.stgit-bi+AKbBUZKagILUCTcTcHdKyNwTtLsGr@public.gmane.org>
2011-10-28 14:22 ` J. Bruce Fields
2011-10-28 11:53 ` [PATCH v7 6/7] SUNRPC: remove rpcbind clients creation during service registering Stanislav Kinsbursky
2011-10-28 11:54 ` [PATCH v7 7/7] SUNRPC: remove rpcbind clients destruction on module cleanup Stanislav Kinsbursky
2011-10-28 14:23 ` [PATCH v7 0/7] SUNRPC: make rpcbind clients allocated and destroyed dynamically 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=20111028105307.24628.89889.stgit@localhost6.localdomain6 \
--to=skinsbursky@parallels.com \
--cc=Trond.Myklebust@netapp.com \
--cc=bfields@fieldses.org \
--cc=davem@davemloft.net \
--cc=devel@openvz.org \
--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).