Commit 5fdb5f69 authored by Jozsef Kadlecsik's avatar Jozsef Kadlecsik
Browse files

netfilter: ipset: Remove redundant mtype_expire() arguments



Remove redundant parameters nets_length and dsize, because
they can be get from other parameters.

Ported from a patch proposed by Sergey Popovich <popovich_sergei@mail.ua>.
Signed-off-by: default avatarJozsef Kadlecsik <kadlec@blackhole.kfki.hu>
parent 9e41f26a
...@@ -465,14 +465,15 @@ mtype_same_set(const struct ip_set *a, const struct ip_set *b) ...@@ -465,14 +465,15 @@ mtype_same_set(const struct ip_set *a, const struct ip_set *b)
/* Delete expired elements from the hashtable */ /* Delete expired elements from the hashtable */
static void static void
mtype_expire(struct ip_set *set, struct htype *h, u8 nets_length, size_t dsize) mtype_expire(struct ip_set *set, struct htype *h)
{ {
struct htable *t; struct htable *t;
struct hbucket *n, *tmp; struct hbucket *n, *tmp;
struct mtype_elem *data; struct mtype_elem *data;
u32 i, j, d; u32 i, j, d;
size_t dsize = set->dsize;
#ifdef IP_SET_HASH_WITH_NETS #ifdef IP_SET_HASH_WITH_NETS
u8 k; u8 k, nets_length = NLEN(set->family);
#endif #endif
t = ipset_dereference_protected(h->table, set); t = ipset_dereference_protected(h->table, set);
...@@ -539,7 +540,7 @@ mtype_gc(unsigned long ul_set) ...@@ -539,7 +540,7 @@ mtype_gc(unsigned long ul_set)
pr_debug("called\n"); pr_debug("called\n");
spin_lock_bh(&set->lock); spin_lock_bh(&set->lock);
mtype_expire(set, h, NLEN(set->family), set->dsize); mtype_expire(set, h);
spin_unlock_bh(&set->lock); spin_unlock_bh(&set->lock);
h->gc.expires = jiffies + IPSET_GC_PERIOD(set->timeout) * HZ; h->gc.expires = jiffies + IPSET_GC_PERIOD(set->timeout) * HZ;
...@@ -715,7 +716,7 @@ mtype_add(struct ip_set *set, void *value, const struct ip_set_ext *ext, ...@@ -715,7 +716,7 @@ mtype_add(struct ip_set *set, void *value, const struct ip_set_ext *ext,
if (set->elements >= h->maxelem) { if (set->elements >= h->maxelem) {
if (SET_WITH_TIMEOUT(set)) if (SET_WITH_TIMEOUT(set))
/* FIXME: when set is full, we slow down here */ /* FIXME: when set is full, we slow down here */
mtype_expire(set, h, NLEN(set->family), set->dsize); mtype_expire(set, h);
if (set->elements >= h->maxelem && SET_WITH_FORCEADD(set)) if (set->elements >= h->maxelem && SET_WITH_FORCEADD(set))
forceadd = true; forceadd = true;
} }
......
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