From 4f6bbdbfcef0a9b70898a4beec94c0715883c9f6 Mon Sep 17 00:00:00 2001 From: Chuck Lever Date: Tue, 14 Dec 2010 15:06:32 +0000 Subject: [PATCH] --- yaml --- r: 229196 b: refs/heads/master c: fcc072c783491ca465e4d1e74da7dbb48dbf7a31 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/lockd/host.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index a5f48cad1169..4b39d35a01e6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d2df0484bb38f2e0d9754b00597d4a6d1cf666d0 +refs/heads/master: fcc072c783491ca465e4d1e74da7dbb48dbf7a31 diff --git a/trunk/fs/lockd/host.c b/trunk/fs/lockd/host.c index 87fbde1d1a1f..77ec21a808db 100644 --- a/trunk/fs/lockd/host.c +++ b/trunk/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),