diff options
author | Bart Van Assche <bvanassche@acm.org> | 2022-08-15 10:00:42 -0700 |
---|---|---|
committer | Jens Axboe <axboe@kernel.dk> | 2022-08-22 07:52:51 -0600 |
commit | 10b41ea15e81a5597bc5944a7900e9a790bd984a (patch) | |
tree | b08f8ad6fe9b8a8a8c743561417e8860002cd119 /drivers/block/null_blk | |
parent | 74e237b6e7421157cc378eee6641b818cea8129d (diff) | |
download | linux-stable-10b41ea15e81a5597bc5944a7900e9a790bd984a.tar.gz linux-stable-10b41ea15e81a5597bc5944a7900e9a790bd984a.tar.bz2 linux-stable-10b41ea15e81a5597bc5944a7900e9a790bd984a.zip |
null_blk: Modify the behavior of null_map_queues()
Instead of returning -EINVAL if an internal inconsistency is detected,
fall back to a single submission queue. This patch prepares for changing
the return value of the .map_queues() callbacks into void.
Cc: Christoph Hellwig <hch@lst.de>
Cc: Keith Busch <kbusch@kernel.org>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>
Link: https://lore.kernel.org/r/20220815170043.19489-2-bvanassche@acm.org
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/block/null_blk')
-rw-r--r-- | drivers/block/null_blk/main.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/block/null_blk/main.c b/drivers/block/null_blk/main.c index c451c477978f..535059209693 100644 --- a/drivers/block/null_blk/main.c +++ b/drivers/block/null_blk/main.c @@ -1555,7 +1555,9 @@ static int null_map_queues(struct blk_mq_tag_set *set) } else { pr_warn("tag set has unexpected nr_hw_queues: %d\n", set->nr_hw_queues); - return -EINVAL; + WARN_ON_ONCE(true); + submit_queues = 1; + poll_queues = 0; } } |