Commit e60a726b authored by Luis Chamberlain's avatar Luis Chamberlain Committed by Li Nan
Browse files

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

mainline inclusion
from mainline-v5.16-rc1
commit e1528830
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I81XCK

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=e1528830bd4ebf435d91c154e309e6e028336210



----------------------------------------

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: default avatarLuis Chamberlain <mcgrof@kernel.org>
Link: https://lore.kernel.org/r/20211015235219.2191207-2-mcgrof@kernel.org


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
conflict:
  drivers/block/brd.c
Signed-off-by: default avatarZhong Jinghua <zhongjinghua@huawei.com>
Signed-off-by: default avatarLi Nan <linan122@huawei.com>
parent bcb46bd2

drivers/block/brd.c

+7 −2
Original line number Diff line number Diff line
@@ -376,6 +376,7 @@ static int brd_alloc(int i) 
	struct brd_device *brd;

	struct gendisk *disk;

	char buf[DISK_NAME_LEN];

	int err = -ENOMEM;



	brd = kzalloc(sizeof(*brd), GFP_KERNEL);

	if (!brd)
@@ -414,14 +415,18 @@ static int brd_alloc(int i) 
	/* Tell the block layer that this is not a rotational device */

	blk_queue_flag_set(QUEUE_FLAG_NONROT, disk->queue);

	blk_queue_flag_clear(QUEUE_FLAG_ADD_RANDOM, disk->queue);

	add_disk(disk);

	err = add_disk_safe(disk);

	if (err)

		goto out_cleanup_disk;

	list_add_tail(&brd->brd_list, &brd_devices);



	return 0;



out_cleanup_disk:

	blk_cleanup_disk(disk);

out_free_dev:

	kfree(brd);

	return -ENOMEM;

	return err;

}



static struct brd_device *brd_init_one(int i, bool *new)