From: Ming Lei <ming.lei@redhat.com>
Date: Fri, 23 Feb 2018 15:36:57 +0000 (+0800)
Subject: block: kyber: fix domain token leak during requeue
X-Git-Tag: v4.14.25~85
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7f43f610c4bb8e4da69923d0ce0c60a82073bf2c;p=platform%2Fkernel%2Flinux-rpi.git

block: kyber: fix domain token leak during requeue

commit ba989a01469d027861e55c8f1121edadef757797 upstream.

When requeuing request, the domain token should have been freed
before re-inserting the request to io scheduler. Otherwise, the
assigned domain token will be leaked, and IO hang can be caused.

Cc: Paolo Valente <paolo.valente@linaro.org>
Cc: Omar Sandoval <osandov@fb.com>
Cc: stable@vger.kernel.org
Reviewed-by: Bart Van Assche <bart.vanassche@wdc.com>
Signed-off-by: Ming Lei <ming.lei@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/block/kyber-iosched.c b/block/kyber-iosched.c
index f58cab8..09cd5cf 100644
--- a/block/kyber-iosched.c
+++ b/block/kyber-iosched.c
@@ -814,6 +814,7 @@ static struct elevator_type kyber_sched = {
 		.limit_depth = kyber_limit_depth,
 		.prepare_request = kyber_prepare_request,
 		.finish_request = kyber_finish_request,
+		.requeue_request = kyber_finish_request,
 		.completed_request = kyber_completed_request,
 		.dispatch_request = kyber_dispatch_request,
 		.has_work = kyber_has_work,