Commit cc35b396 authored by David S. Miller's avatar David S. Miller

Merge branch 'pernet_ops-conversions-part-2'

Kirill Tkhai says:

====================
Converting pernet_operations (part #2)

This patchset continues to review and to convert pernet_operations
to async. There are mostly ipv6, also some regular used netfilter
pernet_operations are involved. One more converted is cfg80211_pernet_ops.
====================
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 3021efb4 da349fad
...@@ -1911,6 +1911,7 @@ static void __net_exit ip_tables_net_exit(struct net *net) ...@@ -1911,6 +1911,7 @@ static void __net_exit ip_tables_net_exit(struct net *net)
static struct pernet_operations ip_tables_net_ops = { static struct pernet_operations ip_tables_net_ops = {
.init = ip_tables_net_init, .init = ip_tables_net_init,
.exit = ip_tables_net_exit, .exit = ip_tables_net_exit,
.async = true,
}; };
static int __init ip_tables_init(void) static int __init ip_tables_init(void)
......
...@@ -87,6 +87,7 @@ static void __net_exit iptable_filter_net_exit(struct net *net) ...@@ -87,6 +87,7 @@ static void __net_exit iptable_filter_net_exit(struct net *net)
static struct pernet_operations iptable_filter_net_ops = { static struct pernet_operations iptable_filter_net_ops = {
.init = iptable_filter_net_init, .init = iptable_filter_net_init,
.exit = iptable_filter_net_exit, .exit = iptable_filter_net_exit,
.async = true,
}; };
static int __init iptable_filter_init(void) static int __init iptable_filter_init(void)
......
...@@ -4257,6 +4257,7 @@ static void __net_exit if6_proc_net_exit(struct net *net) ...@@ -4257,6 +4257,7 @@ static void __net_exit if6_proc_net_exit(struct net *net)
static struct pernet_operations if6_proc_net_ops = { static struct pernet_operations if6_proc_net_ops = {
.init = if6_proc_net_init, .init = if6_proc_net_init,
.exit = if6_proc_net_exit, .exit = if6_proc_net_exit,
.async = true,
}; };
int __init if6_proc_init(void) int __init if6_proc_init(void)
......
...@@ -344,6 +344,7 @@ static void __net_exit ip6addrlbl_net_exit(struct net *net) ...@@ -344,6 +344,7 @@ static void __net_exit ip6addrlbl_net_exit(struct net *net)
static struct pernet_operations ipv6_addr_label_ops = { static struct pernet_operations ipv6_addr_label_ops = {
.init = ip6addrlbl_net_init, .init = ip6addrlbl_net_init,
.exit = ip6addrlbl_net_exit, .exit = ip6addrlbl_net_exit,
.async = true,
}; };
int __init ipv6_addr_label_init(void) int __init ipv6_addr_label_init(void)
......
...@@ -857,6 +857,7 @@ static void __net_exit inet6_net_exit(struct net *net) ...@@ -857,6 +857,7 @@ static void __net_exit inet6_net_exit(struct net *net)
static struct pernet_operations inet6_net_ops = { static struct pernet_operations inet6_net_ops = {
.init = inet6_net_init, .init = inet6_net_init,
.exit = inet6_net_exit, .exit = inet6_net_exit,
.async = true,
}; };
static const struct ipv6_stub ipv6_stub_impl = { static const struct ipv6_stub ipv6_stub_impl = {
......
...@@ -368,6 +368,7 @@ static void __net_exit fib6_rules_net_exit(struct net *net) ...@@ -368,6 +368,7 @@ static void __net_exit fib6_rules_net_exit(struct net *net)
static struct pernet_operations fib6_rules_net_ops = { static struct pernet_operations fib6_rules_net_ops = {
.init = fib6_rules_net_init, .init = fib6_rules_net_init,
.exit = fib6_rules_net_exit, .exit = fib6_rules_net_exit,
.async = true,
}; };
int __init fib6_rules_init(void) int __init fib6_rules_init(void)
......
...@@ -997,6 +997,7 @@ static void __net_exit icmpv6_sk_exit(struct net *net) ...@@ -997,6 +997,7 @@ static void __net_exit icmpv6_sk_exit(struct net *net)
static struct pernet_operations icmpv6_sk_ops = { static struct pernet_operations icmpv6_sk_ops = {
.init = icmpv6_sk_init, .init = icmpv6_sk_init,
.exit = icmpv6_sk_exit, .exit = icmpv6_sk_exit,
.async = true,
}; };
int __init icmpv6_init(void) int __init icmpv6_init(void)
......
...@@ -2160,6 +2160,7 @@ static void fib6_net_exit(struct net *net) ...@@ -2160,6 +2160,7 @@ static void fib6_net_exit(struct net *net)
static struct pernet_operations fib6_net_ops = { static struct pernet_operations fib6_net_ops = {
.init = fib6_net_init, .init = fib6_net_init,
.exit = fib6_net_exit, .exit = fib6_net_exit,
.async = true,
}; };
int __init fib6_init(void) int __init fib6_init(void)
......
...@@ -873,6 +873,7 @@ static void __net_exit ip6_flowlabel_net_exit(struct net *net) ...@@ -873,6 +873,7 @@ static void __net_exit ip6_flowlabel_net_exit(struct net *net)
static struct pernet_operations ip6_flowlabel_net_ops = { static struct pernet_operations ip6_flowlabel_net_ops = {
.init = ip6_flowlabel_proc_init, .init = ip6_flowlabel_proc_init,
.exit = ip6_flowlabel_net_exit, .exit = ip6_flowlabel_net_exit,
.async = true,
}; };
int ip6_flowlabel_init(void) int ip6_flowlabel_init(void)
......
...@@ -1397,6 +1397,7 @@ static void __net_exit ip6mr_net_exit(struct net *net) ...@@ -1397,6 +1397,7 @@ static void __net_exit ip6mr_net_exit(struct net *net)
static struct pernet_operations ip6mr_net_ops = { static struct pernet_operations ip6mr_net_ops = {
.init = ip6mr_net_init, .init = ip6mr_net_init,
.exit = ip6mr_net_exit, .exit = ip6mr_net_exit,
.async = true,
}; };
int __init ip6_mr_init(void) int __init ip6_mr_init(void)
......
...@@ -2997,6 +2997,7 @@ static void __net_exit igmp6_net_exit(struct net *net) ...@@ -2997,6 +2997,7 @@ static void __net_exit igmp6_net_exit(struct net *net)
static struct pernet_operations igmp6_net_ops = { static struct pernet_operations igmp6_net_ops = {
.init = igmp6_net_init, .init = igmp6_net_init,
.exit = igmp6_net_exit, .exit = igmp6_net_exit,
.async = true,
}; };
int __init igmp6_init(void) int __init igmp6_init(void)
......
...@@ -1882,6 +1882,7 @@ static void __net_exit ndisc_net_exit(struct net *net) ...@@ -1882,6 +1882,7 @@ static void __net_exit ndisc_net_exit(struct net *net)
static struct pernet_operations ndisc_net_ops = { static struct pernet_operations ndisc_net_ops = {
.init = ndisc_net_init, .init = ndisc_net_init,
.exit = ndisc_net_exit, .exit = ndisc_net_exit,
.async = true,
}; };
int __init ndisc_init(void) int __init ndisc_init(void)
......
...@@ -240,6 +240,7 @@ static void __net_init ping_v6_proc_exit_net(struct net *net) ...@@ -240,6 +240,7 @@ static void __net_init ping_v6_proc_exit_net(struct net *net)
static struct pernet_operations ping_v6_net_ops = { static struct pernet_operations ping_v6_net_ops = {
.init = ping_v6_proc_init_net, .init = ping_v6_proc_init_net,
.exit = ping_v6_proc_exit_net, .exit = ping_v6_proc_exit_net,
.async = true,
}; };
#endif #endif
......
...@@ -343,6 +343,7 @@ static void __net_exit ipv6_proc_exit_net(struct net *net) ...@@ -343,6 +343,7 @@ static void __net_exit ipv6_proc_exit_net(struct net *net)
static struct pernet_operations ipv6_proc_ops = { static struct pernet_operations ipv6_proc_ops = {
.init = ipv6_proc_init_net, .init = ipv6_proc_init_net,
.exit = ipv6_proc_exit_net, .exit = ipv6_proc_exit_net,
.async = true,
}; };
int __init ipv6_misc_proc_init(void) int __init ipv6_misc_proc_init(void)
......
...@@ -1332,6 +1332,7 @@ static void __net_exit raw6_exit_net(struct net *net) ...@@ -1332,6 +1332,7 @@ static void __net_exit raw6_exit_net(struct net *net)
static struct pernet_operations raw6_net_ops = { static struct pernet_operations raw6_net_ops = {
.init = raw6_init_net, .init = raw6_init_net,
.exit = raw6_exit_net, .exit = raw6_exit_net,
.async = true,
}; };
int __init raw6_proc_init(void) int __init raw6_proc_init(void)
......
...@@ -733,6 +733,7 @@ static void __net_exit ipv6_frags_exit_net(struct net *net) ...@@ -733,6 +733,7 @@ static void __net_exit ipv6_frags_exit_net(struct net *net)
static struct pernet_operations ip6_frags_ops = { static struct pernet_operations ip6_frags_ops = {
.init = ipv6_frags_init_net, .init = ipv6_frags_init_net,
.exit = ipv6_frags_exit_net, .exit = ipv6_frags_exit_net,
.async = true,
}; };
int __init ipv6_frag_init(void) int __init ipv6_frag_init(void)
......
...@@ -4972,6 +4972,7 @@ static void __net_exit ip6_route_net_exit_late(struct net *net) ...@@ -4972,6 +4972,7 @@ static void __net_exit ip6_route_net_exit_late(struct net *net)
static struct pernet_operations ip6_route_net_ops = { static struct pernet_operations ip6_route_net_ops = {
.init = ip6_route_net_init, .init = ip6_route_net_init,
.exit = ip6_route_net_exit, .exit = ip6_route_net_exit,
.async = true,
}; };
static int __net_init ipv6_inetpeer_init(struct net *net) static int __net_init ipv6_inetpeer_init(struct net *net)
...@@ -4997,11 +4998,13 @@ static void __net_exit ipv6_inetpeer_exit(struct net *net) ...@@ -4997,11 +4998,13 @@ static void __net_exit ipv6_inetpeer_exit(struct net *net)
static struct pernet_operations ipv6_inetpeer_ops = { static struct pernet_operations ipv6_inetpeer_ops = {
.init = ipv6_inetpeer_init, .init = ipv6_inetpeer_init,
.exit = ipv6_inetpeer_exit, .exit = ipv6_inetpeer_exit,
.async = true,
}; };
static struct pernet_operations ip6_route_net_late_ops = { static struct pernet_operations ip6_route_net_late_ops = {
.init = ip6_route_net_init_late, .init = ip6_route_net_init_late,
.exit = ip6_route_net_exit_late, .exit = ip6_route_net_exit_late,
.async = true,
}; };
static struct notifier_block ip6_route_dev_notifier = { static struct notifier_block ip6_route_dev_notifier = {
......
...@@ -395,6 +395,7 @@ static void __net_exit seg6_net_exit(struct net *net) ...@@ -395,6 +395,7 @@ static void __net_exit seg6_net_exit(struct net *net)
static struct pernet_operations ip6_segments_ops = { static struct pernet_operations ip6_segments_ops = {
.init = seg6_net_init, .init = seg6_net_init,
.exit = seg6_net_exit, .exit = seg6_net_exit,
.async = true,
}; };
static const struct genl_ops seg6_genl_ops[] = { static const struct genl_ops seg6_genl_ops[] = {
......
...@@ -251,6 +251,7 @@ static void __net_exit ipv6_sysctl_net_exit(struct net *net) ...@@ -251,6 +251,7 @@ static void __net_exit ipv6_sysctl_net_exit(struct net *net)
static struct pernet_operations ipv6_sysctl_net_ops = { static struct pernet_operations ipv6_sysctl_net_ops = {
.init = ipv6_sysctl_net_init, .init = ipv6_sysctl_net_init,
.exit = ipv6_sysctl_net_exit, .exit = ipv6_sysctl_net_exit,
.async = true,
}; };
static struct ctl_table_header *ip6_header; static struct ctl_table_header *ip6_header;
......
...@@ -2007,6 +2007,7 @@ static struct pernet_operations tcpv6_net_ops = { ...@@ -2007,6 +2007,7 @@ static struct pernet_operations tcpv6_net_ops = {
.init = tcpv6_net_init, .init = tcpv6_net_init,
.exit = tcpv6_net_exit, .exit = tcpv6_net_exit,
.exit_batch = tcpv6_net_exit_batch, .exit_batch = tcpv6_net_exit_batch,
.async = true,
}; };
int __init tcpv6_init(void) int __init tcpv6_init(void)
......
...@@ -123,6 +123,7 @@ static void __net_exit udplite6_proc_exit_net(struct net *net) ...@@ -123,6 +123,7 @@ static void __net_exit udplite6_proc_exit_net(struct net *net)
static struct pernet_operations udplite6_net_ops = { static struct pernet_operations udplite6_net_ops = {
.init = udplite6_proc_init_net, .init = udplite6_proc_init_net,
.exit = udplite6_proc_exit_net, .exit = udplite6_proc_exit_net,
.async = true,
}; };
int __init udplite6_proc_init(void) int __init udplite6_proc_init(void)
......
...@@ -395,6 +395,7 @@ static void __net_exit xfrm6_net_exit(struct net *net) ...@@ -395,6 +395,7 @@ static void __net_exit xfrm6_net_exit(struct net *net)
static struct pernet_operations xfrm6_net_ops = { static struct pernet_operations xfrm6_net_ops = {
.init = xfrm6_net_init, .init = xfrm6_net_init,
.exit = xfrm6_net_exit, .exit = xfrm6_net_exit,
.async = true,
}; };
int __init xfrm6_init(void) int __init xfrm6_init(void)
......
...@@ -1765,6 +1765,7 @@ static void __net_exit xt_net_exit(struct net *net) ...@@ -1765,6 +1765,7 @@ static void __net_exit xt_net_exit(struct net *net)
static struct pernet_operations xt_net_ops = { static struct pernet_operations xt_net_ops = {
.init = xt_net_init, .init = xt_net_init,
.exit = xt_net_exit, .exit = xt_net_exit,
.async = true,
}; };
static int __init xt_init(void) static int __init xt_init(void)
......
...@@ -1340,6 +1340,7 @@ static void __net_exit cfg80211_pernet_exit(struct net *net) ...@@ -1340,6 +1340,7 @@ static void __net_exit cfg80211_pernet_exit(struct net *net)
static struct pernet_operations cfg80211_pernet_ops = { static struct pernet_operations cfg80211_pernet_ops = {
.exit = cfg80211_pernet_exit, .exit = cfg80211_pernet_exit,
.async = true,
}; };
static int __init cfg80211_init(void) static int __init cfg80211_init(void)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment