Commit c709002c authored by David S. Miller's avatar David S. Miller
Browse files

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: default avatarDavid S. Miller <davem@davemloft.net>
parents cdcfeb0f 8518e9bb

drivers/infiniband/core/cma.c

+0 −1
Original line number Diff line number Diff line
@@ -4554,7 +4554,6 @@ static struct pernet_operations cma_pernet_operations = { 
	.exit = cma_exit_net,

	.id = &cma_pernet_id,

	.size = sizeof(struct cma_pernet),

	.async = true,

};



static int __init cma_init(void)

drivers/net/bonding/bond_main.c

+0 −1
Original line number Diff line number Diff line
@@ -4791,7 +4791,6 @@ static struct pernet_operations bond_net_ops = { 
	.exit = bond_net_exit,

	.id   = &bond_net_id,

	.size = sizeof(struct bond_net),

	.async = true,

};



static int __init bonding_init(void)

drivers/net/geneve.c

+0 −1
Original line number Diff line number Diff line
@@ -1694,7 +1694,6 @@ static struct pernet_operations geneve_net_ops = { 
	.exit_batch = geneve_exit_batch_net,

	.id   = &geneve_net_id,

	.size = sizeof(struct geneve_net),

	.async = true,

};



static int __init geneve_init_module(void)

drivers/net/gtp.c

+0 −1
Original line number Diff line number Diff line
@@ -1325,7 +1325,6 @@ static struct pernet_operations gtp_net_ops = { 
	.exit	= gtp_net_exit,

	.id	= &gtp_net_id,

	.size	= sizeof(struct gtp_net),

	.async	= true,

};



static int __init gtp_init(void)

drivers/net/ipvlan/ipvlan_main.c

+0 −1
Original line number Diff line number Diff line
@@ -1040,7 +1040,6 @@ static struct pernet_operations ipvlan_net_ops = { 
	.id = &ipvlan_netid,

	.size = sizeof(struct ipvlan_netns),

	.exit = ipvlan_ns_exit,

	.async = true,

};



static int __init ipvlan_init_module(void)

CRA Git | Maintained and supported by SUSTech CRA and CCSE