diff options
| author | Jens Axboe <axboe@fb.com> | 2017-04-28 08:53:01 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2017-05-02 07:52:08 -0600 |
| commit | 9f2779bff2f178496fb00b89797734ee245d2c93 (patch) | |
| tree | 72804d4ec3af8d61c59934a58609c9b98d14b304 /block | |
| parent | 3f5e6a35774cd6bb4fd6b32edb4efd2a3f90e4dd (diff) | |
| download | op-kernel-dev-9f2779bff2f178496fb00b89797734ee245d2c93.zip op-kernel-dev-9f2779bff2f178496fb00b89797734ee245d2c93.tar.gz | |
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>
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-mq-sched.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/block/blk-mq-sched.c b/block/blk-mq-sched.c index 8b361e1..e79e9f1 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; /* |
