Commit 038a3e85 authored by Florian Westphal's avatar Florian Westphal Committed by David S. Miller

rhashtable: remove insecure_max_entries param

no users in the tree, insecure_max_entries is always set to
ht->p.max_size * 2 in rhtashtable_init().

Replace only spot that uses it with a ht->p.max_size check.
Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7acedaf5
...@@ -125,7 +125,6 @@ struct rhashtable; ...@@ -125,7 +125,6 @@ struct rhashtable;
* @key_len: Length of key * @key_len: Length of key
* @key_offset: Offset of key in struct to be hashed * @key_offset: Offset of key in struct to be hashed
* @head_offset: Offset of rhash_head in struct to be hashed * @head_offset: Offset of rhash_head in struct to be hashed
* @insecure_max_entries: Maximum number of entries (may be exceeded)
* @max_size: Maximum size while expanding * @max_size: Maximum size while expanding
* @min_size: Minimum size while shrinking * @min_size: Minimum size while shrinking
* @nulls_base: Base value to generate nulls marker * @nulls_base: Base value to generate nulls marker
...@@ -140,7 +139,6 @@ struct rhashtable_params { ...@@ -140,7 +139,6 @@ struct rhashtable_params {
size_t key_len; size_t key_len;
size_t key_offset; size_t key_offset;
size_t head_offset; size_t head_offset;
unsigned int insecure_max_entries;
unsigned int max_size; unsigned int max_size;
unsigned int min_size; unsigned int min_size;
u32 nulls_base; u32 nulls_base;
...@@ -329,8 +327,8 @@ static inline bool rht_grow_above_100(const struct rhashtable *ht, ...@@ -329,8 +327,8 @@ static inline bool rht_grow_above_100(const struct rhashtable *ht,
static inline bool rht_grow_above_max(const struct rhashtable *ht, static inline bool rht_grow_above_max(const struct rhashtable *ht,
const struct bucket_table *tbl) const struct bucket_table *tbl)
{ {
return ht->p.insecure_max_entries && return ht->p.max_size &&
atomic_read(&ht->nelems) >= ht->p.insecure_max_entries; (atomic_read(&ht->nelems) / 2u) >= ht->p.max_size;
} }
/* The bucket lock is selected based on the hash and protects mutations /* The bucket lock is selected based on the hash and protects mutations
......
...@@ -961,12 +961,6 @@ int rhashtable_init(struct rhashtable *ht, ...@@ -961,12 +961,6 @@ int rhashtable_init(struct rhashtable *ht,
if (params->max_size) if (params->max_size)
ht->p.max_size = rounddown_pow_of_two(params->max_size); ht->p.max_size = rounddown_pow_of_two(params->max_size);
if (params->insecure_max_entries)
ht->p.insecure_max_entries =
rounddown_pow_of_two(params->insecure_max_entries);
else
ht->p.insecure_max_entries = ht->p.max_size * 2;
ht->p.min_size = max(ht->p.min_size, HASH_MIN_SIZE); ht->p.min_size = max(ht->p.min_size, HASH_MIN_SIZE);
if (params->nelem_hint) if (params->nelem_hint)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment