Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-10 15:10:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

block/brd: add error handling support for add_disk()

Browse Source 
We never checked for errors on add_disk() as this function
returned void. Now that this is fixed, use the shiny new
error handling.

Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
Link: https://lore.kernel.org/r/20211015235219.2191207-2-mcgrof@kernel.org
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Luis Chamberlain 2021-10-15 16:52:07 -07:00 committed by Jens Axboe
parent 3c30883aca
commit e1528830bd
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/block/brd.c
View File

@ -370,6 +370,7 @@ static int brd_alloc(int i)
struct brd_device *brd; struct brd_device *brd;
struct gendisk *disk; struct gendisk *disk;
char buf[DISK_NAME_LEN]; char buf[DISK_NAME_LEN];
int err = -ENOMEM;
mutex_lock(&brd_devices_mutex); mutex_lock(&brd_devices_mutex);
list_for_each_entry(brd, &brd_devices, brd_list) { list_for_each_entry(brd, &brd_devices, brd_list) {
@ -420,16 +421,20 @@ static int brd_alloc(int i)
/* Tell the block layer that this is not a rotational device */ /* Tell the block layer that this is not a rotational device */
blk_queue_flag_set(QUEUE_FLAG_NONROT, disk->queue); blk_queue_flag_set(QUEUE_FLAG_NONROT, disk->queue);
blk_queue_flag_clear(QUEUE_FLAG_ADD_RANDOM, disk->queue); blk_queue_flag_clear(QUEUE_FLAG_ADD_RANDOM, disk->queue);
add_disk(disk); err = add_disk(disk);
if (err)
goto out_cleanup_disk;
return 0; return 0;
out_cleanup_disk:
blk_cleanup_disk(disk);
out_free_dev: out_free_dev:
mutex_lock(&brd_devices_mutex); mutex_lock(&brd_devices_mutex);
list_del(&brd->brd_list); list_del(&brd->brd_list);
mutex_unlock(&brd_devices_mutex); mutex_unlock(&brd_devices_mutex);
kfree(brd); kfree(brd);
return -ENOMEM; return err;
} }
static void brd_probe(dev_t dev) static void brd_probe(dev_t dev)