evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ipvs: Pass ipvs not net to ip_vs_service_net_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:01:58 -05:00 • committed by Simon Horman
parent ef7c599d91
commit 56d2169b77
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/net/ip_vs.h
View file

@ -1335,7 +1335,7 @@ 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 net *net);
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 net *net); void ip_vs_sync_net_cleanup(struct net *net);
void ip_vs_service_net_cleanup(struct net *net); void ip_vs_service_net_cleanup(struct netns_ipvs *ipvs);
/* IPVS application functions /* IPVS application functions
* (from ip_vs_app.c) * (from ip_vs_app.c)

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

@ -2110,13 +2110,15 @@ estimator_fail:
static void __net_exit __ip_vs_cleanup(struct net *net) static void __net_exit __ip_vs_cleanup(struct net *net)
{ {
ip_vs_service_net_cleanup(net); /* ip_vs_flush() with locks */ 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(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(net);
ip_vs_estimator_net_cleanup(net); ip_vs_estimator_net_cleanup(net);
IP_VS_DBG(2, "ipvs netns %d released\n", net_ipvs(net)->gen); IP_VS_DBG(2, "ipvs netns %d released\n", ipvs->gen);
net->ipvs = NULL; net->ipvs = NULL;
} }

3
net/netfilter/ipvs/ip_vs_ctl.c
View file

@ -1484,9 +1484,8 @@ static int ip_vs_flush(struct netns_ipvs *ipvs, bool cleanup)
* Delete service by {netns} in the service table. * Delete service by {netns} in the service table.
* Called by __ip_vs_cleanup() * Called by __ip_vs_cleanup()
*/ */
void ip_vs_service_net_cleanup(struct net *net) void ip_vs_service_net_cleanup(struct netns_ipvs *ipvs)
{ {
struct netns_ipvs *ipvs = net_ipvs(net);
EnterFunction(2); EnterFunction(2);
/* Check for "full" addressed entries */ /* Check for "full" addressed entries */
mutex_lock(&__ip_vs_mutex); mutex_lock(&__ip_vs_mutex);