Commit 61db437d authored by Damien Le Moal's avatar Damien Le Moal Committed by Jens Axboe
Browse files

block: Cleanup elevator_init_mq() use 



Instead of checking a queue tag_set BLK_MQ_F_NO_SCHED flag before
calling elevator_init_mq() to make sure that the queue supports IO
scheduling, use the elevator.c function elv_support_iosched() in
elevator_init_mq(). This does not introduce any functional change but
ensure that elevator_init_mq() does the right thing based on the queue
settings.

Reviewed-by: default avatarMing Lei <ming.lei@redhat.com>
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarDamien Le Moal <damien.lemoal@wdc.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 362cd2b1

block/blk-mq.c

+3 −5
Original line number Diff line number Diff line
@@ -2910,11 +2910,9 @@ struct request_queue *blk_mq_init_allocated_queue(struct blk_mq_tag_set *set, 
	blk_mq_add_queue_tag_set(set, q);

	blk_mq_map_swqueue(q);



	if (!(set->flags & BLK_MQ_F_NO_SCHED)) {

	ret = elevator_init_mq(q);

	if (ret)

		goto err_tag_set;

	}



	return q;

block/elevator.c

+13 −10
Original line number Diff line number Diff line
@@ -619,16 +619,26 @@ out: 
	return ret;

}



static inline bool elv_support_iosched(struct request_queue *q)

{

	if (q->tag_set && (q->tag_set->flags & BLK_MQ_F_NO_SCHED))

		return false;

	return true;

}



/*

 * For blk-mq devices, we default to using mq-deadline, if available, for single

 * queue devices.  If deadline isn't available OR we have multiple queues,

 * default to "none".

 * For blk-mq devices supporting IO scheduling, we default to using mq-deadline,

 * if available, for single queue devices. If deadline isn't available OR we

 * have multiple queues, default to "none".

 */

int elevator_init_mq(struct request_queue *q)

{

	struct elevator_type *e;

	int err = 0;



	if (!elv_support_iosched(q))

		return 0;



	if (q->nr_hw_queues != 1)

		return 0;
@@ -706,13 +716,6 @@ static int __elevator_change(struct request_queue *q, const char *name) 
	return elevator_switch(q, e);

}



static inline bool elv_support_iosched(struct request_queue *q)

{

	if (q->tag_set && (q->tag_set->flags & BLK_MQ_F_NO_SCHED))

		return false;

	return true;

}



ssize_t elv_iosched_store(struct request_queue *q, const char *name,

			  size_t count)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE