netfilter: nf_conntrack: remove unnecessary RTNL locking
Locking the rtnl was added to nf_conntrack_l{3,4}_proto_unregister() for walking the network namespace list. This is not done anymore since we have proper namespace support in the protocols now, so we don't need to take the RTNL anymore. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
Родитель
fe31d1a860
Коммит
2834a6386b
|
@ -21,7 +21,6 @@
|
|||
#include <linux/notifier.h>
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/netdevice.h>
|
||||
#include <linux/rtnetlink.h>
|
||||
|
||||
#include <net/netfilter/nf_conntrack.h>
|
||||
#include <net/netfilter/nf_conntrack_l3proto.h>
|
||||
|
@ -294,9 +293,7 @@ void nf_conntrack_l3proto_unregister(struct net *net,
|
|||
nf_ct_l3proto_unregister_sysctl(net, proto);
|
||||
|
||||
/* Remove all contrack entries for this protocol */
|
||||
rtnl_lock();
|
||||
nf_ct_iterate_cleanup(net, kill_l3proto, proto);
|
||||
rtnl_unlock();
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(nf_conntrack_l3proto_unregister);
|
||||
|
||||
|
@ -502,9 +499,7 @@ void nf_conntrack_l4proto_unregister(struct net *net,
|
|||
nf_ct_l4proto_unregister_sysctl(net, pn, l4proto);
|
||||
|
||||
/* Remove all contrack entries for this protocol */
|
||||
rtnl_lock();
|
||||
nf_ct_iterate_cleanup(net, kill_l4proto, l4proto);
|
||||
rtnl_unlock();
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(nf_conntrack_l4proto_unregister);
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче