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

mtd/ubi/block: add error handling support for add_disk() 

mainline inclusion
from mainline-v5.16-rc1
commit ed739191
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=ed73919124b2e48490adbbe48ffe885a2a4c6fee



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

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

Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarLuis Chamberlain <mcgrof@kernel.org>
Link: https://lore.kernel.org/r/20211103230437.1639990-10-mcgrof@kernel.org


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
Signed-off-by: default avatarZhong Jinghua <zhongjinghua@huawei.com>
Signed-off-by: default avatarLi Nan <linan122@huawei.com>
parent 22a7b89c

drivers/mtd/ubi/block.c

+7 −1
Original line number Diff line number Diff line
@@ -447,12 +447,18 @@ int ubiblock_create(struct ubi_volume_info *vi) 
	list_add_tail(&dev->list, &ubiblock_devices);



	/* Must be the last step: anyone can call file ops from now on */

	add_disk(dev->gd);

	ret = add_disk_safe(dev->gd);

	if (ret)

		goto out_destroy_wq;



	dev_info(disk_to_dev(dev->gd), "created from ubi%d:%d(%s)",

		 dev->ubi_num, dev->vol_id, vi->name);

	mutex_unlock(&devices_mutex);

	return 0;



out_destroy_wq:

	list_del(&dev->list);

	destroy_workqueue(dev->wq);

out_remove_minor:

	idr_remove(&ubiblock_minor_idr, gd->first_minor);

out_cleanup_disk: