Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5a63643e authored by Jesper Dangaard Brouer's avatar Jesper Dangaard Brouer Committed by David S. Miller
Browse files

Revert "net: fix percpu memory leaks" 



This reverts commit 1d6119ba.

After reverting commit 6d7b857d ("net: use lib/percpu_counter API
for fragmentation mem accounting") then here is no need for this
fix-up patch.  As percpu_counter is no longer used, it cannot
memory leak it any-longer.

Fixes: 6d7b857d ("net: use lib/percpu_counter API for fragmentation mem accounting")
Fixes: 1d6119ba ("net: fix percpu memory leaks")
Signed-off-by: default avatarJesper Dangaard Brouer <brouer@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fb452a1a

include/net/inet_frag.h

+1 −6
Original line number Diff line number Diff line
@@ -103,15 +103,10 @@ struct inet_frags { 
int inet_frags_init(struct inet_frags *);

void inet_frags_fini(struct inet_frags *);



static inline int inet_frags_init_net(struct netns_frags *nf)

static inline void inet_frags_init_net(struct netns_frags *nf)

{

	atomic_set(&nf->mem, 0);

	return 0;

}

static inline void inet_frags_uninit_net(struct netns_frags *nf)

{

}



void inet_frags_exit_net(struct netns_frags *nf, struct inet_frags *f);



void inet_frag_kill(struct inet_frag_queue *q, struct inet_frags *f);

net/ieee802154/6lowpan/reassembly.c

+3 −8
Original line number Diff line number Diff line
@@ -580,19 +580,14 @@ static int __net_init lowpan_frags_init_net(struct net *net) 
{

	struct netns_ieee802154_lowpan *ieee802154_lowpan =

		net_ieee802154_lowpan(net);

	int res;



	ieee802154_lowpan->frags.high_thresh = IPV6_FRAG_HIGH_THRESH;

	ieee802154_lowpan->frags.low_thresh = IPV6_FRAG_LOW_THRESH;

	ieee802154_lowpan->frags.timeout = IPV6_FRAG_TIMEOUT;



	res = inet_frags_init_net(&ieee802154_lowpan->frags);

	if (res)

		return res;

	res = lowpan_frags_ns_sysctl_register(net);

	if (res)

		inet_frags_uninit_net(&ieee802154_lowpan->frags);

	return res;

	inet_frags_init_net(&ieee802154_lowpan->frags);



	return lowpan_frags_ns_sysctl_register(net);

}



static void __net_exit lowpan_frags_exit_net(struct net *net)

net/ipv4/ip_fragment.c

+3 −9
Original line number Diff line number Diff line
@@ -844,8 +844,6 @@ static void __init ip4_frags_ctl_register(void) 


static int __net_init ipv4_frags_init_net(struct net *net)

{

	int res;



	/* Fragment cache limits.

	 *

	 * The fragment memory accounting code, (tries to) account for
@@ -871,13 +869,9 @@ static int __net_init ipv4_frags_init_net(struct net *net) 


	net->ipv4.frags.max_dist = 64;



	res = inet_frags_init_net(&net->ipv4.frags);

	if (res)

		return res;

	res = ip4_frags_ns_ctl_register(net);

	if (res)

		inet_frags_uninit_net(&net->ipv4.frags);

	return res;

	inet_frags_init_net(&net->ipv4.frags);



	return ip4_frags_ns_ctl_register(net);

}



static void __net_exit ipv4_frags_exit_net(struct net *net)

net/ipv6/netfilter/nf_conntrack_reasm.c

+3 −9
Original line number Diff line number Diff line
@@ -622,18 +622,12 @@ EXPORT_SYMBOL_GPL(nf_ct_frag6_gather); 


static int nf_ct_net_init(struct net *net)

{

	int res;



	net->nf_frag.frags.high_thresh = IPV6_FRAG_HIGH_THRESH;

	net->nf_frag.frags.low_thresh = IPV6_FRAG_LOW_THRESH;

	net->nf_frag.frags.timeout = IPV6_FRAG_TIMEOUT;

	res = inet_frags_init_net(&net->nf_frag.frags);

	if (res)

		return res;

	res = nf_ct_frag6_sysctl_register(net);

	if (res)

		inet_frags_uninit_net(&net->nf_frag.frags);

	return res;

	inet_frags_init_net(&net->nf_frag.frags);



	return nf_ct_frag6_sysctl_register(net);

}



static void nf_ct_net_exit(struct net *net)

net/ipv6/reassembly.c

+3 −9
Original line number Diff line number Diff line
@@ -714,19 +714,13 @@ static void ip6_frags_sysctl_unregister(void) 


static int __net_init ipv6_frags_init_net(struct net *net)

{

	int res;



	net->ipv6.frags.high_thresh = IPV6_FRAG_HIGH_THRESH;

	net->ipv6.frags.low_thresh = IPV6_FRAG_LOW_THRESH;

	net->ipv6.frags.timeout = IPV6_FRAG_TIMEOUT;



	res = inet_frags_init_net(&net->ipv6.frags);

	if (res)

		return res;

	res = ip6_frags_ns_sysctl_register(net);

	if (res)

		inet_frags_uninit_net(&net->ipv6.frags);

	return res;

	inet_frags_init_net(&net->ipv6.frags);



	return ip6_frags_ns_sysctl_register(net);

}



static void __net_exit ipv6_frags_exit_net(struct net *net)