openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ipvs: Pass ipvs not net to ip_vs_trash_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:01:52 -05:00 committed by Simon Horman
parent dc2add6f2e
commit 6c0e14f507
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -713,10 +713,9 @@ static void ip_vs_dest_free(struct ip_vs_dest *dest)
* are expired, and the refcnt of each destination in the trash must * are expired, and the refcnt of each destination in the trash must
* be 0, so we simply release them here. * be 0, so we simply release them here.
*/ */
static void ip_vs_trash_cleanup(struct net *net) static void ip_vs_trash_cleanup(struct netns_ipvs *ipvs)
{ {
struct ip_vs_dest *dest, *nxt; struct ip_vs_dest *dest, *nxt;
struct netns_ipvs *ipvs = net_ipvs(net);
del_timer_sync(&ipvs->dest_trash_timer); del_timer_sync(&ipvs->dest_trash_timer);
/* No need to use dest_trash_lock */ /* No need to use dest_trash_lock */
@ -4005,7 +4004,7 @@ void __net_exit ip_vs_control_net_cleanup(struct net *net)
{ {
struct netns_ipvs *ipvs = net_ipvs(net); struct netns_ipvs *ipvs = net_ipvs(net);
ip_vs_trash_cleanup(net); ip_vs_trash_cleanup(ipvs);
ip_vs_control_net_cleanup_sysctl(net); ip_vs_control_net_cleanup_sysctl(net);
remove_proc_entry("ip_vs_stats_percpu", net->proc_net); remove_proc_entry("ip_vs_stats_percpu", net->proc_net);
remove_proc_entry("ip_vs_stats", net->proc_net); remove_proc_entry("ip_vs_stats", net->proc_net);