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

Merge branch 'pernet-convert-part8' 



Kirill Tkhai says:

====================
Converting pernet_operations (part #8)

this series continues to review and to convert pernet_operations
to make them possible to be executed in parallel for several
net namespaces at the same time. There are different operations
over the tree, mostly are ipvs.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 53794570 6c77e795

net/l2tp/l2tp_core.c

+1 −0
Original line number Diff line number Diff line
@@ -1787,6 +1787,7 @@ static struct pernet_operations l2tp_net_ops = { 
	.exit = l2tp_exit_net,

	.id   = &l2tp_net_id,

	.size = sizeof(struct l2tp_net),

	.async = true,

};



static int __init l2tp_init(void)

net/mpls/af_mpls.c

+1 −0
Original line number Diff line number Diff line
@@ -2488,6 +2488,7 @@ static void mpls_net_exit(struct net *net) 
static struct pernet_operations mpls_net_ops = {

	.init = mpls_net_init,

	.exit = mpls_net_exit,

	.async = true,

};



static struct rtnl_af_ops mpls_af_ops __read_mostly = {

net/netfilter/ipvs/ip_vs_core.c

+2 −0
Original line number Diff line number Diff line
@@ -2289,10 +2289,12 @@ static struct pernet_operations ipvs_core_ops = { 
	.exit = __ip_vs_cleanup,

	.id   = &ip_vs_net_id,

	.size = sizeof(struct netns_ipvs),

	.async = true,

};



static struct pernet_operations ipvs_core_dev_ops = {

	.exit = __ip_vs_dev_cleanup,

	.async = true,

};



/*

net/netfilter/ipvs/ip_vs_ftp.c

+1 −0
Original line number Diff line number Diff line
@@ -479,6 +479,7 @@ static void __ip_vs_ftp_exit(struct net *net) 
static struct pernet_operations ip_vs_ftp_ops = {

	.init = __ip_vs_ftp_init,

	.exit = __ip_vs_ftp_exit,

	.async = true,

};



static int __init ip_vs_ftp_init(void)

net/openvswitch/datapath.c

+1 −0
Original line number Diff line number Diff line
@@ -2384,6 +2384,7 @@ static struct pernet_operations ovs_net_ops = { 
	.exit = ovs_exit_net,

	.id   = &ovs_net_id,

	.size = sizeof(struct ovs_net),

	.async = true,

};



static int __init dp_init(void)

CRA Git | Maintained and supported by SUSTech CRA and CCSE