niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

loop: use blk_mq_alloc_disk and blk_cleanup_disk

Browse source 
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-19-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Christoph Hellwig 2021-06-02 09:53:33 +03:00 • committed by Jens Axboe
parent 34f84aefe2
commit 1c99502fae
1 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
drivers/block/loop.c
View file

@ -2117,12 +2117,12 @@ static int loop_add(struct loop_device **l, int i)
if (err) if (err)
goto out_free_idr; goto out_free_idr;
lo->lo_queue = blk_mq_init_queue(&lo->tag_set); disk = lo->lo_disk = blk_mq_alloc_disk(&lo->tag_set, lo);
if (IS_ERR(lo->lo_queue)) { if (IS_ERR(disk)) {
err = PTR_ERR(lo->lo_queue); err = PTR_ERR(disk);
goto out_cleanup_tags; goto out_cleanup_tags;
} }
lo->lo_queue->queuedata = lo; lo->lo_queue = lo->lo_disk->queue;
blk_queue_max_hw_sectors(lo->lo_queue, BLK_DEF_MAX_SECTORS); blk_queue_max_hw_sectors(lo->lo_queue, BLK_DEF_MAX_SECTORS);
@ -2134,11 +2134,6 @@ static int loop_add(struct loop_device **l, int i)
*/ */
blk_queue_flag_set(QUEUE_FLAG_NOMERGES, lo->lo_queue); blk_queue_flag_set(QUEUE_FLAG_NOMERGES, lo->lo_queue);
err = -ENOMEM;
disk = lo->lo_disk = alloc_disk(1 << part_shift);
if (!disk)
goto out_free_queue;
/* /*
* Disable partition scanning by default. The in-kernel partition * Disable partition scanning by default. The in-kernel partition
* scanning can be requested individually per-device during its * scanning can be requested individually per-device during its
@ -2166,6 +2161,7 @@ static int loop_add(struct loop_device **l, int i)
spin_lock_init(&lo->lo_lock); spin_lock_init(&lo->lo_lock);
disk->major = LOOP_MAJOR; disk->major = LOOP_MAJOR;
disk->first_minor = i << part_shift; disk->first_minor = i << part_shift;
disk->minors = 1 << part_shift;
disk->fops = &lo_fops; disk->fops = &lo_fops;
disk->private_data = lo; disk->private_data = lo;
disk->queue = lo->lo_queue; disk->queue = lo->lo_queue;
@ -2174,8 +2170,6 @@ static int loop_add(struct loop_device **l, int i)
*l = lo; *l = lo;
return lo->lo_number; return lo->lo_number;
out_free_queue:
blk_cleanup_queue(lo->lo_queue);
out_cleanup_tags: out_cleanup_tags:
blk_mq_free_tag_set(&lo->tag_set); blk_mq_free_tag_set(&lo->tag_set);
out_free_idr: out_free_idr:
@ -2189,9 +2183,8 @@ out:
static void loop_remove(struct loop_device *lo) static void loop_remove(struct loop_device *lo)
{ {
del_gendisk(lo->lo_disk); del_gendisk(lo->lo_disk);
blk_cleanup_queue(lo->lo_queue);
blk_mq_free_tag_set(&lo->tag_set); blk_mq_free_tag_set(&lo->tag_set);
put_disk(lo->lo_disk); blk_cleanup_disk(lo->lo_disk);
mutex_destroy(&lo->lo_mutex); mutex_destroy(&lo->lo_mutex);
kfree(lo); kfree(lo);
} }