Commit e32b0855 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe

null_blk: initialize the tag_set timeout in null_init_tag_set

Otherwise it will be reset to the always same value when initializing a
device using the shared tag_set.
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDamien Le Moal <dlemoal@kernel.org>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Tested-by: default avatarDamien Le Moal <dlemoal@kernel.org>
Link: https://lore.kernel.org/r/20240220093248.3290292-3-hch@lst.deSigned-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 8b631f9c
...@@ -1797,6 +1797,7 @@ static int null_init_tag_set(struct nullb *nullb, struct blk_mq_tag_set *set) ...@@ -1797,6 +1797,7 @@ static int null_init_tag_set(struct nullb *nullb, struct blk_mq_tag_set *set)
set->nr_hw_queues = hw_queues; set->nr_hw_queues = hw_queues;
set->queue_depth = queue_depth; set->queue_depth = queue_depth;
set->numa_node = numa_node; set->numa_node = numa_node;
set->timeout = 5 * HZ;
if (poll_queues) { if (poll_queues) {
set->nr_hw_queues += poll_queues; set->nr_hw_queues += poll_queues;
set->nr_maps = 3; set->nr_maps = 3;
...@@ -1921,7 +1922,6 @@ static int null_add_dev(struct nullb_device *dev) ...@@ -1921,7 +1922,6 @@ static int null_add_dev(struct nullb_device *dev)
if (rv) if (rv)
goto out_cleanup_queues; goto out_cleanup_queues;
nullb->tag_set->timeout = 5 * HZ;
nullb->disk = blk_mq_alloc_disk(nullb->tag_set, NULL, nullb); nullb->disk = blk_mq_alloc_disk(nullb->tag_set, NULL, nullb);
if (IS_ERR(nullb->disk)) { if (IS_ERR(nullb->disk)) {
rv = PTR_ERR(nullb->disk); rv = PTR_ERR(nullb->disk);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment