summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYing Xue <ying.xue@windriver.com>2015-01-07 06:41:55 +0100
committerDavid S. Miller <davem@davemloft.net>2015-01-09 04:47:11 +0100
commitbd6d4db552ceb52fb19890a454836dcda59743ce (patch)
tree1045ebbe9ecbd7ada7d610c0b8028440761593f6
parentrhashtable: involve rhashtable_lookup_insert routine (diff)
downloadlinux-bd6d4db552ceb52fb19890a454836dcda59743ce.tar.xz
linux-bd6d4db552ceb52fb19890a454836dcda59743ce.zip
rhashtable: future table needs to be traversed when remove an object
When remove an object from hash table, we currently only traverse old bucket table to check whether the object exists. If the object is not found in it, we will try again. But in the second search loop, we still search the object from the old table instead of future table. As a result, the object may be not removed from hash table especially when resizing is currently in progress and the object is just saved in the future table. Signed-off-by: Ying Xue <ying.xue@windriver.com> Cc: Thomas Graf <tgraf@suug.ch> Acked-by: Thomas Graf <tgraf@suug.ch> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--lib/rhashtable.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/rhashtable.c b/lib/rhashtable.c
index 4430233c4e11..1aef942976fe 100644
--- a/lib/rhashtable.c
+++ b/lib/rhashtable.c
@@ -608,10 +608,10 @@ restart:
return true;
}
- if (tbl != rht_dereference_rcu(ht->tbl, ht)) {
+ if (tbl != rht_dereference_rcu(ht->future_tbl, ht)) {
spin_unlock_bh(lock);
- tbl = rht_dereference_rcu(ht->tbl, ht);
+ tbl = rht_dereference_rcu(ht->future_tbl, ht);
hash = head_hashfn(ht, tbl, obj);
lock = bucket_lock(tbl, hash);