superrob1500
/
mirror-linux
mirror of https://github.com/torvalds/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

netfilter: ipset: Remove unused htable_bits in macro ahash_region 

Since the ahash_region() macro was redefined to calculate the region
index solely from HTABLE_REGION_BITS, the htable_bits parameter became
unused.

Remove the unused htable_bits argument and its call sites, simplifying
the code without changing semantics.

Fixes: 8478a729c0 ("netfilter: ipset: fix region locking in hash types")
Signed-off-by: Zhen Ni <zhen.ni@easystack.cn>
Reviewed-by: Phil Sutter <phil@nwl.cc>
Signed-off-by: Florian Westphal <fw@strlen.de>
pull/1354/merge
Zhen Ni 2025-08-29 16:36:21 +08:00 committed by Florian Westphal
parent 496a6ed840
commit ba941796d7
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net/netfilter/ipset/ip_set_hash_gen.h
View File

@ -63,7 +63,7 @@ struct hbucket {
: jhash_size((htable_bits) - HTABLE_REGION_BITS)) : jhash_size((htable_bits) - HTABLE_REGION_BITS))
#define ahash_sizeof_regions(htable_bits) \ #define ahash_sizeof_regions(htable_bits) \
(ahash_numof_locks(htable_bits) * sizeof(struct ip_set_region)) (ahash_numof_locks(htable_bits) * sizeof(struct ip_set_region))
#define ahash_region(n, htable_bits) \ #define ahash_region(n) \
((n) / jhash_size(HTABLE_REGION_BITS)) ((n) / jhash_size(HTABLE_REGION_BITS))
#define ahash_bucket_start(h, htable_bits) \ #define ahash_bucket_start(h, htable_bits) \
((htable_bits) < HTABLE_REGION_BITS ? 0 \ ((htable_bits) < HTABLE_REGION_BITS ? 0 \
@ -702,7 +702,7 @@ retry:
#endif #endif
key = HKEY(data, h->initval, htable_bits); key = HKEY(data, h->initval, htable_bits);
m = __ipset_dereference(hbucket(t, key)); m = __ipset_dereference(hbucket(t, key));
nr = ahash_region(key, htable_bits); nr = ahash_region(key);
if (!m) { if (!m) {
m = kzalloc(sizeof(*m) + m = kzalloc(sizeof(*m) +
AHASH_INIT_SIZE * dsize, AHASH_INIT_SIZE * dsize,
@ -852,7 +852,7 @@ mtype_add(struct ip_set *set, void *value, const struct ip_set_ext *ext,
rcu_read_lock_bh(); rcu_read_lock_bh();
t = rcu_dereference_bh(h->table); t = rcu_dereference_bh(h->table);
key = HKEY(value, h->initval, t->htable_bits); key = HKEY(value, h->initval, t->htable_bits);
r = ahash_region(key, t->htable_bits); r = ahash_region(key);
atomic_inc(&t->uref); atomic_inc(&t->uref);
elements = t->hregion[r].elements; elements = t->hregion[r].elements;
maxelem = t->maxelem; maxelem = t->maxelem;
@ -1050,7 +1050,7 @@ mtype_del(struct ip_set *set, void *value, const struct ip_set_ext *ext,
rcu_read_lock_bh(); rcu_read_lock_bh();
t = rcu_dereference_bh(h->table); t = rcu_dereference_bh(h->table);
key = HKEY(value, h->initval, t->htable_bits); key = HKEY(value, h->initval, t->htable_bits);
r = ahash_region(key, t->htable_bits); r = ahash_region(key);
atomic_inc(&t->uref); atomic_inc(&t->uref);
rcu_read_unlock_bh(); rcu_read_unlock_bh();