Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9f2779bf authored Apr 28, 2017 by Jens Axboe

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>

parent 3f5e6a35

block/blk-mq-sched.c

+1 −5

Original line number	Original line	Diff line number	Diff line
	@@ -82,11 +82,7 @@ struct request blk_mq_sched_get_request(struct request_queue q,
	if (likely(!data->hctx))		if (likely(!data->hctx))
	data->hctx = blk_mq_map_queue(q, data->ctx->cpu);		data->hctx = blk_mq_map_queue(q, data->ctx->cpu);

	/*		if (e) {
	* 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)) {
	data->flags \|= BLK_MQ_REQ_INTERNAL;		data->flags \|= BLK_MQ_REQ_INTERNAL;

	/*		/*