Commit 82dfb6f3 authored by Sven Wegener's avatar Sven Wegener Committed by Simon Horman
Browse files

ipvs: Only call init_service, update_service and done_service for schedulers if defined 



There are schedulers that only schedule based on data available in the service
or destination structures and they don't need any persistent storage or
initialization routine. These schedulers currently provide dummy functions for
the init_service, update_service and/or done_service functions. For the
init_service and done_service cases we already have code that only calls these
functions, if the scheduler provides them. Do the same for the update_service
case and remove the dummy functions from all schedulers.

Signed-off-by: default avatarSven Wegener <sven.wegener@stealer.net>
Signed-off-by: default avatarSimon Horman <horms@verge.net.au>
parent 9a812198

net/ipv4/ipvs/ip_vs_ctl.c

+12 −9
Original line number Diff line number Diff line
@@ -869,6 +869,7 @@ ip_vs_add_dest(struct ip_vs_service *svc, struct ip_vs_dest_user *udest) 
		svc->num_dests++;



		/* call the update_service function of its scheduler */

		if (svc->scheduler->update_service)

			svc->scheduler->update_service(svc);



		write_unlock_bh(&__ip_vs_svc_lock);
@@ -899,6 +900,7 @@ ip_vs_add_dest(struct ip_vs_service *svc, struct ip_vs_dest_user *udest) 
	svc->num_dests++;



	/* call the update_service function of its scheduler */

	if (svc->scheduler->update_service)

		svc->scheduler->update_service(svc);



	write_unlock_bh(&__ip_vs_svc_lock);
@@ -949,6 +951,7 @@ ip_vs_edit_dest(struct ip_vs_service *svc, struct ip_vs_dest_user *udest) 
	IP_VS_WAIT_WHILE(atomic_read(&svc->usecnt) > 1);



	/* call the update_service, because server weight may be changed */

	if (svc->scheduler->update_service)

		svc->scheduler->update_service(svc);



	write_unlock_bh(&__ip_vs_svc_lock);
@@ -1012,13 +1015,13 @@ static void __ip_vs_unlink_dest(struct ip_vs_service *svc, 
	 */

	list_del(&dest->n_list);

	svc->num_dests--;

	if (svcupd) {



	/*

	 *  Call the update_service function of its scheduler

	 */

	if (svcupd && svc->scheduler->update_service)

			svc->scheduler->update_service(svc);

}

}





/*

net/ipv4/ipvs/ip_vs_lblc.c

+0 −7
Original line number Diff line number Diff line
@@ -388,12 +388,6 @@ static int ip_vs_lblc_done_svc(struct ip_vs_service *svc) 
}





static int ip_vs_lblc_update_svc(struct ip_vs_service *svc)

{

	return 0;

}





static inline struct ip_vs_dest *

__ip_vs_wlc_schedule(struct ip_vs_service *svc, struct iphdr *iph)

{
@@ -542,7 +536,6 @@ static struct ip_vs_scheduler ip_vs_lblc_scheduler = 
	.n_list =		LIST_HEAD_INIT(ip_vs_lblc_scheduler.n_list),

	.init_service =		ip_vs_lblc_init_svc,

	.done_service =		ip_vs_lblc_done_svc,

	.update_service =	ip_vs_lblc_update_svc,

	.schedule =		ip_vs_lblc_schedule,

};

net/ipv4/ipvs/ip_vs_lblcr.c

+0 −7
Original line number Diff line number Diff line
@@ -572,12 +572,6 @@ static int ip_vs_lblcr_done_svc(struct ip_vs_service *svc) 
}





static int ip_vs_lblcr_update_svc(struct ip_vs_service *svc)

{

	return 0;

}





static inline struct ip_vs_dest *

__ip_vs_wlc_schedule(struct ip_vs_service *svc, struct iphdr *iph)

{
@@ -731,7 +725,6 @@ static struct ip_vs_scheduler ip_vs_lblcr_scheduler = 
	.n_list =		LIST_HEAD_INIT(ip_vs_lblcr_scheduler.n_list),

	.init_service =		ip_vs_lblcr_init_svc,

	.done_service =		ip_vs_lblcr_done_svc,

	.update_service =	ip_vs_lblcr_update_svc,

	.schedule =		ip_vs_lblcr_schedule,

};

net/ipv4/ipvs/ip_vs_lc.c

+0 −21
Original line number Diff line number Diff line
@@ -20,24 +20,6 @@ 
#include <net/ip_vs.h>





static int ip_vs_lc_init_svc(struct ip_vs_service *svc)

{

	return 0;

}





static int ip_vs_lc_done_svc(struct ip_vs_service *svc)

{

	return 0;

}





static int ip_vs_lc_update_svc(struct ip_vs_service *svc)

{

	return 0;

}





static inline unsigned int

ip_vs_lc_dest_overhead(struct ip_vs_dest *dest)

{
@@ -99,9 +81,6 @@ static struct ip_vs_scheduler ip_vs_lc_scheduler = { 
	.refcnt =		ATOMIC_INIT(0),

	.module =		THIS_MODULE,

	.n_list =		LIST_HEAD_INIT(ip_vs_lc_scheduler.n_list),

	.init_service =		ip_vs_lc_init_svc,

	.done_service =		ip_vs_lc_done_svc,

	.update_service =	ip_vs_lc_update_svc,

	.schedule =		ip_vs_lc_schedule,

};

net/ipv4/ipvs/ip_vs_nq.c

+0 −24
Original line number Diff line number Diff line
@@ -37,27 +37,6 @@ 
#include <net/ip_vs.h>





static int

ip_vs_nq_init_svc(struct ip_vs_service *svc)

{

	return 0;

}





static int

ip_vs_nq_done_svc(struct ip_vs_service *svc)

{

	return 0;

}





static int

ip_vs_nq_update_svc(struct ip_vs_service *svc)

{

	return 0;

}





static inline unsigned int

ip_vs_nq_dest_overhead(struct ip_vs_dest *dest)

{
@@ -137,9 +116,6 @@ static struct ip_vs_scheduler ip_vs_nq_scheduler = 
	.refcnt =		ATOMIC_INIT(0),

	.module =		THIS_MODULE,

	.n_list =		LIST_HEAD_INIT(ip_vs_nq_scheduler.n_list),

	.init_service =		ip_vs_nq_init_svc,

	.done_service =		ip_vs_nq_done_svc,

	.update_service =	ip_vs_nq_update_svc,

	.schedule =		ip_vs_nq_schedule,

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE