aboutsummaryrefslogtreecommitdiffstats
path: root/net/core
diff options
context:
space:
mode:
authorKirill Tkhai <ktkhai@virtuozzo.com>2018-03-27 11:02:13 -0400
committerDavid S. Miller <davem@davemloft.net>2018-03-27 13:18:09 -0400
commit2f635ceeb22ba13c307236d69795fbb29cfa3e7c (patch)
treefe8b187d1530a7e434aecaf2d5a9565247f0263e /net/core
parent094374e5e173c6639eccf6a2af5e1357a0869848 (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/core')
-rw-r--r--net/core/dev.c2
-rw-r--r--net/core/fib_notifier.c1
-rw-r--r--net/core/fib_rules.c1
-rw-r--r--net/core/net-procfs.c2
-rw-r--r--net/core/net_namespace.c2
-rw-r--r--net/core/pktgen.c1
-rw-r--r--net/core/rtnetlink.c1
-rw-r--r--net/core/sock.c2
-rw-r--r--net/core/sock_diag.c1
-rw-r--r--net/core/sysctl_net_core.c1
10 files changed, 0 insertions, 14 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index 97a96df4b6da..e13807b5c84d 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -8883,7 +8883,6 @@ static void __net_exit netdev_exit(struct net *net)
8883static struct pernet_operations __net_initdata netdev_net_ops = { 8883static struct pernet_operations __net_initdata netdev_net_ops = {
8884 .init = netdev_init, 8884 .init = netdev_init,
8885 .exit = netdev_exit, 8885 .exit = netdev_exit,
8886 .async = true,
8887}; 8886};
8888 8887
8889static void __net_exit default_device_exit(struct net *net) 8888static void __net_exit default_device_exit(struct net *net)
@@ -8984,7 +8983,6 @@ static void __net_exit default_device_exit_batch(struct list_head *net_list)
8984static struct pernet_operations __net_initdata default_device_ops = { 8983static struct pernet_operations __net_initdata default_device_ops = {
8985 .exit = default_device_exit, 8984 .exit = default_device_exit,
8986 .exit_batch = default_device_exit_batch, 8985 .exit_batch = default_device_exit_batch,
8987 .async = true,
8988}; 8986};
8989 8987
8990/* 8988/*
diff --git a/net/core/fib_notifier.c b/net/core/fib_notifier.c
index 5ace0705a3f9..0c048bdeb016 100644
--- a/net/core/fib_notifier.c
+++ b/net/core/fib_notifier.c
@@ -171,7 +171,6 @@ static void __net_exit fib_notifier_net_exit(struct net *net)
171static struct pernet_operations fib_notifier_net_ops = { 171static struct pernet_operations fib_notifier_net_ops = {
172 .init = fib_notifier_net_init, 172 .init = fib_notifier_net_init,
173 .exit = fib_notifier_net_exit, 173 .exit = fib_notifier_net_exit,
174 .async = true,
175}; 174};
176 175
177static int __init fib_notifier_init(void) 176static int __init fib_notifier_init(void)
diff --git a/net/core/fib_rules.c b/net/core/fib_rules.c
index f6f04fc0f629..9d87ce868402 100644
--- a/net/core/fib_rules.c
+++ b/net/core/fib_rules.c
@@ -1130,7 +1130,6 @@ static void __net_exit fib_rules_net_exit(struct net *net)
1130static struct pernet_operations fib_rules_net_ops = { 1130static struct pernet_operations fib_rules_net_ops = {
1131 .init = fib_rules_net_init, 1131 .init = fib_rules_net_init,
1132 .exit = fib_rules_net_exit, 1132 .exit = fib_rules_net_exit,
1133 .async = true,
1134}; 1133};
1135 1134
1136static int __init fib_rules_init(void) 1135static int __init fib_rules_init(void)
diff --git a/net/core/net-procfs.c b/net/core/net-procfs.c
index dd6ae431d038..9737302907b1 100644
--- a/net/core/net-procfs.c
+++ b/net/core/net-procfs.c
@@ -349,7 +349,6 @@ static void __net_exit dev_proc_net_exit(struct net *net)
349static struct pernet_operations __net_initdata dev_proc_ops = { 349static struct pernet_operations __net_initdata dev_proc_ops = {
350 .init = dev_proc_net_init, 350 .init = dev_proc_net_init,
351 .exit = dev_proc_net_exit, 351 .exit = dev_proc_net_exit,
352 .async = true,
353}; 352};
354 353
355static int dev_mc_seq_show(struct seq_file *seq, void *v) 354static int dev_mc_seq_show(struct seq_file *seq, void *v)
@@ -406,7 +405,6 @@ static void __net_exit dev_mc_net_exit(struct net *net)
406static struct pernet_operations __net_initdata dev_mc_net_ops = { 405static struct pernet_operations __net_initdata dev_mc_net_ops = {
407 .init = dev_mc_net_init, 406 .init = dev_mc_net_init,
408 .exit = dev_mc_net_exit, 407 .exit = dev_mc_net_exit,
409 .async = true,
410}; 408};
411 409
412int __init dev_proc_init(void) 410int __init dev_proc_init(void)
diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c
index 0f614523a13f..eef17ad29dea 100644
--- a/net/core/net_namespace.c
+++ b/net/core/net_namespace.c
@@ -338,7 +338,6 @@ static int __net_init net_defaults_init_net(struct net *net)
338 338
339static struct pernet_operations net_defaults_ops = { 339static struct pernet_operations net_defaults_ops = {
340 .init = net_defaults_init_net, 340 .init = net_defaults_init_net,
341 .async = true,
342}; 341};
343 342
344static __init int net_defaults_init(void) 343static __init int net_defaults_init(void)
@@ -628,7 +627,6 @@ static __net_exit void net_ns_net_exit(struct net *net)
628static struct pernet_operations __net_initdata net_ns_ops = { 627static struct pernet_operations __net_initdata net_ns_ops = {
629 .init = net_ns_net_init, 628 .init = net_ns_net_init,
630 .exit = net_ns_net_exit, 629 .exit = net_ns_net_exit,
631 .async = true,
632}; 630};
633 631
634static const struct nla_policy rtnl_net_policy[NETNSA_MAX + 1] = { 632static const struct nla_policy rtnl_net_policy[NETNSA_MAX + 1] = {
diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index 545cf08cd558..7e4ede34cc52 100644
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -3852,7 +3852,6 @@ static struct pernet_operations pg_net_ops = {
3852 .exit = pg_net_exit, 3852 .exit = pg_net_exit,
3853 .id = &pg_net_id, 3853 .id = &pg_net_id,
3854 .size = sizeof(struct pktgen_net), 3854 .size = sizeof(struct pktgen_net),
3855 .async = true,
3856}; 3855};
3857 3856
3858static int __init pg_init(void) 3857static int __init pg_init(void)
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index 87079eaa871b..31438b63d4b4 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -4730,7 +4730,6 @@ static void __net_exit rtnetlink_net_exit(struct net *net)
4730static struct pernet_operations rtnetlink_net_ops = { 4730static struct pernet_operations rtnetlink_net_ops = {
4731 .init = rtnetlink_net_init, 4731 .init = rtnetlink_net_init,
4732 .exit = rtnetlink_net_exit, 4732 .exit = rtnetlink_net_exit,
4733 .async = true,
4734}; 4733};
4735 4734
4736void __init rtnetlink_init(void) 4735void __init rtnetlink_init(void)
diff --git a/net/core/sock.c b/net/core/sock.c
index 8cee2920a47f..6444525f610c 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -3175,7 +3175,6 @@ static void __net_exit sock_inuse_exit_net(struct net *net)
3175static struct pernet_operations net_inuse_ops = { 3175static struct pernet_operations net_inuse_ops = {
3176 .init = sock_inuse_init_net, 3176 .init = sock_inuse_init_net,
3177 .exit = sock_inuse_exit_net, 3177 .exit = sock_inuse_exit_net,
3178 .async = true,
3179}; 3178};
3180 3179
3181static __init int net_inuse_init(void) 3180static __init int net_inuse_init(void)
@@ -3470,7 +3469,6 @@ static __net_exit void proto_exit_net(struct net *net)
3470static __net_initdata struct pernet_operations proto_net_ops = { 3469static __net_initdata struct pernet_operations proto_net_ops = {
3471 .init = proto_init_net, 3470 .init = proto_init_net,
3472 .exit = proto_exit_net, 3471 .exit = proto_exit_net,
3473 .async = true,
3474}; 3472};
3475 3473
3476static int __init proto_init(void) 3474static int __init proto_init(void)
diff --git a/net/core/sock_diag.c b/net/core/sock_diag.c
index a3392a8f9276..c37b5be7c5e4 100644
--- a/net/core/sock_diag.c
+++ b/net/core/sock_diag.c
@@ -324,7 +324,6 @@ static void __net_exit diag_net_exit(struct net *net)
324static struct pernet_operations diag_net_ops = { 324static struct pernet_operations diag_net_ops = {
325 .init = diag_net_init, 325 .init = diag_net_init,
326 .exit = diag_net_exit, 326 .exit = diag_net_exit,
327 .async = true,
328}; 327};
329 328
330static int __init sock_diag_init(void) 329static int __init sock_diag_init(void)
diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c
index 4f47f92459cc..b3b609f0eeb5 100644
--- a/net/core/sysctl_net_core.c
+++ b/net/core/sysctl_net_core.c
@@ -584,7 +584,6 @@ static __net_exit void sysctl_core_net_exit(struct net *net)
584static __net_initdata struct pernet_operations sysctl_core_ops = { 584static __net_initdata struct pernet_operations sysctl_core_ops = {
585 .init = sysctl_core_net_init, 585 .init = sysctl_core_net_init,
586 .exit = sysctl_core_net_exit, 586 .exit = sysctl_core_net_exit,
587 .async = true,
588}; 587};
589 588
590static __init int sysctl_core_init(void) 589static __init int sysctl_core_init(void)