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/core/sock.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/core/sock.c')
| -rw-r--r-- | net/core/sock.c | 2 |
1 files changed, 0 insertions, 2 deletions
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) static struct pernet_operations net_inuse_ops = { .init = sock_inuse_init_net, .exit = sock_inuse_exit_net, - .async = true, }; static __init int net_inuse_init(void) @@ -3470,7 +3469,6 @@ static __net_exit void proto_exit_net(struct net *net) static __net_initdata struct pernet_operations proto_net_ops = { .init = proto_init_net, .exit = proto_exit_net, - .async = true, }; static int __init proto_init(void) |