Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

ipvs: Pass ipvs not net to ip_vs_sync_net_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 802cb437

include/net/ip_vs.h

+1 −1
Original line number Diff line number Diff line
@@ -1334,7 +1334,7 @@ void ip_vs_app_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_estimator_net_cleanup(struct net *net);

void ip_vs_sync_net_cleanup(struct net *net);

void ip_vs_sync_net_cleanup(struct netns_ipvs *ipvs);

void ip_vs_service_net_cleanup(struct netns_ipvs *ipvs);



/* IPVS application functions

net/netfilter/ipvs/ip_vs_core.c

+3 −2
Original line number Diff line number Diff line
@@ -2128,10 +2128,11 @@ static void __net_exit __ip_vs_cleanup(struct net *net) 


static void __net_exit __ip_vs_dev_cleanup(struct net *net)

{

	struct netns_ipvs *ipvs = net_ipvs(net);

	EnterFunction(2);

	net_ipvs(net)->enable = 0;	/* Disable packet reception */

	ipvs->enable = 0;	/* Disable packet reception */

	smp_wmb();

	ip_vs_sync_net_cleanup(net);

	ip_vs_sync_net_cleanup(ipvs);

	LeaveFunction(2);

}

net/netfilter/ipvs/ip_vs_sync.c

+1 −2
Original line number Diff line number Diff line
@@ -2015,10 +2015,9 @@ int __net_init ip_vs_sync_net_init(struct netns_ipvs *ipvs) 
	return 0;

}



void ip_vs_sync_net_cleanup(struct net *net)

void ip_vs_sync_net_cleanup(struct netns_ipvs *ipvs)

{

	int retc;

	struct netns_ipvs *ipvs = net_ipvs(net);



	mutex_lock(&ipvs->sync_mutex);

	retc = stop_sync_thread(ipvs, IP_VS_STATE_MASTER);