Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

rhashtable: simplify INIT_RHT_NULLS_HEAD()

Browse source 
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: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: NeilBrown <neilb@suse.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
NeilBrown 2018-06-18 12:52:50 +10:00 committed by David S. Miller
parent 9f9a707738
commit 9b4f64a227
2 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/linux/rhashtable.h
View file

@ -75,7 +75,7 @@ struct bucket_table {
struct rhash_head __rcu *buckets[] ____cacheline_aligned_in_smp; 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)) ((ptr) = (typeof(ptr)) NULLS_MARKER(0))
static inline bool rht_is_a_nulls(const struct rhash_head *ptr) static inline bool rht_is_a_nulls(const struct rhash_head *ptr)

15
lib/rhashtable.c
View file

@ -116,8 +116,7 @@ static void bucket_table_free_rcu(struct rcu_head *head)
static union nested_table *nested_table_alloc(struct rhashtable *ht, static union nested_table *nested_table_alloc(struct rhashtable *ht,
union nested_table __rcu **prev, union nested_table __rcu **prev,
unsigned int shifted, unsigned int shifted)
unsigned int nhash)
{ {
union nested_table *ntbl; union nested_table *ntbl;
int i; int i;
@ -130,8 +129,7 @@ static union nested_table *nested_table_alloc(struct rhashtable *ht,
if (ntbl && shifted) { if (ntbl && shifted) {
for (i = 0; i < PAGE_SIZE / sizeof(ntbl[0].bucket); i++) for (i = 0; i < PAGE_SIZE / sizeof(ntbl[0].bucket); i++)
INIT_RHT_NULLS_HEAD(ntbl[i].bucket, ht, INIT_RHT_NULLS_HEAD(ntbl[i].bucket);
(i << shifted) | nhash);
} }
rcu_assign_pointer(*prev, ntbl); rcu_assign_pointer(*prev, ntbl);
@ -157,7 +155,7 @@ static struct bucket_table *nested_bucket_table_alloc(struct rhashtable *ht,
return NULL; return NULL;
if (!nested_table_alloc(ht, (union nested_table __rcu **)tbl->buckets, if (!nested_table_alloc(ht, (union nested_table __rcu **)tbl->buckets,
0, 0)) { 0)) {
kfree(tbl); kfree(tbl);
return NULL; return NULL;
} }
@ -207,7 +205,7 @@ static struct bucket_table *bucket_table_alloc(struct rhashtable *ht,
tbl->hash_rnd = get_random_u32(); tbl->hash_rnd = get_random_u32();
for (i = 0; i < nbuckets; i++) for (i = 0; i < nbuckets; i++)
INIT_RHT_NULLS_HEAD(tbl->buckets[i], ht, i); INIT_RHT_NULLS_HEAD(tbl->buckets[i]);
return tbl; return tbl;
} }
@ -1217,7 +1215,7 @@ struct rhash_head __rcu **rht_bucket_nested_insert(struct rhashtable *ht,
nhash = index; nhash = index;
shifted = tbl->nest; shifted = tbl->nest;
ntbl = nested_table_alloc(ht, &ntbl[index].table, ntbl = nested_table_alloc(ht, &ntbl[index].table,
size <= (1 << shift) ? shifted : 0, nhash); size <= (1 << shift) ? shifted : 0);
while (ntbl && size > (1 << shift)) { while (ntbl && size > (1 << shift)) {
index = hash & ((1 << shift) - 1); index = hash & ((1 << shift) - 1);
@ -1226,8 +1224,7 @@ struct rhash_head __rcu **rht_bucket_nested_insert(struct rhashtable *ht,
nhash |= index << shifted; nhash |= index << shifted;
shifted += shift; shifted += shift;
ntbl = nested_table_alloc(ht, &ntbl[index].table, ntbl = nested_table_alloc(ht, &ntbl[index].table,
size <= (1 << shift) ? shifted : 0, size <= (1 << shift) ? shifted : 0);
nhash);
} }
if (!ntbl) if (!ntbl)