From patchwork Wed Aug 24 18:33:44 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanislav Kinsbursky X-Patchwork-Id: 1093852 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 p7OIZ7l2029925 for ; Wed, 24 Aug 2011 18:35:07 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753947Ab1HXSfE (ORCPT ); Wed, 24 Aug 2011 14:35:04 -0400 Received: from mailhub.sw.ru ([195.214.232.25]:39239 "EHLO relay.sw.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753930Ab1HXSfB (ORCPT ); Wed, 24 Aug 2011 14:35:01 -0400 Received: from localhost6.localdomain6 ([10.30.20.35]) by relay.sw.ru (8.13.4/8.13.4) with ESMTP id p7OIXjAD010763; Wed, 24 Aug 2011 22:33:46 +0400 (MSD) Subject: [PATCH 1/5] SUNRPC: introduce helpers for reference counted rpcbind clients 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:44 +0400 Message-ID: <20110824183344.4924.33065.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:35:07 +0000 (UTC) This helpers will be used for dynamical creation and destruction of rpcbind clients. Variable rpcb_users is actually a counter of lauched RPC services. If rpcbind client has been created already, then we just increase rpcb_users. Signed-off-by: Stanislav Kinsbursky --- net/sunrpc/rpcb_clnt.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 51 insertions(+), 0 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/net/sunrpc/rpcb_clnt.c b/net/sunrpc/rpcb_clnt.c index e45d2fb..c84e6a3 100644 --- a/net/sunrpc/rpcb_clnt.c +++ b/net/sunrpc/rpcb_clnt.c @@ -114,6 +114,9 @@ static struct rpc_program rpcb_program; static struct rpc_clnt * rpcb_local_clnt; static struct rpc_clnt * rpcb_local_clnt4; +DEFINE_SPINLOCK(rpcb_clnt_lock); +unsigned int rpcb_users; + struct rpcbind_args { struct rpc_xprt * r_xprt; @@ -161,6 +164,54 @@ static void rpcb_map_release(void *data) kfree(map); } +static int rpcb_get_local(void) +{ + spin_lock(&rpcb_clnt_lock); + if (rpcb_users) + rpcb_users++; + spin_unlock(&rpcb_clnt_lock); + + return rpcb_users; +} + +void rpcb_put_local(void) +{ + struct rpc_clnt *clnt = rpcb_local_clnt; + struct rpc_clnt *clnt4 = rpcb_local_clnt4; + int shutdown; + + spin_lock(&rpcb_clnt_lock); + if (--rpcb_users == 0) { + rpcb_local_clnt = NULL; + rpcb_local_clnt4 = NULL; + } + shutdown = !rpcb_users; + spin_unlock(&rpcb_clnt_lock); + + if (shutdown) { + /* + * cleanup_rpcb_clnt - remove xprtsock's sysctls, unregister + */ + if (clnt4) + rpc_shutdown_client(clnt4); + if (clnt) + rpc_shutdown_client(clnt); + } + return; +} + +static void rpcb_set_local(struct rpc_clnt *clnt, struct rpc_clnt *clnt4) +{ + /* Protected by rpcb_create_local_mutex */ + rpcb_local_clnt = clnt; + rpcb_local_clnt4 = clnt4; + rpcb_users++; + dprintk("RPC: created new rpcb local clients (rpcb_local_clnt: " + "0x%p, rpcb_local_clnt4: 0x%p)\n", rpcb_local_clnt, + rpcb_local_clnt4); + +} + /* * Returns zero on success, otherwise a negative errno value * is returned.