From patchwork Wed Aug 24 18:33:59 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanislav Kinsbursky X-Patchwork-Id: 1093822 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p7OIYhkS029383 for ; Wed, 24 Aug 2011 18:34:43 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753759Ab1HXSed (ORCPT ); Wed, 24 Aug 2011 14:34:33 -0400 Received: from mailhub.sw.ru ([195.214.232.25]:23529 "EHLO relay.sw.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753885Ab1HXSe3 (ORCPT ); Wed, 24 Aug 2011 14:34:29 -0400 Received: from localhost6.localdomain6 ([10.30.20.35]) by relay.sw.ru (8.13.4/8.13.4) with ESMTP id p7OIY0N4009682; Wed, 24 Aug 2011 22:34:01 +0400 (MSD) Subject: [PATCH 3/5] SUNRPC: make RPC service dependable on rpcbind clients creation To: Trond.Myklebust@netapp.com From: Stanislav Kinsbursky 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 Date: Wed, 24 Aug 2011 22:33:59 +0400 Message-ID: <20110824183359.4924.94364.stgit@localhost6.localdomain6> In-Reply-To: <20110824183304.4924.94670.stgit@localhost6.localdomain6> References: <20110824183304.4924.94670.stgit@localhost6.localdomain6> User-Agent: StGit/0.15 MIME-Version: 1.0 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Wed, 24 Aug 2011 18:34:43 +0000 (UTC) We create or increase users counter of rcbind clients during RPC service creation and decrease this counter (and possibly destroy those clients) on RPC service destruction. Signed-off-by: Stanislav Kinsbursky --- include/linux/sunrpc/clnt.h | 2 ++ net/sunrpc/rpcb_clnt.c | 2 +- net/sunrpc/svc.c | 5 +++++ 3 files changed, 8 insertions(+), 1 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h index db7bcaf..65a8115 100644 --- a/include/linux/sunrpc/clnt.h +++ b/include/linux/sunrpc/clnt.h @@ -135,10 +135,12 @@ void rpc_shutdown_client(struct rpc_clnt *); void rpc_release_client(struct rpc_clnt *); void rpc_task_release_client(struct rpc_task *); +int rpcb_create_local(void); int rpcb_register(u32, u32, int, unsigned short); int rpcb_v4_register(const u32 program, const u32 version, const struct sockaddr *address, const char *netid); +void rpcb_put_local(void); void rpcb_getport_async(struct rpc_task *); void rpc_call_start(struct rpc_task *); diff --git a/net/sunrpc/rpcb_clnt.c b/net/sunrpc/rpcb_clnt.c index b4cc0f1..437ec60 100644 --- a/net/sunrpc/rpcb_clnt.c +++ b/net/sunrpc/rpcb_clnt.c @@ -318,7 +318,7 @@ out: * Returns zero on success, otherwise a negative errno value * is returned. */ -static int rpcb_create_local(void) +int rpcb_create_local(void) { static DEFINE_MUTEX(rpcb_create_local_mutex); int result = 0; diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c index 6a69a11..0df8532 100644 --- a/net/sunrpc/svc.c +++ b/net/sunrpc/svc.c @@ -367,6 +367,9 @@ __svc_create(struct svc_program *prog, unsigned int bufsize, int npools, unsigned int xdrsize; unsigned int i; + if (rpcb_create_local() < 0) + return NULL; + if (!(serv = kzalloc(sizeof(*serv), GFP_KERNEL))) return NULL; serv->sv_name = prog->pg_name; @@ -491,6 +494,8 @@ svc_destroy(struct svc_serv *serv) svc_unregister(serv); kfree(serv->sv_pools); kfree(serv); + + rpcb_put_local(); } EXPORT_SYMBOL_GPL(svc_destroy);