From 16eee8b97d9eae44061b1e1d967f072c08df907d Mon Sep 17 00:00:00 2001 From: Paul Gortmaker Date: Wed, 11 Jul 2012 17:35:01 -0400 Subject: [PATCH] --- yaml --- r: 315365 b: refs/heads/master c: f705ab956b3a0377181c9d73b235ad5bf4020937 h: refs/heads/master i: 315363: 63b5a552f30400f918396fd9d3576e404caaad24 v: v3 --- [refs] | 2 +- trunk/net/tipc/name_table.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c6f6e7f70509..0e037c734b72 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7e9cab58e8e0b5e52af28145ffa70de329adc459 +refs/heads/master: f705ab956b3a0377181c9d73b235ad5bf4020937 diff --git a/trunk/net/tipc/name_table.c b/trunk/net/tipc/name_table.c index 13fb9d559ea5..cade0acda4ef 100644 --- a/trunk/net/tipc/name_table.c +++ b/trunk/net/tipc/name_table.c @@ -940,8 +940,10 @@ void tipc_nametbl_stop(void) /* Verify name table is empty, then release it */ write_lock_bh(&tipc_nametbl_lock); for (i = 0; i < tipc_nametbl_size; i++) { - if (!hlist_empty(&table.types[i])) - err("tipc_nametbl_stop(): hash chain %u is non-null\n", i); + if (hlist_empty(&table.types[i])) + continue; + err("tipc_nametbl_stop(): orphaned hash chain detected\n"); + break; } kfree(table.types); table.types = NULL;