blk-mq-sched: remove hack that bypasses scheduler for reserved requests

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.

Reviewed-by: Ming Lei <ming.lei@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Tested-by: Ming Lei <ming.lei@redhat.com>
Signed-off-by: Jens Axboe <axboe@fb.com>

diff --git a/block/blk-mq-sched.c b/block/blk-mq-sched.c
index 8b361e192e8a910f2cbc8c374c8b960628b0006a..e79e9f18d7c25885a70ec0c793e41125f0493ff3 100644 (file)
--- 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;
 
                /*