Ver código fonte

rhashtable: Remove key length argument to key_hashfn

key_hashfn has only one caller and it doesn't really need to supply
the key length as an extra parameter.

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>
Herbert Xu 10 anos atrás
pai
commit
cffaa9cb92
1 arquivos alterados com 4 adições e 3 exclusões
  1. 4 3
      lib/rhashtable.c

+ 4 - 3
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,
 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);
 				     HASH_RESERVED_SPACE);
 }
 }
 
 
@@ -619,7 +620,7 @@ void *rhashtable_lookup_compare(struct rhashtable *ht, const void *key,
 	rcu_read_lock();
 	rcu_read_lock();
 
 
 	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);
 restart:
 restart:
 	rht_for_each_rcu(he, tbl, hash) {
 	rht_for_each_rcu(he, tbl, hash) {
 		if (!compare(rht_obj(ht, he), arg))
 		if (!compare(rht_obj(ht, he), arg))