diff options
author | Kirill Tkhai <ktkhai@virtuozzo.com> | 2018-03-27 11:02:13 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-03-27 13:18:09 -0400 |
commit | 2f635ceeb22ba13c307236d69795fbb29cfa3e7c (patch) | |
tree | fe8b187d1530a7e434aecaf2d5a9565247f0263e /net/ipv6 | |
parent | 094374e5e173c6639eccf6a2af5e1357a0869848 (diff) |
net: Drop pernet_operations::async
Synchronous pernet_operations are not allowed anymore.
All are asynchronous. So, drop the structure member.
Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
36 files changed, 0 insertions, 39 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index 189eac80f4ef..78cef00c9596 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c | |||
@@ -4282,7 +4282,6 @@ static void __net_exit if6_proc_net_exit(struct net *net) | |||
4282 | static struct pernet_operations if6_proc_net_ops = { | 4282 | static struct pernet_operations if6_proc_net_ops = { |
4283 | .init = if6_proc_net_init, | 4283 | .init = if6_proc_net_init, |
4284 | .exit = if6_proc_net_exit, | 4284 | .exit = if6_proc_net_exit, |
4285 | .async = true, | ||
4286 | }; | 4285 | }; |
4287 | 4286 | ||
4288 | int __init if6_proc_init(void) | 4287 | int __init if6_proc_init(void) |
@@ -6592,7 +6591,6 @@ static void __net_exit addrconf_exit_net(struct net *net) | |||
6592 | static struct pernet_operations addrconf_ops = { | 6591 | static struct pernet_operations addrconf_ops = { |
6593 | .init = addrconf_init_net, | 6592 | .init = addrconf_init_net, |
6594 | .exit = addrconf_exit_net, | 6593 | .exit = addrconf_exit_net, |
6595 | .async = true, | ||
6596 | }; | 6594 | }; |
6597 | 6595 | ||
6598 | static struct rtnl_af_ops inet6_ops __read_mostly = { | 6596 | static struct rtnl_af_ops inet6_ops __read_mostly = { |
diff --git a/net/ipv6/addrlabel.c b/net/ipv6/addrlabel.c index ba2e63633370..1d6ced37ad71 100644 --- a/net/ipv6/addrlabel.c +++ b/net/ipv6/addrlabel.c | |||
@@ -344,7 +344,6 @@ static void __net_exit ip6addrlbl_net_exit(struct net *net) | |||
344 | static struct pernet_operations ipv6_addr_label_ops = { | 344 | static struct pernet_operations ipv6_addr_label_ops = { |
345 | .init = ip6addrlbl_net_init, | 345 | .init = ip6addrlbl_net_init, |
346 | .exit = ip6addrlbl_net_exit, | 346 | .exit = ip6addrlbl_net_exit, |
347 | .async = true, | ||
348 | }; | 347 | }; |
349 | 348 | ||
350 | int __init ipv6_addr_label_init(void) | 349 | int __init ipv6_addr_label_init(void) |
diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c index dbbe04018813..c1e292db04db 100644 --- a/net/ipv6/af_inet6.c +++ b/net/ipv6/af_inet6.c | |||
@@ -857,7 +857,6 @@ static void __net_exit inet6_net_exit(struct net *net) | |||
857 | static struct pernet_operations inet6_net_ops = { | 857 | static struct pernet_operations inet6_net_ops = { |
858 | .init = inet6_net_init, | 858 | .init = inet6_net_init, |
859 | .exit = inet6_net_exit, | 859 | .exit = inet6_net_exit, |
860 | .async = true, | ||
861 | }; | 860 | }; |
862 | 861 | ||
863 | static const struct ipv6_stub ipv6_stub_impl = { | 862 | static const struct ipv6_stub ipv6_stub_impl = { |
diff --git a/net/ipv6/fib6_rules.c b/net/ipv6/fib6_rules.c index 00ef9467f3c0..df113c7b5fc8 100644 --- a/net/ipv6/fib6_rules.c +++ b/net/ipv6/fib6_rules.c | |||
@@ -397,7 +397,6 @@ static void __net_exit fib6_rules_net_exit(struct net *net) | |||
397 | static struct pernet_operations fib6_rules_net_ops = { | 397 | static struct pernet_operations fib6_rules_net_ops = { |
398 | .init = fib6_rules_net_init, | 398 | .init = fib6_rules_net_init, |
399 | .exit = fib6_rules_net_exit, | 399 | .exit = fib6_rules_net_exit, |
400 | .async = true, | ||
401 | }; | 400 | }; |
402 | 401 | ||
403 | int __init fib6_rules_init(void) | 402 | int __init fib6_rules_init(void) |
diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c index 6f84668be6ea..d8c4b6374377 100644 --- a/net/ipv6/icmp.c +++ b/net/ipv6/icmp.c | |||
@@ -998,7 +998,6 @@ static void __net_exit icmpv6_sk_exit(struct net *net) | |||
998 | static struct pernet_operations icmpv6_sk_ops = { | 998 | static struct pernet_operations icmpv6_sk_ops = { |
999 | .init = icmpv6_sk_init, | 999 | .init = icmpv6_sk_init, |
1000 | .exit = icmpv6_sk_exit, | 1000 | .exit = icmpv6_sk_exit, |
1001 | .async = true, | ||
1002 | }; | 1001 | }; |
1003 | 1002 | ||
1004 | int __init icmpv6_init(void) | 1003 | int __init icmpv6_init(void) |
diff --git a/net/ipv6/ila/ila_xlat.c b/net/ipv6/ila/ila_xlat.c index e438699f000f..44c39c5f0638 100644 --- a/net/ipv6/ila/ila_xlat.c +++ b/net/ipv6/ila/ila_xlat.c | |||
@@ -613,7 +613,6 @@ static struct pernet_operations ila_net_ops = { | |||
613 | .exit = ila_exit_net, | 613 | .exit = ila_exit_net, |
614 | .id = &ila_net_id, | 614 | .id = &ila_net_id, |
615 | .size = sizeof(struct ila_net), | 615 | .size = sizeof(struct ila_net), |
616 | .async = true, | ||
617 | }; | 616 | }; |
618 | 617 | ||
619 | static int ila_xlat_addr(struct sk_buff *skb, bool sir2ila) | 618 | static int ila_xlat_addr(struct sk_buff *skb, bool sir2ila) |
diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c index 2f995e9e3050..908b8e5b615a 100644 --- a/net/ipv6/ip6_fib.c +++ b/net/ipv6/ip6_fib.c | |||
@@ -2161,7 +2161,6 @@ static void fib6_net_exit(struct net *net) | |||
2161 | static struct pernet_operations fib6_net_ops = { | 2161 | static struct pernet_operations fib6_net_ops = { |
2162 | .init = fib6_net_init, | 2162 | .init = fib6_net_init, |
2163 | .exit = fib6_net_exit, | 2163 | .exit = fib6_net_exit, |
2164 | .async = true, | ||
2165 | }; | 2164 | }; |
2166 | 2165 | ||
2167 | int __init fib6_init(void) | 2166 | int __init fib6_init(void) |
diff --git a/net/ipv6/ip6_flowlabel.c b/net/ipv6/ip6_flowlabel.c index f75b06ba8325..c05c4e82a7ca 100644 --- a/net/ipv6/ip6_flowlabel.c +++ b/net/ipv6/ip6_flowlabel.c | |||
@@ -873,7 +873,6 @@ static void __net_exit ip6_flowlabel_net_exit(struct net *net) | |||
873 | static struct pernet_operations ip6_flowlabel_net_ops = { | 873 | static struct pernet_operations ip6_flowlabel_net_ops = { |
874 | .init = ip6_flowlabel_proc_init, | 874 | .init = ip6_flowlabel_proc_init, |
875 | .exit = ip6_flowlabel_net_exit, | 875 | .exit = ip6_flowlabel_net_exit, |
876 | .async = true, | ||
877 | }; | 876 | }; |
878 | 877 | ||
879 | int ip6_flowlabel_init(void) | 878 | int ip6_flowlabel_init(void) |
diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c index 3a98c694da5f..22e86557aca4 100644 --- a/net/ipv6/ip6_gre.c +++ b/net/ipv6/ip6_gre.c | |||
@@ -1528,7 +1528,6 @@ static struct pernet_operations ip6gre_net_ops = { | |||
1528 | .exit_batch = ip6gre_exit_batch_net, | 1528 | .exit_batch = ip6gre_exit_batch_net, |
1529 | .id = &ip6gre_net_id, | 1529 | .id = &ip6gre_net_id, |
1530 | .size = sizeof(struct ip6gre_net), | 1530 | .size = sizeof(struct ip6gre_net), |
1531 | .async = true, | ||
1532 | }; | 1531 | }; |
1533 | 1532 | ||
1534 | static int ip6gre_tunnel_validate(struct nlattr *tb[], struct nlattr *data[], | 1533 | static int ip6gre_tunnel_validate(struct nlattr *tb[], struct nlattr *data[], |
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c index 456fcf942f95..df4c29f7d59f 100644 --- a/net/ipv6/ip6_tunnel.c +++ b/net/ipv6/ip6_tunnel.c | |||
@@ -2260,7 +2260,6 @@ static struct pernet_operations ip6_tnl_net_ops = { | |||
2260 | .exit_batch = ip6_tnl_exit_batch_net, | 2260 | .exit_batch = ip6_tnl_exit_batch_net, |
2261 | .id = &ip6_tnl_net_id, | 2261 | .id = &ip6_tnl_net_id, |
2262 | .size = sizeof(struct ip6_tnl_net), | 2262 | .size = sizeof(struct ip6_tnl_net), |
2263 | .async = true, | ||
2264 | }; | 2263 | }; |
2265 | 2264 | ||
2266 | /** | 2265 | /** |
diff --git a/net/ipv6/ip6_vti.c b/net/ipv6/ip6_vti.c index a482b854eeea..60b771f49fb5 100644 --- a/net/ipv6/ip6_vti.c +++ b/net/ipv6/ip6_vti.c | |||
@@ -1148,7 +1148,6 @@ static struct pernet_operations vti6_net_ops = { | |||
1148 | .exit_batch = vti6_exit_batch_net, | 1148 | .exit_batch = vti6_exit_batch_net, |
1149 | .id = &vti6_net_id, | 1149 | .id = &vti6_net_id, |
1150 | .size = sizeof(struct vti6_net), | 1150 | .size = sizeof(struct vti6_net), |
1151 | .async = true, | ||
1152 | }; | 1151 | }; |
1153 | 1152 | ||
1154 | static struct xfrm6_protocol vti_esp6_protocol __read_mostly = { | 1153 | static struct xfrm6_protocol vti_esp6_protocol __read_mostly = { |
diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c index 1c8fa29d155a..298fd8b6ed17 100644 --- a/net/ipv6/ip6mr.c +++ b/net/ipv6/ip6mr.c | |||
@@ -1348,7 +1348,6 @@ static void __net_exit ip6mr_net_exit(struct net *net) | |||
1348 | static struct pernet_operations ip6mr_net_ops = { | 1348 | static struct pernet_operations ip6mr_net_ops = { |
1349 | .init = ip6mr_net_init, | 1349 | .init = ip6mr_net_init, |
1350 | .exit = ip6mr_net_exit, | 1350 | .exit = ip6mr_net_exit, |
1351 | .async = true, | ||
1352 | }; | 1351 | }; |
1353 | 1352 | ||
1354 | int __init ip6_mr_init(void) | 1353 | int __init ip6_mr_init(void) |
diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c index 1e4c2b6ebd78..793159d77d8a 100644 --- a/net/ipv6/mcast.c +++ b/net/ipv6/mcast.c | |||
@@ -2997,7 +2997,6 @@ static void __net_exit igmp6_net_exit(struct net *net) | |||
2997 | static struct pernet_operations igmp6_net_ops = { | 2997 | static struct pernet_operations igmp6_net_ops = { |
2998 | .init = igmp6_net_init, | 2998 | .init = igmp6_net_init, |
2999 | .exit = igmp6_net_exit, | 2999 | .exit = igmp6_net_exit, |
3000 | .async = true, | ||
3001 | }; | 3000 | }; |
3002 | 3001 | ||
3003 | int __init igmp6_init(void) | 3002 | int __init igmp6_init(void) |
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c index d1d0b2fa7a07..9de4dfb126ba 100644 --- a/net/ipv6/ndisc.c +++ b/net/ipv6/ndisc.c | |||
@@ -1883,7 +1883,6 @@ static void __net_exit ndisc_net_exit(struct net *net) | |||
1883 | static struct pernet_operations ndisc_net_ops = { | 1883 | static struct pernet_operations ndisc_net_ops = { |
1884 | .init = ndisc_net_init, | 1884 | .init = ndisc_net_init, |
1885 | .exit = ndisc_net_exit, | 1885 | .exit = ndisc_net_exit, |
1886 | .async = true, | ||
1887 | }; | 1886 | }; |
1888 | 1887 | ||
1889 | int __init ndisc_init(void) | 1888 | int __init ndisc_init(void) |
diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c index 4de8ac1e5af4..62358b93bbac 100644 --- a/net/ipv6/netfilter/ip6_tables.c +++ b/net/ipv6/netfilter/ip6_tables.c | |||
@@ -1928,7 +1928,6 @@ static void __net_exit ip6_tables_net_exit(struct net *net) | |||
1928 | static struct pernet_operations ip6_tables_net_ops = { | 1928 | static struct pernet_operations ip6_tables_net_ops = { |
1929 | .init = ip6_tables_net_init, | 1929 | .init = ip6_tables_net_init, |
1930 | .exit = ip6_tables_net_exit, | 1930 | .exit = ip6_tables_net_exit, |
1931 | .async = true, | ||
1932 | }; | 1931 | }; |
1933 | 1932 | ||
1934 | static int __init ip6_tables_init(void) | 1933 | static int __init ip6_tables_init(void) |
diff --git a/net/ipv6/netfilter/ip6table_filter.c b/net/ipv6/netfilter/ip6table_filter.c index 06561c84c0bc..1343077dde93 100644 --- a/net/ipv6/netfilter/ip6table_filter.c +++ b/net/ipv6/netfilter/ip6table_filter.c | |||
@@ -87,7 +87,6 @@ static void __net_exit ip6table_filter_net_exit(struct net *net) | |||
87 | static struct pernet_operations ip6table_filter_net_ops = { | 87 | static struct pernet_operations ip6table_filter_net_ops = { |
88 | .init = ip6table_filter_net_init, | 88 | .init = ip6table_filter_net_init, |
89 | .exit = ip6table_filter_net_exit, | 89 | .exit = ip6table_filter_net_exit, |
90 | .async = true, | ||
91 | }; | 90 | }; |
92 | 91 | ||
93 | static int __init ip6table_filter_init(void) | 92 | static int __init ip6table_filter_init(void) |
diff --git a/net/ipv6/netfilter/ip6table_mangle.c b/net/ipv6/netfilter/ip6table_mangle.c index a11e25936b45..b0524b18c4fb 100644 --- a/net/ipv6/netfilter/ip6table_mangle.c +++ b/net/ipv6/netfilter/ip6table_mangle.c | |||
@@ -107,7 +107,6 @@ static void __net_exit ip6table_mangle_net_exit(struct net *net) | |||
107 | 107 | ||
108 | static struct pernet_operations ip6table_mangle_net_ops = { | 108 | static struct pernet_operations ip6table_mangle_net_ops = { |
109 | .exit = ip6table_mangle_net_exit, | 109 | .exit = ip6table_mangle_net_exit, |
110 | .async = true, | ||
111 | }; | 110 | }; |
112 | 111 | ||
113 | static int __init ip6table_mangle_init(void) | 112 | static int __init ip6table_mangle_init(void) |
diff --git a/net/ipv6/netfilter/ip6table_nat.c b/net/ipv6/netfilter/ip6table_nat.c index 4475fd300bb6..47306e45a80a 100644 --- a/net/ipv6/netfilter/ip6table_nat.c +++ b/net/ipv6/netfilter/ip6table_nat.c | |||
@@ -131,7 +131,6 @@ static void __net_exit ip6table_nat_net_exit(struct net *net) | |||
131 | 131 | ||
132 | static struct pernet_operations ip6table_nat_net_ops = { | 132 | static struct pernet_operations ip6table_nat_net_ops = { |
133 | .exit = ip6table_nat_net_exit, | 133 | .exit = ip6table_nat_net_exit, |
134 | .async = true, | ||
135 | }; | 134 | }; |
136 | 135 | ||
137 | static int __init ip6table_nat_init(void) | 136 | static int __init ip6table_nat_init(void) |
diff --git a/net/ipv6/netfilter/ip6table_raw.c b/net/ipv6/netfilter/ip6table_raw.c index a88f3b1995b1..710fa0806c37 100644 --- a/net/ipv6/netfilter/ip6table_raw.c +++ b/net/ipv6/netfilter/ip6table_raw.c | |||
@@ -75,7 +75,6 @@ static void __net_exit ip6table_raw_net_exit(struct net *net) | |||
75 | 75 | ||
76 | static struct pernet_operations ip6table_raw_net_ops = { | 76 | static struct pernet_operations ip6table_raw_net_ops = { |
77 | .exit = ip6table_raw_net_exit, | 77 | .exit = ip6table_raw_net_exit, |
78 | .async = true, | ||
79 | }; | 78 | }; |
80 | 79 | ||
81 | static int __init ip6table_raw_init(void) | 80 | static int __init ip6table_raw_init(void) |
diff --git a/net/ipv6/netfilter/ip6table_security.c b/net/ipv6/netfilter/ip6table_security.c index 320048c008dc..cf26ccb04056 100644 --- a/net/ipv6/netfilter/ip6table_security.c +++ b/net/ipv6/netfilter/ip6table_security.c | |||
@@ -74,7 +74,6 @@ static void __net_exit ip6table_security_net_exit(struct net *net) | |||
74 | 74 | ||
75 | static struct pernet_operations ip6table_security_net_ops = { | 75 | static struct pernet_operations ip6table_security_net_ops = { |
76 | .exit = ip6table_security_net_exit, | 76 | .exit = ip6table_security_net_exit, |
77 | .async = true, | ||
78 | }; | 77 | }; |
79 | 78 | ||
80 | static int __init ip6table_security_init(void) | 79 | static int __init ip6table_security_init(void) |
diff --git a/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c b/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c index ba54bb3bd1e4..663827ee3cf8 100644 --- a/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c +++ b/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | |||
@@ -401,7 +401,6 @@ static struct pernet_operations ipv6_net_ops = { | |||
401 | .exit = ipv6_net_exit, | 401 | .exit = ipv6_net_exit, |
402 | .id = &conntrack6_net_id, | 402 | .id = &conntrack6_net_id, |
403 | .size = sizeof(struct conntrack6_net), | 403 | .size = sizeof(struct conntrack6_net), |
404 | .async = true, | ||
405 | }; | 404 | }; |
406 | 405 | ||
407 | static int __init nf_conntrack_l3proto_ipv6_init(void) | 406 | static int __init nf_conntrack_l3proto_ipv6_init(void) |
diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c index 34136fe80ed5..b84ce3e6d728 100644 --- a/net/ipv6/netfilter/nf_conntrack_reasm.c +++ b/net/ipv6/netfilter/nf_conntrack_reasm.c | |||
@@ -646,7 +646,6 @@ static void nf_ct_net_exit(struct net *net) | |||
646 | static struct pernet_operations nf_ct_net_ops = { | 646 | static struct pernet_operations nf_ct_net_ops = { |
647 | .init = nf_ct_net_init, | 647 | .init = nf_ct_net_init, |
648 | .exit = nf_ct_net_exit, | 648 | .exit = nf_ct_net_exit, |
649 | .async = true, | ||
650 | }; | 649 | }; |
651 | 650 | ||
652 | int nf_ct_frag6_init(void) | 651 | int nf_ct_frag6_init(void) |
diff --git a/net/ipv6/netfilter/nf_defrag_ipv6_hooks.c b/net/ipv6/netfilter/nf_defrag_ipv6_hooks.c index 32f98bc06900..c87b48359e8f 100644 --- a/net/ipv6/netfilter/nf_defrag_ipv6_hooks.c +++ b/net/ipv6/netfilter/nf_defrag_ipv6_hooks.c | |||
@@ -103,7 +103,6 @@ static void __net_exit defrag6_net_exit(struct net *net) | |||
103 | 103 | ||
104 | static struct pernet_operations defrag6_net_ops = { | 104 | static struct pernet_operations defrag6_net_ops = { |
105 | .exit = defrag6_net_exit, | 105 | .exit = defrag6_net_exit, |
106 | .async = true, | ||
107 | }; | 106 | }; |
108 | 107 | ||
109 | static int __init nf_defrag_init(void) | 108 | static int __init nf_defrag_init(void) |
diff --git a/net/ipv6/netfilter/nf_log_ipv6.c b/net/ipv6/netfilter/nf_log_ipv6.c index 0220e584589c..b397a8fe88b9 100644 --- a/net/ipv6/netfilter/nf_log_ipv6.c +++ b/net/ipv6/netfilter/nf_log_ipv6.c | |||
@@ -390,7 +390,6 @@ static void __net_exit nf_log_ipv6_net_exit(struct net *net) | |||
390 | static struct pernet_operations nf_log_ipv6_net_ops = { | 390 | static struct pernet_operations nf_log_ipv6_net_ops = { |
391 | .init = nf_log_ipv6_net_init, | 391 | .init = nf_log_ipv6_net_init, |
392 | .exit = nf_log_ipv6_net_exit, | 392 | .exit = nf_log_ipv6_net_exit, |
393 | .async = true, | ||
394 | }; | 393 | }; |
395 | 394 | ||
396 | static int __init nf_log_ipv6_init(void) | 395 | static int __init nf_log_ipv6_init(void) |
diff --git a/net/ipv6/ping.c b/net/ipv6/ping.c index 318c6e914234..d12c55dad7d1 100644 --- a/net/ipv6/ping.c +++ b/net/ipv6/ping.c | |||
@@ -240,7 +240,6 @@ static void __net_init ping_v6_proc_exit_net(struct net *net) | |||
240 | static struct pernet_operations ping_v6_net_ops = { | 240 | static struct pernet_operations ping_v6_net_ops = { |
241 | .init = ping_v6_proc_init_net, | 241 | .init = ping_v6_proc_init_net, |
242 | .exit = ping_v6_proc_exit_net, | 242 | .exit = ping_v6_proc_exit_net, |
243 | .async = true, | ||
244 | }; | 243 | }; |
245 | #endif | 244 | #endif |
246 | 245 | ||
diff --git a/net/ipv6/proc.c b/net/ipv6/proc.c index f9891fa672f3..6e57028d2e91 100644 --- a/net/ipv6/proc.c +++ b/net/ipv6/proc.c | |||
@@ -343,7 +343,6 @@ static void __net_exit ipv6_proc_exit_net(struct net *net) | |||
343 | static struct pernet_operations ipv6_proc_ops = { | 343 | static struct pernet_operations ipv6_proc_ops = { |
344 | .init = ipv6_proc_init_net, | 344 | .init = ipv6_proc_init_net, |
345 | .exit = ipv6_proc_exit_net, | 345 | .exit = ipv6_proc_exit_net, |
346 | .async = true, | ||
347 | }; | 346 | }; |
348 | 347 | ||
349 | int __init ipv6_misc_proc_init(void) | 348 | int __init ipv6_misc_proc_init(void) |
diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c index b5e5de732494..5eb9b08947ed 100644 --- a/net/ipv6/raw.c +++ b/net/ipv6/raw.c | |||
@@ -1332,7 +1332,6 @@ static void __net_exit raw6_exit_net(struct net *net) | |||
1332 | static struct pernet_operations raw6_net_ops = { | 1332 | static struct pernet_operations raw6_net_ops = { |
1333 | .init = raw6_init_net, | 1333 | .init = raw6_init_net, |
1334 | .exit = raw6_exit_net, | 1334 | .exit = raw6_exit_net, |
1335 | .async = true, | ||
1336 | }; | 1335 | }; |
1337 | 1336 | ||
1338 | int __init raw6_proc_init(void) | 1337 | int __init raw6_proc_init(void) |
diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c index b5da69c83123..afbc000ad4f2 100644 --- a/net/ipv6/reassembly.c +++ b/net/ipv6/reassembly.c | |||
@@ -733,7 +733,6 @@ static void __net_exit ipv6_frags_exit_net(struct net *net) | |||
733 | static struct pernet_operations ip6_frags_ops = { | 733 | static struct pernet_operations ip6_frags_ops = { |
734 | .init = ipv6_frags_init_net, | 734 | .init = ipv6_frags_init_net, |
735 | .exit = ipv6_frags_exit_net, | 735 | .exit = ipv6_frags_exit_net, |
736 | .async = true, | ||
737 | }; | 736 | }; |
738 | 737 | ||
739 | int __init ipv6_frag_init(void) | 738 | int __init ipv6_frag_init(void) |
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index 1d0eaa69874d..ba8d5df50ebe 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c | |||
@@ -5083,7 +5083,6 @@ static void __net_exit ip6_route_net_exit_late(struct net *net) | |||
5083 | static struct pernet_operations ip6_route_net_ops = { | 5083 | static struct pernet_operations ip6_route_net_ops = { |
5084 | .init = ip6_route_net_init, | 5084 | .init = ip6_route_net_init, |
5085 | .exit = ip6_route_net_exit, | 5085 | .exit = ip6_route_net_exit, |
5086 | .async = true, | ||
5087 | }; | 5086 | }; |
5088 | 5087 | ||
5089 | static int __net_init ipv6_inetpeer_init(struct net *net) | 5088 | static int __net_init ipv6_inetpeer_init(struct net *net) |
@@ -5109,13 +5108,11 @@ static void __net_exit ipv6_inetpeer_exit(struct net *net) | |||
5109 | static struct pernet_operations ipv6_inetpeer_ops = { | 5108 | static struct pernet_operations ipv6_inetpeer_ops = { |
5110 | .init = ipv6_inetpeer_init, | 5109 | .init = ipv6_inetpeer_init, |
5111 | .exit = ipv6_inetpeer_exit, | 5110 | .exit = ipv6_inetpeer_exit, |
5112 | .async = true, | ||
5113 | }; | 5111 | }; |
5114 | 5112 | ||
5115 | static struct pernet_operations ip6_route_net_late_ops = { | 5113 | static struct pernet_operations ip6_route_net_late_ops = { |
5116 | .init = ip6_route_net_init_late, | 5114 | .init = ip6_route_net_init_late, |
5117 | .exit = ip6_route_net_exit_late, | 5115 | .exit = ip6_route_net_exit_late, |
5118 | .async = true, | ||
5119 | }; | 5116 | }; |
5120 | 5117 | ||
5121 | static struct notifier_block ip6_route_dev_notifier = { | 5118 | static struct notifier_block ip6_route_dev_notifier = { |
diff --git a/net/ipv6/seg6.c b/net/ipv6/seg6.c index c3f13c3bd8a9..7f5621d09571 100644 --- a/net/ipv6/seg6.c +++ b/net/ipv6/seg6.c | |||
@@ -395,7 +395,6 @@ static void __net_exit seg6_net_exit(struct net *net) | |||
395 | static struct pernet_operations ip6_segments_ops = { | 395 | static struct pernet_operations ip6_segments_ops = { |
396 | .init = seg6_net_init, | 396 | .init = seg6_net_init, |
397 | .exit = seg6_net_exit, | 397 | .exit = seg6_net_exit, |
398 | .async = true, | ||
399 | }; | 398 | }; |
400 | 399 | ||
401 | static const struct genl_ops seg6_genl_ops[] = { | 400 | static const struct genl_ops seg6_genl_ops[] = { |
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c index 8a4f8fddd812..1522bcfd253f 100644 --- a/net/ipv6/sit.c +++ b/net/ipv6/sit.c | |||
@@ -1888,7 +1888,6 @@ static struct pernet_operations sit_net_ops = { | |||
1888 | .exit_batch = sit_exit_batch_net, | 1888 | .exit_batch = sit_exit_batch_net, |
1889 | .id = &sit_net_id, | 1889 | .id = &sit_net_id, |
1890 | .size = sizeof(struct sit_net), | 1890 | .size = sizeof(struct sit_net), |
1891 | .async = true, | ||
1892 | }; | 1891 | }; |
1893 | 1892 | ||
1894 | static void __exit sit_cleanup(void) | 1893 | static void __exit sit_cleanup(void) |
diff --git a/net/ipv6/sysctl_net_ipv6.c b/net/ipv6/sysctl_net_ipv6.c index 966c42af92f4..6fbdef630152 100644 --- a/net/ipv6/sysctl_net_ipv6.c +++ b/net/ipv6/sysctl_net_ipv6.c | |||
@@ -278,7 +278,6 @@ static void __net_exit ipv6_sysctl_net_exit(struct net *net) | |||
278 | static struct pernet_operations ipv6_sysctl_net_ops = { | 278 | static struct pernet_operations ipv6_sysctl_net_ops = { |
279 | .init = ipv6_sysctl_net_init, | 279 | .init = ipv6_sysctl_net_init, |
280 | .exit = ipv6_sysctl_net_exit, | 280 | .exit = ipv6_sysctl_net_exit, |
281 | .async = true, | ||
282 | }; | 281 | }; |
283 | 282 | ||
284 | static struct ctl_table_header *ip6_header; | 283 | static struct ctl_table_header *ip6_header; |
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index 5425d7b100ee..883df0ad5bfe 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c | |||
@@ -2007,7 +2007,6 @@ static struct pernet_operations tcpv6_net_ops = { | |||
2007 | .init = tcpv6_net_init, | 2007 | .init = tcpv6_net_init, |
2008 | .exit = tcpv6_net_exit, | 2008 | .exit = tcpv6_net_exit, |
2009 | .exit_batch = tcpv6_net_exit_batch, | 2009 | .exit_batch = tcpv6_net_exit_batch, |
2010 | .async = true, | ||
2011 | }; | 2010 | }; |
2012 | 2011 | ||
2013 | int __init tcpv6_init(void) | 2012 | int __init tcpv6_init(void) |
diff --git a/net/ipv6/udplite.c b/net/ipv6/udplite.c index f3839780dc31..14ae32bb1f3d 100644 --- a/net/ipv6/udplite.c +++ b/net/ipv6/udplite.c | |||
@@ -123,7 +123,6 @@ static void __net_exit udplite6_proc_exit_net(struct net *net) | |||
123 | static struct pernet_operations udplite6_net_ops = { | 123 | static struct pernet_operations udplite6_net_ops = { |
124 | .init = udplite6_proc_init_net, | 124 | .init = udplite6_proc_init_net, |
125 | .exit = udplite6_proc_exit_net, | 125 | .exit = udplite6_proc_exit_net, |
126 | .async = true, | ||
127 | }; | 126 | }; |
128 | 127 | ||
129 | int __init udplite6_proc_init(void) | 128 | int __init udplite6_proc_init(void) |
diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c index cbb270bd81b0..416fe67271a9 100644 --- a/net/ipv6/xfrm6_policy.c +++ b/net/ipv6/xfrm6_policy.c | |||
@@ -400,7 +400,6 @@ static void __net_exit xfrm6_net_exit(struct net *net) | |||
400 | static struct pernet_operations xfrm6_net_ops = { | 400 | static struct pernet_operations xfrm6_net_ops = { |
401 | .init = xfrm6_net_init, | 401 | .init = xfrm6_net_init, |
402 | .exit = xfrm6_net_exit, | 402 | .exit = xfrm6_net_exit, |
403 | .async = true, | ||
404 | }; | 403 | }; |
405 | 404 | ||
406 | int __init xfrm6_init(void) | 405 | int __init xfrm6_init(void) |
diff --git a/net/ipv6/xfrm6_tunnel.c b/net/ipv6/xfrm6_tunnel.c index a9673619e0e9..f85f0d7480ac 100644 --- a/net/ipv6/xfrm6_tunnel.c +++ b/net/ipv6/xfrm6_tunnel.c | |||
@@ -353,7 +353,6 @@ static struct pernet_operations xfrm6_tunnel_net_ops = { | |||
353 | .exit = xfrm6_tunnel_net_exit, | 353 | .exit = xfrm6_tunnel_net_exit, |
354 | .id = &xfrm6_tunnel_net_id, | 354 | .id = &xfrm6_tunnel_net_id, |
355 | .size = sizeof(struct xfrm6_tunnel_net), | 355 | .size = sizeof(struct xfrm6_tunnel_net), |
356 | .async = true, | ||
357 | }; | 356 | }; |
358 | 357 | ||
359 | static int __init xfrm6_tunnel_init(void) | 358 | static int __init xfrm6_tunnel_init(void) |