diff options
| author |   Kirill Tkhai <ktkhai@virtuozzo.com> | 2018-03-29 19:21:20 +0300 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-03-29 13:47:54 -0400 |
| commit | 152f253152cc08f5d26ba76659723d2d83b363f8 (patch) | |
| tree | 9bd5736d380f7c2f6f653671b52a5b206b158192 /net/netfilter/nf_conntrack_core.c | |
| parent | ovs: Remove rtnl_lock() from ovs_exit_net() (diff) | |
| download | linux-dev-152f253152cc08f5d26ba76659723d2d83b363f8.tar.xz linux-dev-152f253152cc08f5d26ba76659723d2d83b363f8.zip | |
net: Remove rtnl_lock() in nf_ct_iterate_destroy()
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 <ktkhai@virtuozzo.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netfilter/nf_conntrack_core.c')
| -rw-r--r-- | net/netfilter/nf_conntrack_core.c | 2 |
1 files changed, 0 insertions, 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 |