diff options
| author | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2015-11-02 20:27:58 +0100 |
|---|---|---|
| committer | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2015-11-07 10:57:23 +0100 |
| commit | 30383a8bd324ea4579b2ed90295a3a147b67be61 (patch) | |
| tree | 63b04b49ba03905e104c9cc17be399998c88500e | |
| parent | c7cf6f3bd30ce30e74a3eb84ed4c2929e564e137 (diff) | |
Collapse same condition body to a single one
Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
| -rw-r--r-- | kernel/net/netfilter/ipset/ip_set_hash_gen.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/kernel/net/netfilter/ipset/ip_set_hash_gen.h b/kernel/net/netfilter/ipset/ip_set_hash_gen.h index be906d8..63a1733 100644 --- a/kernel/net/netfilter/ipset/ip_set_hash_gen.h +++ b/kernel/net/netfilter/ipset/ip_set_hash_gen.h @@ -716,14 +716,8 @@ mtype_add(struct ip_set *set, void *value, const struct ip_set_ext *ext, key = HKEY(value, h->initval, t->htable_bits); n = __ipset_dereference_protected(hbucket(t, key), 1); if (!n) { - if (forceadd) { - if (net_ratelimit()) - pr_warn("Set %s is full, maxelem %u reached\n", - set->name, h->maxelem); - return -IPSET_ERR_HASH_FULL; - } else if (set->elements >= h->maxelem) { + if (forceadd || set->elements >= h->maxelem) goto set_full; - } old = NULL; n = kzalloc(sizeof(*n) + AHASH_INIT_SIZE * set->dsize, GFP_ATOMIC); |