Commit 8d2b1879 authored by Herbert Xu's avatar Herbert Xu Committed by David S. Miller

rhashtable: Move masking back into key_hashfn

This patch reverts commit c88455ce
("rhashtable: key_hashfn() must return full hash value") because
the only user of it always masks the hash value.
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Acked-by: default avatarThomas Graf <tgraf@suug.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6b9f53bc
...@@ -83,7 +83,8 @@ static u32 obj_raw_hashfn(struct rhashtable *ht, ...@@ -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, ...@@ -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();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment