[PATCH 6/7] blk-mq-sched: remove hack that bypasses scheduler for reserved requests

[Jens Axboe]

We have update the troublesome driver (mtip32xx) to deal with this
appropriately. So kill the hack that bypassed scheduler allocation
and insertion for reserved requests.

Signed-off-by: Jens Axboe <ax...@fb.com>
---
 block/blk-mq-sched.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/block/blk-mq-sched.c b/block/blk-mq-sched.c
index 8b361e192e8a..e79e9f18d7c2 100644
--- a/block/blk-mq-sched.c
+++ b/block/blk-mq-sched.c
@@ -82,11 +82,7 @@ struct request *blk_mq_sched_get_request(struct 
request_queue *q,
        if (likely(!data->hctx))
                data->hctx = blk_mq_map_queue(q, data->ctx->cpu);
 
-       /*
-        * For a reserved tag, allocate a normal request since we might
-        * have driver dependencies on the value of the internal tag.
-        */
-       if (e && !(data->flags & BLK_MQ_REQ_RESERVED)) {
+       if (e) {
                data->flags |= BLK_MQ_REQ_INTERNAL;
 
                /*
-- 
2.7.4