Unverified Commit 7dccb832 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!3782 [sync] PR-3447: dm: add error handling support for add_disk() 

Merge Pull Request from: @openeuler-sync-bot 
 

Origin pull request: 
https://gitee.com/openeuler/kernel/pulls/3447 
 
PR sync from: Li Lingfeng <lilingfeng3@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/O47KCPQTVDHFNQZDL4CKKZHYNB2JL6DE/ 
 
https://gitee.com/openeuler/kernel/issues/I81XCK 
 
Link:https://gitee.com/openeuler/kernel/pulls/3782

 

Reviewed-by: default avatarYu Kuai <yukuai3@huawei.com>
Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 4fc1571a 447a621a

drivers/md/dm.c

+10 −7
Original line number Diff line number Diff line
@@ -1853,13 +1853,11 @@ static struct mapped_device *alloc_dev(int minor) 
	 * established. If request-based table is loaded: blk-mq will

	 * override accordingly.

	 */

	md->queue = blk_alloc_queue(numa_node_id);

	if (!md->queue)

		goto bad;



	md->disk = alloc_disk_node(1, md->numa_node_id);

	md->disk = blk_alloc_disk(md->numa_node_id);

	if (!md->disk)

		goto bad;

	md->disk->minors = 1;

	md->queue = md->disk->queue;



	init_waitqueue_head(&md->wait);

	INIT_WORK(&md->work, dm_wq_work);
@@ -1873,11 +1871,16 @@ static struct mapped_device *alloc_dev(int minor) 
	md->disk->major = _major;

	md->disk->first_minor = minor;

	md->disk->fops = &dm_blk_dops;

	md->disk->queue = md->queue;

	md->disk->private_data = md;

	sprintf(md->disk->disk_name, "dm-%d", minor);



	add_disk_no_queue_reg(md->disk);

	r = add_disk_no_queue_reg_safe(md->disk);

	if (r) {

		blk_cleanup_disk(md->disk);

		md->queue = NULL;

		md->disk = NULL;

		goto bad;

	}



	if (IS_ENABLED(CONFIG_DAX_DRIVER)) {

		md->dax_dev = alloc_dax(md, md->disk->disk_name,