mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-07-23 07:12:09 +00:00
Revert "net: fix percpu memory leaks"
This reverts commit1d6119baf0
. After reverting commit6d7b857d54
("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:6d7b857d54
("net: use lib/percpu_counter API for fragmentation mem accounting") Fixes:1d6119baf0
("net: fix percpu memory leaks") Signed-off-by: Jesper Dangaard Brouer <brouer@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
fb452a1aa3
commit
5a63643e58
5 changed files with 13 additions and 41 deletions
|
@ -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)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue