提交 74b8da70 编写于 作者: D David S. Miller

Merge branch 'pernet-convert-part6'

Kirill Tkhai says:

====================
Converting pernet_operations (part #6)

this series continues to review and to convert pernet_operations
to make them possible to be executed in parallel for several
net namespaces in the same time. There are sctp, tipc and rds
in this series.
====================
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
...@@ -515,6 +515,7 @@ static struct pernet_operations rds_tcp_net_ops = { ...@@ -515,6 +515,7 @@ static struct pernet_operations rds_tcp_net_ops = {
.exit = rds_tcp_exit_net, .exit = rds_tcp_exit_net,
.id = &rds_tcp_netid, .id = &rds_tcp_netid,
.size = sizeof(struct rds_tcp_net), .size = sizeof(struct rds_tcp_net),
.async = true,
}; };
static void rds_tcp_kill_sock(struct net *net) static void rds_tcp_kill_sock(struct net *net)
......
...@@ -1330,6 +1330,7 @@ static void __net_exit sctp_defaults_exit(struct net *net) ...@@ -1330,6 +1330,7 @@ static void __net_exit sctp_defaults_exit(struct net *net)
static struct pernet_operations sctp_defaults_ops = { static struct pernet_operations sctp_defaults_ops = {
.init = sctp_defaults_init, .init = sctp_defaults_init,
.exit = sctp_defaults_exit, .exit = sctp_defaults_exit,
.async = true,
}; };
static int __net_init sctp_ctrlsock_init(struct net *net) static int __net_init sctp_ctrlsock_init(struct net *net)
...@@ -1353,6 +1354,7 @@ static void __net_init sctp_ctrlsock_exit(struct net *net) ...@@ -1353,6 +1354,7 @@ static void __net_init sctp_ctrlsock_exit(struct net *net)
static struct pernet_operations sctp_ctrlsock_ops = { static struct pernet_operations sctp_ctrlsock_ops = {
.init = sctp_ctrlsock_init, .init = sctp_ctrlsock_init,
.exit = sctp_ctrlsock_exit, .exit = sctp_ctrlsock_exit,
.async = true,
}; };
/* Initialize the universe into something sensible. */ /* Initialize the universe into something sensible. */
......
...@@ -105,6 +105,7 @@ static struct pernet_operations tipc_net_ops = { ...@@ -105,6 +105,7 @@ static struct pernet_operations tipc_net_ops = {
.exit = tipc_exit_net, .exit = tipc_exit_net,
.id = &tipc_net_id, .id = &tipc_net_id,
.size = sizeof(struct tipc_net), .size = sizeof(struct tipc_net),
.async = true,
}; };
static int __init tipc_init(void) static int __init tipc_init(void)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册