Commit bbf61660 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Zheng Qixing
Browse files

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

mainline inclusion
from mainline-v6.11-rc1
commit 17f91ac0843b50462a9c9c8f18df962338bd3db2
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IAUQ97

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



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

The core md code calls the ->free method which already frees conf.

Fixes: 07f1a685 ("md/raid1: fail run raid1 array when active disk less than one")
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarSong Liu <song@kernel.org>
Link: https://lore.kernel.org/r/20240604172607.3185916-3-hch@lst.de


Conflicts:
            drivers/md/raid1.c
[The conflicts here are due to inconsistencies in the context.]
Signed-off-by: default avatarZheng Qixing <zhengqixing@huawei.com>
parent b0ac92b5

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;

}