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

ipvs: Pass ipvs not net to stop_sync_thread 



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 6ac121d7

include/net/ip_vs.h

+1 −1
Original line number Diff line number Diff line
@@ -1451,7 +1451,7 @@ static inline void ip_vs_dest_put_and_free(struct ip_vs_dest *dest) 
 */

int start_sync_thread(struct netns_ipvs *ipvs, struct ipvs_sync_daemon_cfg *cfg,

		      int state);

int stop_sync_thread(struct net *net, int state);

int stop_sync_thread(struct netns_ipvs *ipvs, int state);

void ip_vs_sync_conn(struct net *net, struct ip_vs_conn *cp, int pkts);



/* IPVS rate estimator prototypes (from ip_vs_est.c) */

net/netfilter/ipvs/ip_vs_ctl.c

+2 −2
Original line number Diff line number Diff line
@@ -2355,7 +2355,7 @@ do_ip_vs_set_ctl(struct sock *sk, int cmd, void __user *user, unsigned int len) 
			rtnl_unlock();

		} else {

			mutex_lock(&ipvs->sync_mutex);

			ret = stop_sync_thread(net, dm->state);

			ret = stop_sync_thread(ipvs, dm->state);

			mutex_unlock(&ipvs->sync_mutex);

		}

		goto out_dec;
@@ -3447,7 +3447,7 @@ static int ip_vs_genl_del_daemon(struct netns_ipvs *ipvs, struct nlattr **attrs) 
		return -EINVAL;



	mutex_lock(&ipvs->sync_mutex);

	ret = stop_sync_thread(ipvs->net,

	ret = stop_sync_thread(ipvs,

			       nla_get_u32(attrs[IPVS_DAEMON_ATTR_STATE]));

	mutex_unlock(&ipvs->sync_mutex);

	return ret;

net/netfilter/ipvs/ip_vs_sync.c

+3 −4
Original line number Diff line number Diff line
@@ -1946,9 +1946,8 @@ int start_sync_thread(struct netns_ipvs *ipvs, struct ipvs_sync_daemon_cfg *c, 
}





int stop_sync_thread(struct net *net, int state)

int stop_sync_thread(struct netns_ipvs *ipvs, int state)

{

	struct netns_ipvs *ipvs = net_ipvs(net);

	struct task_struct **array;

	int id;

	int retc = -EINVAL;
@@ -2030,11 +2029,11 @@ void ip_vs_sync_net_cleanup(struct net *net) 
	struct netns_ipvs *ipvs = net_ipvs(net);



	mutex_lock(&ipvs->sync_mutex);

	retc = stop_sync_thread(net, IP_VS_STATE_MASTER);

	retc = stop_sync_thread(ipvs, IP_VS_STATE_MASTER);

	if (retc && retc != -ESRCH)

		pr_err("Failed to stop Master Daemon\n");



	retc = stop_sync_thread(net, IP_VS_STATE_BACKUP);

	retc = stop_sync_thread(ipvs, IP_VS_STATE_BACKUP);

	if (retc && retc != -ESRCH)

		pr_err("Failed to stop Backup Daemon\n");

	mutex_unlock(&ipvs->sync_mutex);