Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-17 09:31:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

ipvs: Pass ipvs not net into ip_vs_control_net_(init|cleanup)

Browse Source 
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:26 -05:00 committed by Simon Horman
parent 8b8237a581
commit 3d99376689
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

@ -1324,7 +1324,7 @@ ip_vs_control_add(struct ip_vs_conn *cp, struct ip_vs_conn *ctl_cp)
/* IPVS netns init & cleanup functions */ /* IPVS netns init & cleanup functions */
int ip_vs_estimator_net_init(struct net *net); int ip_vs_estimator_net_init(struct net *net);
int ip_vs_control_net_init(struct net *net); int ip_vs_control_net_init(struct netns_ipvs *ipvs);
int ip_vs_protocol_net_init(struct net *net); int ip_vs_protocol_net_init(struct net *net);
int ip_vs_app_net_init(struct net *net); int ip_vs_app_net_init(struct net *net);
int ip_vs_conn_net_init(struct net *net); int ip_vs_conn_net_init(struct net *net);
@ -1332,7 +1332,7 @@ 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 net *net);
void ip_vs_app_net_cleanup(struct net *net); void ip_vs_app_net_cleanup(struct net *net);
void ip_vs_protocol_net_cleanup(struct net *net); void ip_vs_protocol_net_cleanup(struct net *net);
void ip_vs_control_net_cleanup(struct net *net); void ip_vs_control_net_cleanup(struct netns_ipvs *ipvs);
void ip_vs_estimator_net_cleanup(struct net *net); void ip_vs_estimator_net_cleanup(struct net *net);
void ip_vs_sync_net_cleanup(struct netns_ipvs *ipvs); void ip_vs_sync_net_cleanup(struct netns_ipvs *ipvs);
void ip_vs_service_net_cleanup(struct netns_ipvs *ipvs); void ip_vs_service_net_cleanup(struct netns_ipvs *ipvs);

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

@ -2075,7 +2075,7 @@ static int __net_init __ip_vs_init(struct net *net)
if (ip_vs_estimator_net_init(net) < 0) if (ip_vs_estimator_net_init(net) < 0)
goto estimator_fail; goto estimator_fail;
if (ip_vs_control_net_init(net) < 0) if (ip_vs_control_net_init(ipvs) < 0)
goto control_fail; goto control_fail;
if (ip_vs_protocol_net_init(net) < 0) if (ip_vs_protocol_net_init(net) < 0)
@ -2104,7 +2104,7 @@ conn_fail:
app_fail: app_fail:
ip_vs_protocol_net_cleanup(net); ip_vs_protocol_net_cleanup(net);
protocol_fail: protocol_fail:
ip_vs_control_net_cleanup(net); ip_vs_control_net_cleanup(ipvs);
control_fail: control_fail:
ip_vs_estimator_net_cleanup(net); ip_vs_estimator_net_cleanup(net);
estimator_fail: estimator_fail:
@ -2120,7 +2120,7 @@ static void __net_exit __ip_vs_cleanup(struct net *net)
ip_vs_conn_net_cleanup(net); ip_vs_conn_net_cleanup(net);
ip_vs_app_net_cleanup(net); ip_vs_app_net_cleanup(net);
ip_vs_protocol_net_cleanup(net); ip_vs_protocol_net_cleanup(net);
ip_vs_control_net_cleanup(net); ip_vs_control_net_cleanup(ipvs);
ip_vs_estimator_net_cleanup(net); ip_vs_estimator_net_cleanup(net);
IP_VS_DBG(2, "ipvs netns %d released\n", ipvs->gen); IP_VS_DBG(2, "ipvs netns %d released\n", ipvs->gen);
net->ipvs = NULL; net->ipvs = NULL;

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

@ -3950,10 +3950,10 @@ static struct notifier_block ip_vs_dst_notifier = {
.notifier_call = ip_vs_dst_event, .notifier_call = ip_vs_dst_event,
}; };
int __net_init ip_vs_control_net_init(struct net *net) int __net_init ip_vs_control_net_init(struct netns_ipvs *ipvs)
{ {
struct net *net = ipvs->net;
int i, idx; int i, idx;
struct netns_ipvs *ipvs = net_ipvs(net);
/* Initialize rs_table */ /* Initialize rs_table */
for (idx = 0; idx < IP_VS_RTAB_SIZE; idx++) for (idx = 0; idx < IP_VS_RTAB_SIZE; idx++)
@ -3994,9 +3994,9 @@ err:
return -ENOMEM; return -ENOMEM;
} }
void __net_exit ip_vs_control_net_cleanup(struct net *net) void __net_exit ip_vs_control_net_cleanup(struct netns_ipvs *ipvs)
{ {
struct netns_ipvs *ipvs = net_ipvs(net); struct net *net = ipvs->net;
ip_vs_trash_cleanup(ipvs); ip_vs_trash_cleanup(ipvs);
ip_vs_control_net_cleanup_sysctl(ipvs); ip_vs_control_net_cleanup_sysctl(ipvs);