Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ec9f71c5 authored by Herbert Xu's avatar Herbert Xu Committed by David S. Miller
Browse files

rhashtable: Remove obj_raw_hashfn 



Now that the only caller of obj_raw_hashfn is head_hashfn, we can
simply kill it and fold it into the latter.

This patch also moves the common shift from head_hashfn/key_hashfn
into rht_bucket_index.

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 cffaa9cb

lib/rhashtable.c

+7 −18
Original line number Diff line number Diff line
@@ -63,36 +63,25 @@ static void *rht_obj(const struct rhashtable *ht, const struct rhash_head *he) 


static u32 rht_bucket_index(const struct bucket_table *tbl, u32 hash)

{

	return hash & (tbl->size - 1);

}



static u32 obj_raw_hashfn(struct rhashtable *ht,

			  const struct bucket_table *tbl, const void *ptr)

{

	u32 hash;



	if (unlikely(!ht->p.key_len))

		hash = ht->p.obj_hashfn(ptr, tbl->hash_rnd);

	else

		hash = ht->p.hashfn(ptr + ht->p.key_offset, ht->p.key_len,

				    tbl->hash_rnd);



	return hash >> HASH_RESERVED_SPACE;

	return (hash >> HASH_RESERVED_SPACE) & (tbl->size - 1);

}



static u32 key_hashfn(struct rhashtable *ht, const struct bucket_table *tbl,

		      const void *key)

{

	return rht_bucket_index(tbl, ht->p.hashfn(key, ht->p.key_len,

						  tbl->hash_rnd) >>

				     HASH_RESERVED_SPACE);

						  tbl->hash_rnd));

}



static u32 head_hashfn(struct rhashtable *ht,

		       const struct bucket_table *tbl,

		       const struct rhash_head *he)

{

	return rht_bucket_index(tbl, obj_raw_hashfn(ht, tbl, rht_obj(ht, he)));

	const char *ptr = rht_obj(ht, he);



	return likely(ht->p.key_len) ?

	       key_hashfn(ht, tbl, ptr + ht->p.key_offset) :

	       rht_bucket_index(tbl, ht->p.obj_hashfn(ptr, tbl->hash_rnd));

}



#ifdef CONFIG_PROVE_LOCKING