From patchwork Thu Dec 9 16:49:52 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever III X-Patchwork-Id: 395162 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oB9Go5Fg022945 for ; Thu, 9 Dec 2010 16:50:06 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754503Ab0LIQtz (ORCPT ); Thu, 9 Dec 2010 11:49:55 -0500 Received: from mail-yx0-f174.google.com ([209.85.213.174]:43158 "EHLO mail-yx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754495Ab0LIQtz (ORCPT ); Thu, 9 Dec 2010 11:49:55 -0500 Received: by yxt3 with SMTP id 3so1488581yxt.19 for ; Thu, 09 Dec 2010 08:49:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:from:subject:to:date :message-id:in-reply-to:references:user-agent:mime-version :content-type:content-transfer-encoding; bh=khGzGoEeKCVnOdgcKN0rFml/J6HONO2XirtQ01vQ/Pc=; b=lLvBu+xEe4G7KhiZBU+v3rHL5p/olTfNUBOUn6XufVuC+q6+4Yf59iIvDMAkooudlO UJ33GgpHHMRhhFXHzgWeeEcIdYhljmehwL2cqCg7kQXJi+ETXGv0Sy33XjfVxOxA9otc D0UTZPmWh72i6UQjPLXHVsSE5GV/HALfaBpVU= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:subject:to:date:message-id:in-reply-to:references :user-agent:mime-version:content-type:content-transfer-encoding; b=bJgK639IzS03RpPvkqdgDvyOI53qzWfQ7VgE7YKePKTfjE3Oi8uoNQybCOdcXEXr/z 0LcDtK5eX9mRW8LTTCWKbEkp+E/O3lZRrbMT7l1ax7BytWoN+owQqVOGu4E/3yUUiVJs ELFMYl9pVjwyR54MMuZ8oXQV2/sFYnW8EqOOQ= Received: by 10.146.168.7 with SMTP id q7mr4313545yae.0.1291913394456; Thu, 09 Dec 2010 08:49:54 -0800 (PST) Received: from matisse.1015granger.net ([99.26.161.222]) by mx.google.com with ESMTPS id 75sm1251877yhl.2.2010.12.09.08.49.53 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 09 Dec 2010 08:49:53 -0800 (PST) From: Chuck Lever Subject: [PATCH 08/11] lockd: Rename nlm_hosts To: linux-nfs@vger.kernel.org Date: Thu, 09 Dec 2010 11:49:52 -0500 Message-ID: <20101209164952.4513.13794.stgit@matisse.1015granger.net> In-Reply-To: <20101209163555.4513.94435.stgit@matisse.1015granger.net> References: <20101209163555.4513.94435.stgit@matisse.1015granger.net> User-Agent: StGIT/0.14.3 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.3 (demeter1.kernel.org [140.211.167.41]); Thu, 09 Dec 2010 16:50:06 +0000 (UTC) diff --git a/fs/lockd/host.c b/fs/lockd/host.c index 09286e2..2b515e2 100644 --- a/fs/lockd/host.c +++ b/fs/lockd/host.c @@ -25,7 +25,7 @@ #define NLM_HOST_EXPIRE (300 * HZ) #define NLM_HOST_COLLECT (120 * HZ) -static struct hlist_head nlm_hosts[NLM_HOST_NRHASH]; +static struct hlist_head nlm_server_hosts[NLM_HOST_NRHASH]; static struct hlist_head nlm_client_hosts[NLM_HOST_NRHASH]; #define for_each_host(host, pos, chain, table) \ @@ -180,7 +180,7 @@ static struct nlm_host *nlm_lookup_host(struct nlm_lookup_host_info *ni) * different NLM rpc_clients into one single nlm_host object. * This would allow us to have one nlm_host per address. */ - chain = &nlm_hosts[nlm_hash_address(ni->sap)]; + chain = &nlm_server_hosts[nlm_hash_address(ni->sap)]; hlist_for_each_entry(host, pos, chain, h_hash) { if (!rpc_cmp_addr(nlm_addr(host), ni->sap)) continue; @@ -424,7 +424,7 @@ struct nlm_host *nlmsvc_lookup_host(const struct svc_rqst *rqstp, if (time_after_eq(jiffies, next_gc)) nlm_gc_hosts(); - chain = &nlm_hosts[nlm_hash_address(ni.sap)]; + chain = &nlm_server_hosts[nlm_hash_address(ni.sap)]; hlist_for_each_entry(host, pos, chain, h_hash) { if (!rpc_cmp_addr(nlm_addr(host), ni.sap)) continue; @@ -628,7 +628,7 @@ void nlm_host_rebooted(const struct nlm_reboot *info) * lock for this. * To avoid processing a host several times, we match the nsmstate. */ - while ((host = next_host_state(nlm_hosts, nsm, info)) != NULL) { + while ((host = next_host_state(nlm_server_hosts, nsm, info)) != NULL) { nlmsvc_free_host_resources(host); nlmsvc_release_host(host); } @@ -656,7 +656,7 @@ nlm_shutdown_hosts(void) /* First, make all hosts eligible for gc */ dprintk("lockd: nuking all hosts...\n"); - for_each_host(host, pos, chain, nlm_hosts) { + for_each_host(host, pos, chain, nlm_server_hosts) { host->h_expires = jiffies - 1; if (host->h_rpcclnt) { rpc_shutdown_client(host->h_rpcclnt); @@ -672,7 +672,7 @@ nlm_shutdown_hosts(void) if (nrhosts) { printk(KERN_WARNING "lockd: couldn't shutdown host module!\n"); dprintk("lockd: %d hosts left:\n", nrhosts); - for_each_host(host, pos, chain, nlm_hosts) { + for_each_host(host, pos, chain, nlm_server_hosts) { dprintk(" %s (cnt %d use %d exp %ld)\n", host->h_name, atomic_read(&host->h_count), host->h_inuse, host->h_expires); @@ -693,13 +693,13 @@ nlm_gc_hosts(void) struct nlm_host *host; dprintk("lockd: host garbage collection\n"); - for_each_host(host, pos, chain, nlm_hosts) + for_each_host(host, pos, chain, nlm_server_hosts) host->h_inuse = 0; /* Mark all hosts that hold locks, blocks or shares */ nlmsvc_mark_resources(); - for_each_host_safe(host, pos, next, chain, nlm_hosts) { + for_each_host_safe(host, pos, next, chain, nlm_server_hosts) { if (atomic_read(&host->h_count) || host->h_inuse || time_before(jiffies, host->h_expires)) { dprintk("nlm_gc_hosts skipping %s "