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

Commit 9b4f64a2 authored by NeilBrown's avatar NeilBrown Committed by David S. Miller
Browse files

rhashtable: simplify INIT_RHT_NULLS_HEAD() 



The 'ht' and 'hash' arguments to INIT_RHT_NULLS_HEAD() are
no longer used - so drop them.  This allows us to also
remove the nhash argument from nested_table_alloc().

Acked-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarNeilBrown <neilb@suse.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9f9a7077

include/linux/rhashtable.h

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ struct bucket_table { 
	struct rhash_head __rcu *buckets[] ____cacheline_aligned_in_smp;

};



#define INIT_RHT_NULLS_HEAD(ptr, ht, hash) \

#define INIT_RHT_NULLS_HEAD(ptr)	\

	((ptr) = (typeof(ptr)) NULLS_MARKER(0))



static inline bool rht_is_a_nulls(const struct rhash_head *ptr)

lib/rhashtable.c

+6 −9
Original line number Diff line number Diff line
@@ -116,8 +116,7 @@ static void bucket_table_free_rcu(struct rcu_head *head) 


static union nested_table *nested_table_alloc(struct rhashtable *ht,

					      union nested_table __rcu **prev,

					      unsigned int shifted,

					      unsigned int nhash)

					      unsigned int shifted)

{

	union nested_table *ntbl;

	int i;
@@ -130,8 +129,7 @@ static union nested_table *nested_table_alloc(struct rhashtable *ht, 


	if (ntbl && shifted) {

		for (i = 0; i < PAGE_SIZE / sizeof(ntbl[0].bucket); i++)

			INIT_RHT_NULLS_HEAD(ntbl[i].bucket, ht,

					    (i << shifted) | nhash);

			INIT_RHT_NULLS_HEAD(ntbl[i].bucket);

	}



	rcu_assign_pointer(*prev, ntbl);
@@ -157,7 +155,7 @@ static struct bucket_table *nested_bucket_table_alloc(struct rhashtable *ht, 
		return NULL;



	if (!nested_table_alloc(ht, (union nested_table __rcu **)tbl->buckets,

				0, 0)) {

				0)) {

		kfree(tbl);

		return NULL;

	}
@@ -207,7 +205,7 @@ static struct bucket_table *bucket_table_alloc(struct rhashtable *ht, 
	tbl->hash_rnd = get_random_u32();



	for (i = 0; i < nbuckets; i++)

		INIT_RHT_NULLS_HEAD(tbl->buckets[i], ht, i);

		INIT_RHT_NULLS_HEAD(tbl->buckets[i]);



	return tbl;

}
@@ -1217,7 +1215,7 @@ struct rhash_head __rcu **rht_bucket_nested_insert(struct rhashtable *ht, 
	nhash = index;

	shifted = tbl->nest;

	ntbl = nested_table_alloc(ht, &ntbl[index].table,

				  size <= (1 << shift) ? shifted : 0, nhash);

				  size <= (1 << shift) ? shifted : 0);



	while (ntbl && size > (1 << shift)) {

		index = hash & ((1 << shift) - 1);
@@ -1226,8 +1224,7 @@ struct rhash_head __rcu **rht_bucket_nested_insert(struct rhashtable *ht, 
		nhash |= index << shifted;

		shifted += shift;

		ntbl = nested_table_alloc(ht, &ntbl[index].table,

					  size <= (1 << shift) ? shifted : 0,

					  nhash);

					  size <= (1 << shift) ? shifted : 0);

	}



	if (!ntbl)