summaryrefslogtreecommitdiffstats
path: root/net/netfilter/ipvs/ip_vs_sched.c
diff options
context:
space:
mode:
authorJulian Anastasov <ja@ssi.bg>2013-03-22 11:46:50 +0200
committerPablo Neira Ayuso <pablo@netfilter.org>2013-04-02 00:23:56 +0200
commited3ffc4e48e2b03d5b23988f3cfa0ad8d79e0092 (patch)
treea72065ed64d14aeb3d8504221af3ed6925576c6a /net/netfilter/ipvs/ip_vs_sched.c
parent578bc3ef1e473abb9ea99046a307fef0094b22af (diff)
downloadlinux-stable-ed3ffc4e48e2b03d5b23988f3cfa0ad8d79e0092.tar.gz
linux-stable-ed3ffc4e48e2b03d5b23988f3cfa0ad8d79e0092.tar.bz2
linux-stable-ed3ffc4e48e2b03d5b23988f3cfa0ad8d79e0092.zip
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: Julian Anastasov <ja@ssi.bg> Signed-off-by: Simon Horman <horms@verge.net.au>
Diffstat (limited to 'net/netfilter/ipvs/ip_vs_sched.c')
-rw-r--r--net/netfilter/ipvs/ip_vs_sched.c13
1 files changed, 4 insertions, 9 deletions
diff --git a/net/netfilter/ipvs/ip_vs_sched.c b/net/netfilter/ipvs/ip_vs_sched.c
index 7f11d3d37a42..1b715d0caf43 100644
--- a/net/netfilter/ipvs/ip_vs_sched.c
+++ b/net/netfilter/ipvs/ip_vs_sched.c
@@ -64,22 +64,17 @@ int ip_vs_bind_scheduler(struct ip_vs_service *svc,
/*
* Unbind a service with its scheduler
*/
-int ip_vs_unbind_scheduler(struct ip_vs_service *svc)
+void ip_vs_unbind_scheduler(struct ip_vs_service *svc)
{
struct ip_vs_scheduler *sched = svc->scheduler;
if (!sched)
- return 0;
+ return;
- if (sched->done_service) {
- if (sched->done_service(svc) != 0) {
- pr_err("%s(): done error\n", __func__);
- return -EINVAL;
- }
- }
+ if (sched->done_service)
+ sched->done_service(svc);
svc->scheduler = NULL;
- return 0;
}