Commit 17f91ac0 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Song Liu
Browse files

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



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
parent 35f20aca

drivers/md/raid1.c

+3 −11
Original line number Diff line number Diff line
@@ -3203,7 +3203,6 @@ static int raid1_set_limits(struct mddev *mddev) 
	return queue_limits_set(mddev->gendisk->queue, &lim);

}



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

static int raid1_run(struct mddev *mddev)

{

	struct r1conf *conf;
@@ -3237,7 +3236,7 @@ static int raid1_run(struct mddev *mddev) 
	if (!mddev_is_dm(mddev)) {

		ret = raid1_set_limits(mddev);

		if (ret)

			goto abort;

			return ret;

	}



	mddev->degraded = 0;
@@ -3251,8 +3250,7 @@ static int raid1_run(struct mddev *mddev) 
	 */

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

		md_unregister_thread(mddev, &conf->thread);

		ret = -EINVAL;

		goto abort;

		return -EINVAL;

	}



	if (conf->raid_disks - mddev->degraded == 1)
@@ -3276,14 +3274,8 @@ static int raid1_run(struct mddev *mddev) 
	md_set_array_sectors(mddev, raid1_size(mddev, 0, 0));



	ret = md_integrity_register(mddev);

	if (ret) {

	if (ret)

		md_unregister_thread(mddev, &mddev->thread);

		goto abort;

	}

	return 0;



abort:

	raid1_free(mddev, conf);

	return ret;

}