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

Commit ed3ffc4e authored by Julian Anastasov's avatar Julian Anastasov Committed by Pablo Neira Ayuso
Browse files

ipvs: do not expect result from done_service 



This method releases the scheduler state,
it can not fail. Such change will help to properly
replace the scheduler in following patch.

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

include/net/ip_vs.h

+2 −2
Original line number Diff line number Diff line
@@ -806,7 +806,7 @@ struct ip_vs_scheduler { 
	/* scheduler initializing service */

	int (*init_service)(struct ip_vs_service *svc);

	/* scheduling service finish */

	int (*done_service)(struct ip_vs_service *svc);

	void (*done_service)(struct ip_vs_service *svc);

	/* scheduler updating service */

	int (*update_service)(struct ip_vs_service *svc);

	/* dest is linked */
@@ -1392,7 +1392,7 @@ extern int register_ip_vs_scheduler(struct ip_vs_scheduler *scheduler); 
extern int unregister_ip_vs_scheduler(struct ip_vs_scheduler *scheduler);

extern int ip_vs_bind_scheduler(struct ip_vs_service *svc,

				struct ip_vs_scheduler *scheduler);

extern int ip_vs_unbind_scheduler(struct ip_vs_service *svc);

extern void ip_vs_unbind_scheduler(struct ip_vs_service *svc);

extern struct ip_vs_scheduler *ip_vs_scheduler_get(const char *sched_name);

extern void ip_vs_scheduler_put(struct ip_vs_scheduler *scheduler);

extern struct ip_vs_conn *

net/netfilter/ipvs/ip_vs_ctl.c

+1 −4
Original line number Diff line number Diff line
@@ -1334,10 +1334,7 @@ ip_vs_edit_service(struct ip_vs_service *svc, struct ip_vs_service_user_kern *u) 
		/*

		 * Unbind the old scheduler

		 */

		if ((ret = ip_vs_unbind_scheduler(svc))) {

			old_sched = sched;

			goto out_unlock;

		}

		ip_vs_unbind_scheduler(svc);



		/*

		 * Bind the new scheduler

net/netfilter/ipvs/ip_vs_dh.c

+1 −3
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ static int ip_vs_dh_init_svc(struct ip_vs_service *svc) 
}





static int ip_vs_dh_done_svc(struct ip_vs_service *svc)

static void ip_vs_dh_done_svc(struct ip_vs_service *svc)

{

	struct ip_vs_dh_state *s = svc->sched_data;
@@ -185,8 +185,6 @@ static int ip_vs_dh_done_svc(struct ip_vs_service *svc) 
	kfree_rcu(s, rcu_head);

	IP_VS_DBG(6, "DH hash table (memory=%Zdbytes) released\n",

		  sizeof(struct ip_vs_dh_bucket)*IP_VS_DH_TAB_SIZE);



	return 0;

}

net/netfilter/ipvs/ip_vs_lblc.c

+1 −3
Original line number Diff line number Diff line
@@ -388,7 +388,7 @@ static int ip_vs_lblc_init_svc(struct ip_vs_service *svc) 
}





static int ip_vs_lblc_done_svc(struct ip_vs_service *svc)

static void ip_vs_lblc_done_svc(struct ip_vs_service *svc)

{

	struct ip_vs_lblc_table *tbl = svc->sched_data;
@@ -402,8 +402,6 @@ static int ip_vs_lblc_done_svc(struct ip_vs_service *svc) 
	kfree_rcu(tbl, rcu_head);

	IP_VS_DBG(6, "LBLC hash table (memory=%Zdbytes) released\n",

		  sizeof(*tbl));



	return 0;

}

net/netfilter/ipvs/ip_vs_lblcr.c

+1 −3
Original line number Diff line number Diff line
@@ -555,7 +555,7 @@ static int ip_vs_lblcr_init_svc(struct ip_vs_service *svc) 
}





static int ip_vs_lblcr_done_svc(struct ip_vs_service *svc)

static void ip_vs_lblcr_done_svc(struct ip_vs_service *svc)

{

	struct ip_vs_lblcr_table *tbl = svc->sched_data;
@@ -569,8 +569,6 @@ static int ip_vs_lblcr_done_svc(struct ip_vs_service *svc) 
	kfree_rcu(tbl, rcu_head);

	IP_VS_DBG(6, "LBLCR hash table (memory=%Zdbytes) released\n",

		  sizeof(*tbl));



	return 0;

}