Skip to content

Commit 6759b1a

Browse files
Christoph Hellwigaxboe
authored andcommitted
nullb: use blk_mq_alloc_disk
Use blk_mq_alloc_disk and blk_cleanup_disk to simplify the gendisk and request_queue allocation. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com> Link: https://lore.kernel.org/r/20210602065345.355274-21-hch@lst.de Signed-off-by: Jens Axboe <axboe@kernel.dk>
1 parent 4af5f2e commit 6759b1a

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

drivers/block/null_blk/main.c

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1851,13 +1851,12 @@ static int null_add_dev(struct nullb_device *dev)
18511851

18521852
rv = -ENOMEM;
18531853
nullb->tag_set->timeout = 5 * HZ;
1854-
nullb->q = blk_mq_init_queue_data(nullb->tag_set, nullb);
1855-
if (IS_ERR(nullb->q))
1854+
nullb->disk = blk_mq_alloc_disk(nullb->tag_set, nullb);
1855+
if (IS_ERR(nullb->disk)) {
1856+
rv = PTR_ERR(nullb->disk);
18561857
goto out_cleanup_tags;
1857-
nullb->disk = alloc_disk_node(1, nullb->dev->home_node);
1858-
if (!nullb->disk)
1859-
goto out_cleanup_tags;
1860-
nullb->disk->queue = nullb->q;
1858+
}
1859+
nullb->q = nullb->disk->queue;
18611860
} else if (dev->queue_mode == NULL_Q_BIO) {
18621861
rv = -ENOMEM;
18631862
nullb->disk = blk_alloc_disk(nullb->dev->home_node);

0 commit comments

Comments
 (0)