[PATCH net-next 5/5] net: Remove rtnl_lock() in nf_ct_iterate_destroy()
DORMANTno replies
From: Kirill Tkhai <hidden>
Date: 2018-03-29 16:21:20
Also in:
linux-rdma, netfilter-devel
Subsystem:
netfilter, networking [general], the rest · Maintainers:
Pablo Neira Ayuso, Florian Westphal, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
Possibly related (same subject, not in this thread)
- 2018-03-29 · [PATCH net-next 5/5] net: Remove rtnl_lock() in nf_ct_iterate_destroy() · Kirill Tkhai <hidden>
- 2018-03-29 · [PATCH net-next 5/5] net: Remove rtnl_lock() in nf_ct_iterate_destroy() · Kirill Tkhai <hidden>
rtnl_lock() doesn't protect net::ct::count, and it's not needed for__nf_ct_unconfirmed_destroy() and for nf_queue_nf_hook_drop(). Signed-off-by: Kirill Tkhai <redacted> --- net/netfilter/nf_conntrack_core.c | 2 -- 1 file changed, 2 deletions(-)
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
index 370f9b7f051b..41ff04ee2554 100644
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c@@ -1763,7 +1763,6 @@ nf_ct_iterate_destroy(int (*iter)(struct nf_conn *i, void *data), void *data) { struct net *net; - rtnl_lock(); down_read(&net_rwsem); for_each_net(net) { if (atomic_read(&net->ct.count) == 0)
@@ -1772,7 +1771,6 @@ nf_ct_iterate_destroy(int (*iter)(struct nf_conn *i, void *data), void *data) nf_queue_nf_hook_drop(net); } up_read(&net_rwsem); - rtnl_unlock(); /* Need to wait for netns cleanup worker to finish, if its * running -- it might have deleted a net namespace from