hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rhashtable: Move masking back into key_hashfn 

This patch reverts commit c88455ce50
("rhashtable: key_hashfn() must return full hash value") because
the only user of it always masks the hash value.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Acked-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Herbert Xu 2015-03-12 14:49:38 +11:00 committed by David S. Miller
parent 6b9f53bc10
commit 8d2b18793d
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/rhashtable.c
View File

@ -83,7 +83,8 @@ static u32 obj_raw_hashfn(struct rhashtable *ht,
static u32 key_hashfn(struct rhashtable *ht, const struct bucket_table *tbl, static u32 key_hashfn(struct rhashtable *ht, const struct bucket_table *tbl,
const void *key, u32 len) const void *key, u32 len)
{ {
return ht->p.hashfn(key, len, tbl->hash_rnd) >> HASH_RESERVED_SPACE; return rht_bucket_index(tbl, ht->p.hashfn(key, len, tbl->hash_rnd) >>
HASH_RESERVED_SPACE);
} }
static u32 head_hashfn(struct rhashtable *ht, static u32 head_hashfn(struct rhashtable *ht,
@ -622,7 +623,7 @@ void *rhashtable_lookup_compare(struct rhashtable *ht, const void *key,
tbl = rht_dereference_rcu(ht->tbl, ht); tbl = rht_dereference_rcu(ht->tbl, ht);
hash = key_hashfn(ht, tbl, key, ht->p.key_len); hash = key_hashfn(ht, tbl, key, ht->p.key_len);
restart: restart:
rht_for_each_rcu(he, tbl, rht_bucket_index(tbl, hash)) { rht_for_each_rcu(he, tbl, hash) {
if (!compare(rht_obj(ht, he), arg)) if (!compare(rht_obj(ht, he), arg))
continue; continue;
rcu_read_unlock(); rcu_read_unlock();