diff options
author | David S. Miller <davem@davemloft.net> | 2018-03-27 13:18:10 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-03-27 13:18:10 -0400 |
commit | c709002c23f91d90eb6ee2d4efbb548a8fe3cc80 (patch) | |
tree | dc2887c1b2089055ad7c2d13df0ea20b3a27969b /net/ipv6/route.c | |
parent | cdcfeb0fb473e34e012b9a78b5cb377a6ad1434d (diff) | |
parent | 8518e9bb98b602eca0717d5aaad63ccbe56539d2 (diff) | |
download | linux-c709002c23f91d90eb6ee2d4efbb548a8fe3cc80.tar.gz linux-c709002c23f91d90eb6ee2d4efbb548a8fe3cc80.tar.bz2 linux-c709002c23f91d90eb6ee2d4efbb548a8fe3cc80.zip |
Merge branch 'pernet-all-async'
Kirill Tkhai says:
====================
Make pernet_operations always read locked
All the pernet_operations are converted, and the last one
is in this patchset (nfsd_net_ops acked by J. Bruce Fields).
So, it's the time to kill pernet_operations::async field,
and make setup_net() and cleanup_net() always require
the rwsem only read locked.
All further pernet_operations have to be developed to fit
this rule. Some of previous patches added a comment to
struct pernet_operations about that.
Also, this patchset renames net_sem to pernet_ops_rwsem
to make the target area of the rwsem is more clear visible,
and adds more comments.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/route.c')
-rw-r--r-- | net/ipv6/route.c | 3 |
1 files changed, 0 insertions, 3 deletions
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) static struct pernet_operations ip6_route_net_ops = { .init = ip6_route_net_init, .exit = ip6_route_net_exit, - .async = true, }; static int __net_init ipv6_inetpeer_init(struct net *net) @@ -5109,13 +5108,11 @@ static void __net_exit ipv6_inetpeer_exit(struct net *net) static struct pernet_operations ipv6_inetpeer_ops = { .init = ipv6_inetpeer_init, .exit = ipv6_inetpeer_exit, - .async = true, }; static struct pernet_operations ip6_route_net_late_ops = { .init = ip6_route_net_init_late, .exit = ip6_route_net_exit_late, - .async = true, }; static struct notifier_block ip6_route_dev_notifier = { |