On Sun, Oct 23, 2016 at 10:37:39PM +0200, Jozsef Kadlecsik wrote:
> Hash types already has it's memsize calculation code in separate
> functions. Do the same for *bitmap* and *list* sets.
This is just a cleanup, right?
More comments below.
> Ported from a patch proposed by Sergey Popovich <popovich_sergei@xxxxxxx>.
>
> Suggested-by: Sergey Popovich <popovich_sergei@xxxxxxx>
> Signed-off-by: Jozsef Kadlecsik <kadlec@xxxxxxxxxxxxxxxxx>
> ---
> net/netfilter/ipset/ip_set_bitmap_gen.h | 13 ++++++++++++-
> net/netfilter/ipset/ip_set_list_set.c | 23 +++++++++++++++++------
> 2 files changed, 29 insertions(+), 7 deletions(-)
>
> diff --git a/net/netfilter/ipset/ip_set_bitmap_gen.h b/net/netfilter/ipset/ip_set_bitmap_gen.h
> index 2e8e7e5..c22cdde 100644
> --- a/net/netfilter/ipset/ip_set_bitmap_gen.h
> +++ b/net/netfilter/ipset/ip_set_bitmap_gen.h
> @@ -22,6 +22,7 @@
> #define mtype_kadt IPSET_TOKEN(MTYPE, _kadt)
> #define mtype_uadt IPSET_TOKEN(MTYPE, _uadt)
> #define mtype_destroy IPSET_TOKEN(MTYPE, _destroy)
> +#define mtype_memsize IPSET_TOKEN(MTYPE, _memsize)
> #define mtype_flush IPSET_TOKEN(MTYPE, _flush)
> #define mtype_head IPSET_TOKEN(MTYPE, _head)
> #define mtype_same_set IPSET_TOKEN(MTYPE, _same_set)
> @@ -84,12 +85,22 @@
> memset(map->members, 0, map->memsize);
> }
>
> +/* Calculate the actual memory size of the set data */
> +static size_t
> +mtype_memsize(const struct mtype *map, size_t dsize)
> +{
> + size_t memsize = sizeof(*map) +
> + map->memsize +
> + map->elements * dsize;
> + return memsize;
> +}
This fits into one line, so I don't see why we need to split it, look:
return sizeof(*map) + map->memsize + map->elements * dsize;
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
