UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ipvs: Pass ipvs not net into ip_vs_conn_net_init and ip_vs_conn_net_cleanup 

Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>
This commit is contained in:
Eric W. Biederman 2015-09-21 13:02:42 -05:00 committed by Simon Horman
parent d889717aaf
commit 2f3edc6a5b
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/net/ip_vs.h
View File

@ -1331,9 +1331,9 @@ int ip_vs_estimator_net_init(struct netns_ipvs *ipvs);
int ip_vs_control_net_init(struct netns_ipvs *ipvs);
int ip_vs_protocol_net_init(struct net *net);
int ip_vs_app_net_init(struct netns_ipvs *ipvs);
int ip_vs_conn_net_init(struct net *net);
int ip_vs_conn_net_init(struct netns_ipvs *ipvs);
int ip_vs_sync_net_init(struct netns_ipvs *ipvs);
void ip_vs_conn_net_cleanup(struct net *net);
void ip_vs_conn_net_cleanup(struct netns_ipvs *ipvs);
void ip_vs_app_net_cleanup(struct netns_ipvs *ipvs);
void ip_vs_protocol_net_cleanup(struct net *net);
void ip_vs_control_net_cleanup(struct netns_ipvs *ipvs);

8
net/netfilter/ipvs/ip_vs_conn.c
View File

@ -1345,9 +1345,9 @@ flush_again:
/*
* per netns init and exit
*/
int __net_init ip_vs_conn_net_init(struct net *net)
int __net_init ip_vs_conn_net_init(struct netns_ipvs *ipvs)
{
struct netns_ipvs *ipvs = net_ipvs(net);
struct net *net = ipvs->net;
atomic_set(&ipvs->conn_count, 0);
@ -1356,9 +1356,9 @@ int __net_init ip_vs_conn_net_init(struct net *net)
return 0;
}
void __net_exit ip_vs_conn_net_cleanup(struct net *net)
void __net_exit ip_vs_conn_net_cleanup(struct netns_ipvs *ipvs)
{
struct netns_ipvs *ipvs = net_ipvs(net);
struct net *net = ipvs->net;
/* flush all the connection entries first */
ip_vs_conn_flush(ipvs);

6
net/netfilter/ipvs/ip_vs_core.c
View File

@ -2086,7 +2086,7 @@ static int __net_init __ip_vs_init(struct net *net)
if (ip_vs_app_net_init(ipvs) < 0)
goto app_fail;
if (ip_vs_conn_net_init(net) < 0)
if (ip_vs_conn_net_init(ipvs) < 0)
goto conn_fail;
if (ip_vs_sync_net_init(ipvs) < 0)
@ -2100,7 +2100,7 @@ static int __net_init __ip_vs_init(struct net *net)
*/
sync_fail:
ip_vs_conn_net_cleanup(net);
ip_vs_conn_net_cleanup(ipvs);
conn_fail:
ip_vs_app_net_cleanup(ipvs);
app_fail:
@ -2119,7 +2119,7 @@ static void __net_exit __ip_vs_cleanup(struct net *net)
struct netns_ipvs *ipvs = net_ipvs(net);
ip_vs_service_net_cleanup(ipvs); /* ip_vs_flush() with locks */
ip_vs_conn_net_cleanup(net);
ip_vs_conn_net_cleanup(ipvs);
ip_vs_app_net_cleanup(ipvs);
ip_vs_protocol_net_cleanup(net);
ip_vs_control_net_cleanup(ipvs);