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

!12115 md/raid1: don't free conf on raid0_run failure 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zheng Qixing <zhengqixing@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/W2IESS43RONPPIL2XEP72A5YT5LCNSOI/ 
 
https://gitee.com/openeuler/kernel/issues/IAUQ97 
 
Link:https://gitee.com/openeuler/kernel/pulls/12115

 

Reviewed-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Reviewed-by: default avatarYu Kuai <yukuai3@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents 03df122f bbf61660

drivers/md/raid1.c

+2 −10
Original line number Diff line number Diff line
@@ -3069,7 +3069,6 @@ static struct r1conf *setup_conf(struct mddev *mddev) 
	return ERR_PTR(err);

}



static void raid1_free(struct mddev *mddev, void *priv);

static int raid1_run(struct mddev *mddev)

{

	struct r1conf *conf;
@@ -3128,8 +3127,7 @@ static int raid1_run(struct mddev *mddev) 
	 */

	if (conf->raid_disks - mddev->degraded < 1) {

		md_unregister_thread(&conf->thread);

		ret = -EINVAL;

		goto abort;

		return -EINVAL;

	}



	if (conf->raid_disks - mddev->degraded == 1)
@@ -3162,14 +3160,8 @@ static int raid1_run(struct mddev *mddev) 
	}



	ret = md_integrity_register(mddev);

	if (ret) {

	if (ret)

		md_unregister_thread(&mddev->thread);

		goto abort;

	}

	return 0;



abort:

	raid1_free(mddev, conf);

	return ret;

}