diff options
| author | Jesper Dangaard Brouer <brouer@redhat.com> | 2017-09-01 11:26:13 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-09-03 20:01:05 +0200 |
| commit | 5a63643e583b6a9789d7a225ae076fb4e603991c (patch) | |
| tree | df2e5f6fbb0792262701818650a9d6f35f6b5151 /include/net | |
| parent | Revert "net: use lib/percpu_counter API for fragmentation mem accounting" (diff) | |
| download | linux-5a63643e583b6a9789d7a225ae076fb4e603991c.tar.xz linux-5a63643e583b6a9789d7a225ae076fb4e603991c.zip | |
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 'include/net')
| -rw-r--r-- | include/net/inet_frag.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/include/net/inet_frag.h b/include/net/inet_frag.h index fa635aa6d0b9..fc59e0775e00 100644 --- a/include/net/inet_frag.h +++ b/include/net/inet_frag.h @@ -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); |