From patchwork Tue Dec 14 15:06:32 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 410361 X-Patchwork-Delegate: Trond.Myklebust@netapp.com 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 oBEF6aKi014119 for ; Tue, 14 Dec 2010 15:06:36 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758076Ab0LNPGf (ORCPT ); Tue, 14 Dec 2010 10:06:35 -0500 Received: from mail-yx0-f174.google.com ([209.85.213.174]:43928 "EHLO mail-yx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757715Ab0LNPGf (ORCPT ); Tue, 14 Dec 2010 10:06:35 -0500 Received: by yxt3 with SMTP id 3so385481yxt.19 for ; Tue, 14 Dec 2010 07:06:34 -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:cc :date:message-id:in-reply-to:references:user-agent:mime-version :content-type:content-transfer-encoding; bh=RyuZy2KM9DBYCkD477odnbWQ1IK77+Ri8r2cx6FTHec=; b=YkgcpTmRuTBo9NY3U7aaXTHmJWGKY67/7yCp476bhh1DCf2M1apXvAuVeyyRaSMNs0 RaZ92/ECiWcQmijS5w8N71sAzhlbanx2ap+03mkKuyGVSOz8CG1dfZw0mS1S44//W6Q7 1oDY7+W5gMxPyPugtl3/p9scMFT1ozODhQhNU= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:subject:to:cc:date:message-id:in-reply-to:references :user-agent:mime-version:content-type:content-transfer-encoding; b=Lm2e2wnPM0OdjFkkVU9+anIch2WF4S1duCJJ/Wk1nmX2/4jKx3tzbZp3LnzdUHBA1z COXM961T5n2qwEL66FtVqkfxNDbA4dbrvnrb6+475W9eGgu/JuhmHnn5p41kQIylmOhE yZ7X1Qq2B1mlKEEoCsySrlJ91BE+HFWFXglfs= Received: by 10.42.179.130 with SMTP id bq2mr2454754icb.480.1292339194683; Tue, 14 Dec 2010 07:06:34 -0800 (PST) Received: from matisse.1015granger.net ([99.26.161.222]) by mx.google.com with ESMTPS id y3sm13993icw.23.2010.12.14.07.06.33 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 14 Dec 2010 07:06:33 -0800 (PST) From: Chuck Lever Subject: [PATCH 09/11] lockd: Make nrhosts an unsigned long To: trond.myklebust@netapp.com Cc: linux-nfs@vger.kernel.org Date: Tue, 14 Dec 2010 10:06:32 -0500 Message-ID: <20101214150632.2736.85687.stgit@matisse.1015granger.net> In-Reply-To: <20101214150036.2736.98254.stgit@matisse.1015granger.net> References: <20101214150036.2736.98254.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]); Tue, 14 Dec 2010 15:06:37 +0000 (UTC) diff --git a/fs/lockd/host.c b/fs/lockd/host.c index 87fbde1..77ec21a 100644 --- a/fs/lockd/host.c +++ b/fs/lockd/host.c @@ -40,7 +40,7 @@ static struct hlist_head nlm_client_hosts[NLM_HOST_NRHASH]; (chain), h_hash) static unsigned long next_gc; -static int nrhosts; +static unsigned long nrhosts; static DEFINE_MUTEX(nlm_host_mutex); static void nlm_gc_hosts(void); @@ -673,9 +673,9 @@ nlm_shutdown_hosts(void) mutex_unlock(&nlm_host_mutex); /* complain if any hosts are left */ - if (nrhosts) { + if (nrhosts != 0) { printk(KERN_WARNING "lockd: couldn't shutdown host module!\n"); - dprintk("lockd: %d hosts left:\n", nrhosts); + dprintk("lockd: %lu hosts left:\n", nrhosts); 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),