rhashtable: Remove key length argument to key_hashfn

[deliverable/linux.git] / lib / rhashtable.c

diff --git a/lib/rhashtable.c b/lib/rhashtable.c
index 03fdaf869c4d725384cc3bc304ccc145c89f892f..838cccc4ef7e1fa9438897b7a97c802a4ca2634a 100644 (file)
--- a/lib/rhashtable.c
+++ b/lib/rhashtable.c
@@ -81,9 +81,10 @@ static u32 obj_raw_hashfn(struct rhashtable *ht,
 }
 
 static u32 key_hashfn(struct rhashtable *ht, const struct bucket_table *tbl,
-                     const void *key, u32 len)
+                     const void *key)
 {
-       return rht_bucket_index(tbl, ht->p.hashfn(key, len, tbl->hash_rnd) >>
+       return rht_bucket_index(tbl, ht->p.hashfn(key, ht->p.key_len,
+                                                 tbl->hash_rnd) >>
                                     HASH_RESERVED_SPACE);
 }
 
@@ -619,7 +620,7 @@ void *rhashtable_lookup_compare(struct rhashtable *ht, const void *key,
        rcu_read_lock();
 
        tbl = rht_dereference_rcu(ht->tbl, ht);
-       hash = key_hashfn(ht, tbl, key, ht->p.key_len);
+       hash = key_hashfn(ht, tbl, key);
 restart:
        rht_for_each_rcu(he, tbl, hash) {
                if (!compare(rht_obj(ht, he), arg))