Commit 6ef757f9 authored by Julian Anastasov's avatar Julian Anastasov Committed by Simon Horman
Browse files

ipvs: rename estimator functions 



 	Rename ip_vs_new_estimator to ip_vs_start_estimator
and ip_vs_kill_estimator to ip_vs_stop_estimator to better
match their logic.

Signed-off-by: default avatarJulian Anastasov <ja@ssi.bg>
Signed-off-by: default avatarSimon Horman <horms@verge.net.au>
parent ea9f22cc

include/net/ip_vs.h

+2 −2
Original line number Diff line number Diff line
@@ -1176,8 +1176,8 @@ extern void ip_vs_sync_cleanup(void); 
 */

extern int ip_vs_estimator_init(void);

extern void ip_vs_estimator_cleanup(void);

extern void ip_vs_new_estimator(struct net *net, struct ip_vs_stats *stats);

extern void ip_vs_kill_estimator(struct net *net, struct ip_vs_stats *stats);

extern void ip_vs_start_estimator(struct net *net, struct ip_vs_stats *stats);

extern void ip_vs_stop_estimator(struct net *net, struct ip_vs_stats *stats);

extern void ip_vs_zero_estimator(struct ip_vs_stats *stats);

extern void ip_vs_read_estimator(struct ip_vs_stats_user *dst,

				 struct ip_vs_stats *stats);

net/netfilter/ipvs/ip_vs_ctl.c

+6 −6
Original line number Diff line number Diff line
@@ -802,7 +802,7 @@ __ip_vs_update_dest(struct ip_vs_service *svc, struct ip_vs_dest *dest, 
	spin_unlock(&dest->dst_lock);



	if (add)

		ip_vs_new_estimator(svc->net, &dest->stats);

		ip_vs_start_estimator(svc->net, &dest->stats);



	write_lock_bh(&__ip_vs_svc_lock);
@@ -1008,7 +1008,7 @@ static void __ip_vs_del_dest(struct net *net, struct ip_vs_dest *dest) 
{

	struct netns_ipvs *ipvs = net_ipvs(net);



	ip_vs_kill_estimator(net, &dest->stats);

	ip_vs_stop_estimator(net, &dest->stats);



	/*

	 *  Remove it from the d-linked list with the real services.
@@ -1201,7 +1201,7 @@ ip_vs_add_service(struct net *net, struct ip_vs_service_user_kern *u, 
	else if (svc->port == 0)

		atomic_inc(&ipvs->nullsvc_counter);



	ip_vs_new_estimator(net, &svc->stats);

	ip_vs_start_estimator(net, &svc->stats);



	/* Count only IPv4 services for old get/setsockopt interface */

	if (svc->af == AF_INET)
@@ -1353,7 +1353,7 @@ static void __ip_vs_del_service(struct ip_vs_service *svc) 
	if (svc->af == AF_INET)

		ipvs->num_services--;



	ip_vs_kill_estimator(svc->net, &svc->stats);

	ip_vs_stop_estimator(svc->net, &svc->stats);



	/* Unbind scheduler */

	old_sched = svc->scheduler;
@@ -3585,7 +3585,7 @@ int __net_init __ip_vs_control_init(struct net *net) 
		goto err_dup;

	}

#endif

	ip_vs_new_estimator(net, &ipvs->tot_stats);

	ip_vs_start_estimator(net, &ipvs->tot_stats);

	ipvs->sysctl_tbl = tbl;

	/* Schedule defense work */

	INIT_DELAYED_WORK(&ipvs->defense_work, defense_work_handler);
@@ -3603,7 +3603,7 @@ static void __net_exit __ip_vs_control_cleanup(struct net *net) 
	struct netns_ipvs *ipvs = net_ipvs(net);



	ip_vs_trash_cleanup(net);

	ip_vs_kill_estimator(net, &ipvs->tot_stats);

	ip_vs_stop_estimator(net, &ipvs->tot_stats);

	cancel_delayed_work_sync(&ipvs->defense_work);

	cancel_work_sync(&ipvs->defense_work.work);

#ifdef CONFIG_SYSCTL

net/netfilter/ipvs/ip_vs_est.c

+2 −2
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ static void estimation_timer(unsigned long arg) 
	mod_timer(&ipvs->est_timer, jiffies + 2*HZ);

}



void ip_vs_new_estimator(struct net *net, struct ip_vs_stats *stats)

void ip_vs_start_estimator(struct net *net, struct ip_vs_stats *stats)

{

	struct netns_ipvs *ipvs = net_ipvs(net);

	struct ip_vs_estimator *est = &stats->est;
@@ -151,7 +151,7 @@ void ip_vs_new_estimator(struct net *net, struct ip_vs_stats *stats) 
	spin_unlock_bh(&ipvs->est_lock);

}



void ip_vs_kill_estimator(struct net *net, struct ip_vs_stats *stats)

void ip_vs_stop_estimator(struct net *net, struct ip_vs_stats *stats)

{

	struct netns_ipvs *ipvs = net_ipvs(net);

	struct ip_vs_estimator *est = &stats->est;