Commit 8dea982a authored by Jeremy Sowden's avatar Jeremy Sowden Committed by Pablo Neira Ayuso
Browse files

netfilter: ipset: remove inline from static functions in .c files. 



The inline function-specifier should not be used for static functions
defined in .c files since it bloats the kernel.  Instead leave the
compiler to decide which functions to inline.

While a couple of the files affected (ip_set_*_gen.h) are technically
headers, they contain templates for generating the common parts of
particular set-types and so we treat them like .c files.

Signed-off-by: default avatarJeremy Sowden <jeremy@azazel.net>
Acked-by: default avatarJozsef Kadlecsik <kadlec@netfilter.org>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 017f77c0

net/netfilter/ipset/ip_set_bitmap_gen.h

+1 −1
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ mtype_del(struct ip_set *set, void *value, const struct ip_set_ext *ext, 
}



#ifndef IP_SET_BITMAP_STORED_TIMEOUT

static inline bool

static bool

mtype_is_filled(const struct mtype_elem *x)

{

	return true;

net/netfilter/ipset/ip_set_bitmap_ip.c

+7 −7
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ struct bitmap_ip_adt_elem { 
	u16 id;

};



static inline u32

static u32

ip_to_id(const struct bitmap_ip *m, u32 ip)

{

	return ((ip & ip_set_hostmask(m->netmask)) - m->first_ip) / m->hosts;
@@ -63,33 +63,33 @@ ip_to_id(const struct bitmap_ip *m, u32 ip) 


/* Common functions */



static inline int

static int

bitmap_ip_do_test(const struct bitmap_ip_adt_elem *e,

		  struct bitmap_ip *map, size_t dsize)

{

	return !!test_bit(e->id, map->members);

}



static inline int

static int

bitmap_ip_gc_test(u16 id, const struct bitmap_ip *map, size_t dsize)

{

	return !!test_bit(id, map->members);

}



static inline int

static int

bitmap_ip_do_add(const struct bitmap_ip_adt_elem *e, struct bitmap_ip *map,

		 u32 flags, size_t dsize)

{

	return !!test_bit(e->id, map->members);

}



static inline int

static int

bitmap_ip_do_del(const struct bitmap_ip_adt_elem *e, struct bitmap_ip *map)

{

	return !test_and_clear_bit(e->id, map->members);

}



static inline int

static int

bitmap_ip_do_list(struct sk_buff *skb, const struct bitmap_ip *map, u32 id,

		  size_t dsize)

{
@@ -97,7 +97,7 @@ bitmap_ip_do_list(struct sk_buff *skb, const struct bitmap_ip *map, u32 id, 
			htonl(map->first_ip + id * map->hosts));

}



static inline int

static int

bitmap_ip_do_head(struct sk_buff *skb, const struct bitmap_ip *map)

{

	return nla_put_ipaddr4(skb, IPSET_ATTR_IP, htonl(map->first_ip)) ||

net/netfilter/ipset/ip_set_bitmap_ipmac.c

+9 −9
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ struct bitmap_ipmac_elem { 
	unsigned char filled;

} __aligned(__alignof__(u64));



static inline u32

static u32

ip_to_id(const struct bitmap_ipmac *m, u32 ip)

{

	return ip - m->first_ip;
@@ -79,7 +79,7 @@ ip_to_id(const struct bitmap_ipmac *m, u32 ip) 


/* Common functions */



static inline int

static int

bitmap_ipmac_do_test(const struct bitmap_ipmac_adt_elem *e,

		     const struct bitmap_ipmac *map, size_t dsize)

{
@@ -94,7 +94,7 @@ bitmap_ipmac_do_test(const struct bitmap_ipmac_adt_elem *e, 
	return -EAGAIN;

}



static inline int

static int

bitmap_ipmac_gc_test(u16 id, const struct bitmap_ipmac *map, size_t dsize)

{

	const struct bitmap_ipmac_elem *elem;
@@ -106,13 +106,13 @@ bitmap_ipmac_gc_test(u16 id, const struct bitmap_ipmac *map, size_t dsize) 
	return elem->filled == MAC_FILLED;

}



static inline int

static int

bitmap_ipmac_is_filled(const struct bitmap_ipmac_elem *elem)

{

	return elem->filled == MAC_FILLED;

}



static inline int

static int

bitmap_ipmac_add_timeout(unsigned long *timeout,

			 const struct bitmap_ipmac_adt_elem *e,

			 const struct ip_set_ext *ext, struct ip_set *set,
@@ -139,7 +139,7 @@ bitmap_ipmac_add_timeout(unsigned long *timeout, 
	return 0;

}



static inline int

static int

bitmap_ipmac_do_add(const struct bitmap_ipmac_adt_elem *e,

		    struct bitmap_ipmac *map, u32 flags, size_t dsize)

{
@@ -177,14 +177,14 @@ bitmap_ipmac_do_add(const struct bitmap_ipmac_adt_elem *e, 
	return IPSET_ADD_STORE_PLAIN_TIMEOUT;

}



static inline int

static int

bitmap_ipmac_do_del(const struct bitmap_ipmac_adt_elem *e,

		    struct bitmap_ipmac *map)

{

	return !test_and_clear_bit(e->id, map->members);

}



static inline int

static int

bitmap_ipmac_do_list(struct sk_buff *skb, const struct bitmap_ipmac *map,

		     u32 id, size_t dsize)

{
@@ -197,7 +197,7 @@ bitmap_ipmac_do_list(struct sk_buff *skb, const struct bitmap_ipmac *map, 
		nla_put(skb, IPSET_ATTR_ETHER, ETH_ALEN, elem->ether));

}



static inline int

static int

bitmap_ipmac_do_head(struct sk_buff *skb, const struct bitmap_ipmac *map)

{

	return nla_put_ipaddr4(skb, IPSET_ATTR_IP, htonl(map->first_ip)) ||

net/netfilter/ipset/ip_set_bitmap_port.c

+7 −7
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ struct bitmap_port_adt_elem { 
	u16 id;

};



static inline u16

static u16

port_to_id(const struct bitmap_port *m, u16 port)

{

	return port - m->first_port;
@@ -54,34 +54,34 @@ port_to_id(const struct bitmap_port *m, u16 port) 


/* Common functions */



static inline int

static int

bitmap_port_do_test(const struct bitmap_port_adt_elem *e,

		    const struct bitmap_port *map, size_t dsize)

{

	return !!test_bit(e->id, map->members);

}



static inline int

static int

bitmap_port_gc_test(u16 id, const struct bitmap_port *map, size_t dsize)

{

	return !!test_bit(id, map->members);

}



static inline int

static int

bitmap_port_do_add(const struct bitmap_port_adt_elem *e,

		   struct bitmap_port *map, u32 flags, size_t dsize)

{

	return !!test_bit(e->id, map->members);

}



static inline int

static int

bitmap_port_do_del(const struct bitmap_port_adt_elem *e,

		   struct bitmap_port *map)

{

	return !test_and_clear_bit(e->id, map->members);

}



static inline int

static int

bitmap_port_do_list(struct sk_buff *skb, const struct bitmap_port *map, u32 id,

		    size_t dsize)

{
@@ -89,7 +89,7 @@ bitmap_port_do_list(struct sk_buff *skb, const struct bitmap_port *map, u32 id, 
			     htons(map->first_port + id));

}



static inline int

static int

bitmap_port_do_head(struct sk_buff *skb, const struct bitmap_port *map)

{

	return nla_put_net16(skb, IPSET_ATTR_PORT, htons(map->first_port)) ||

net/netfilter/ipset/ip_set_core.c

+10 −10
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ struct ip_set_net { 


static unsigned int ip_set_net_id __read_mostly;



static inline struct ip_set_net *ip_set_pernet(struct net *net)

static struct ip_set_net *ip_set_pernet(struct net *net)

{

	return net_generic(net, ip_set_net_id);

}
@@ -67,13 +67,13 @@ MODULE_ALIAS_NFNL_SUBSYS(NFNL_SUBSYS_IPSET); 
 * serialized by ip_set_type_mutex.

 */



static inline void

static void

ip_set_type_lock(void)

{

	mutex_lock(&ip_set_type_mutex);

}



static inline void

static void

ip_set_type_unlock(void)

{

	mutex_unlock(&ip_set_type_mutex);
@@ -277,7 +277,7 @@ ip_set_free(void *members) 
}

EXPORT_SYMBOL_GPL(ip_set_free);



static inline bool

static bool

flag_nested(const struct nlattr *nla)

{

	return nla->nla_type & NLA_F_NESTED;
@@ -356,7 +356,7 @@ const struct ip_set_ext_type ip_set_extensions[] = { 
};

EXPORT_SYMBOL_GPL(ip_set_extensions);



static inline bool

static bool

add_extension(enum ip_set_ext_id id, u32 flags, struct nlattr *tb[])

{

	return ip_set_extensions[id].flag ?
@@ -506,7 +506,7 @@ EXPORT_SYMBOL_GPL(ip_set_match_extensions); 
 * The set behind an index may change by swapping only, from userspace.

 */



static inline void

static void

__ip_set_get(struct ip_set *set)

{

	write_lock_bh(&ip_set_ref_lock);
@@ -514,7 +514,7 @@ __ip_set_get(struct ip_set *set) 
	write_unlock_bh(&ip_set_ref_lock);

}



static inline void

static void

__ip_set_put(struct ip_set *set)

{

	write_lock_bh(&ip_set_ref_lock);
@@ -526,7 +526,7 @@ __ip_set_put(struct ip_set *set) 
/* set->ref can be swapped out by ip_set_swap, netlink events (like dump) need

 * a separate reference counter

 */

static inline void

static void

__ip_set_put_netlink(struct ip_set *set)

{

	write_lock_bh(&ip_set_ref_lock);
@@ -541,7 +541,7 @@ __ip_set_put_netlink(struct ip_set *set) 
 * so it can't be destroyed (or changed) under our foot.

 */



static inline struct ip_set *

static struct ip_set *

ip_set_rcu_get(struct net *net, ip_set_id_t index)

{

	struct ip_set *set;
@@ -670,7 +670,7 @@ EXPORT_SYMBOL_GPL(ip_set_get_byname); 
 *

 */



static inline void

static void

__ip_set_put_byindex(struct ip_set_net *inst, ip_set_id_t index)

{

	struct ip_set *set;

CRA Git | Maintained and supported by SUSTech CRA and CCSE