Commit 6c0e14f5 authored by Eric W. Biederman's avatar Eric W. Biederman Committed by Simon Horman
Browse files

ipvs: Pass ipvs not net to ip_vs_trash_cleanup 



Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: default avatarJulian Anastasov <ja@ssi.bg>
Signed-off-by: default avatarSimon Horman <horms@verge.net.au>
parent dc2add6f

net/netfilter/ipvs/ip_vs_ctl.c

+2 −3
Original line number Diff line number Diff line
@@ -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

 *  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 netns_ipvs *ipvs = net_ipvs(net);



	del_timer_sync(&ipvs->dest_trash_timer);

	/* 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);



	ip_vs_trash_cleanup(net);

	ip_vs_trash_cleanup(ipvs);

	ip_vs_control_net_cleanup_sysctl(net);

	remove_proc_entry("ip_vs_stats_percpu", net->proc_net);

	remove_proc_entry("ip_vs_stats", net->proc_net);