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/ipv4/tcp_ipv4.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/ipv4/tcp_ipv4.c')
| -rw-r--r-- | net/ipv4/tcp_ipv4.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index fec8b1fd7b63..9639334ebb7c 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c @@ -2391,7 +2391,6 @@ static void __net_exit tcp4_proc_exit_net(struct net *net) static struct pernet_operations tcp4_net_ops = { .init = tcp4_proc_init_net, .exit = tcp4_proc_exit_net, - .async = true, }; int __init tcp4_proc_init(void) @@ -2578,7 +2577,6 @@ static struct pernet_operations __net_initdata tcp_sk_ops = { .init = tcp_sk_init, .exit = tcp_sk_exit, .exit_batch = tcp_sk_exit_batch, - .async = true, }; void __init tcp_v4_init(void) |