path: root/net/ipv4/ip_fragment.c
diff options
authorJesper Dangaard Brouer <brouer@redhat.com>2017-09-01 11:26:13 +0200
committerDavid S. Miller <davem@davemloft.net>2017-09-03 11:01:05 -0700
commit5a63643e583b6a9789d7a225ae076fb4e603991c (patch)
treedf2e5f6fbb0792262701818650a9d6f35f6b5151 /net/ipv4/ip_fragment.c
parentRevert "net: use lib/percpu_counter API for fragmentation mem accounting" (diff)
Revert "net: fix percpu memory leaks"
This reverts commit 1d6119baf0610f813eb9d9580eb4fd16de5b4ceb. After reverting commit 6d7b857d541e ("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: 6d7b857d541e ("net: use lib/percpu_counter API for fragmentation mem accounting") Fixes: 1d6119baf061 ("net: fix percpu memory leaks") Signed-off-by: Jesper Dangaard Brouer <brouer@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
1 files changed, 3 insertions, 9 deletions
diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
index 9a8cfac503dc..46408c220d9d 100644
--- a/net/ipv4/ip_fragment.c
+++ b/net/ipv4/ip_fragment.c
@@ -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)