diff options
| author | Damien Le Moal <damien.lemoal@wdc.com> | 2019-09-05 18:51:30 +0900 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2019-09-05 19:52:33 -0600 |
| commit | 954b4a5ce4a806e7c284ce6b2659abdd03d0b6e2 (patch) | |
| tree | d750b8f375ef88ab4b75526c7e4128a62cc7c8ff /block/blk.h | |
| parent | 61db437d1cc16c470cf6fccc04d34be9cf6e4e4b (diff) | |
| download | linux-954b4a5ce4a806e7c284ce6b2659abdd03d0b6e2.tar.gz linux-954b4a5ce4a806e7c284ce6b2659abdd03d0b6e2.tar.bz2 linux-954b4a5ce4a806e7c284ce6b2659abdd03d0b6e2.zip | |
block: Change elevator_init_mq() to always succeed
If the default elevator chosen is mq-deadline, elevator_init_mq() may
return an error if mq-deadline initialization fails, leading to
blk_mq_init_allocated_queue() returning an error, which in turn will
cause the block device initialization to fail and the device not being
exposed.
Instead of taking such extreme measure, handle mq-deadline
initialization failures in the same manner as when mq-deadline is not
available (no module to load), that is, default to the "none" scheduler.
With this change, elevator_init_mq() return type can be changed to void.
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Ming Lei <ming.lei@redhat.com>
Signed-off-by: Damien Le Moal <damien.lemoal@wdc.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/blk.h')
| -rw-r--r-- | block/blk.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk.h b/block/blk.h index e4619fc5c99a..ed347f7a97b1 100644 --- a/block/blk.h +++ b/block/blk.h @@ -184,7 +184,7 @@ void blk_account_io_done(struct request *req, u64 now); void blk_insert_flush(struct request *rq); -int elevator_init_mq(struct request_queue *q); +void elevator_init_mq(struct request_queue *q); int elevator_switch_mq(struct request_queue *q, struct elevator_type *new_e); void __elevator_exit(struct request_queue *, struct elevator_queue *); |