From: Zhihao Cheng <chengzhihao1@huawei.com>
To: <song@kernel.org>, <yukuai@fygo.io>, <shli@kernel.org>,
<neil@brown.name>
Cc: <linux-raid@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<chengzhihao1@huawei.com>, <yangerkun@huawei.com>,
<yi.zhang@huawei.com>
Subject: [PATCH v3 4/4] md/raid10: Don't free conf on raid10_run failure
Date: Wed, 23 Sep 2026 19:21:58 +0800 [thread overview]
Message-ID: <20260923112159.94175-5-chengzhihao1@huawei.com> (raw)
In-Reply-To: <20260923112159.94175-1-chengzhihao1@huawei.com>
Since all pers->run() callers handle the error case, no need to free
conf when raid10_run() fails.
Signed-off-by: Zhihao Cheng <chengzhihao1@huawei.com>
---
drivers/md/raid10.c | 22 ++++++++++------------
1 file changed, 10 insertions(+), 12 deletions(-)
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index 1093c798d9dd..9e4d4202f35c 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -3972,7 +3972,7 @@ static int raid10_run(struct mddev *mddev)
if (fc > 1 || fo > 0) {
pr_err("only near layout is supported by clustered"
" raid10\n");
- goto out_free_conf;
+ goto out_unregister_thread;
}
}
@@ -3989,11 +3989,11 @@ static int raid10_run(struct mddev *mddev)
if (test_bit(Replacement, &rdev->flags)) {
if (disk->replacement)
- goto out_free_conf;
+ goto out_unregister_thread;
disk->replacement = rdev;
} else {
if (disk->rdev)
- goto out_free_conf;
+ goto out_unregister_thread;
disk->rdev = rdev;
}
diff = (rdev->new_data_offset - rdev->data_offset);
@@ -4013,7 +4013,7 @@ static int raid10_run(struct mddev *mddev)
if (err) {
ret = err;
- goto out_free_conf;
+ goto out_unregister_thread;
}
}
@@ -4021,17 +4021,17 @@ static int raid10_run(struct mddev *mddev)
if (!enough(conf, -1)) {
pr_err("md/raid10:%s: not enough operational mirrors.\n",
mdname(mddev));
- goto out_free_conf;
+ goto out_unregister_thread;
}
if (conf->reshape_progress != MaxSector) {
/* must ensure that shape change is supported */
if (conf->geo.far_copies != 1 &&
conf->geo.far_offset == 0)
- goto out_free_conf;
+ goto out_unregister_thread;
if (conf->prev.far_copies != 1 &&
conf->prev.far_offset == 0)
- goto out_free_conf;
+ goto out_unregister_thread;
}
mddev->degraded = 0;
@@ -4081,7 +4081,7 @@ static int raid10_run(struct mddev *mddev)
set_bit(MD_FAILFAST_SUPPORTED, &mddev->flags);
if (md_integrity_register(mddev))
- goto out_free_conf;
+ goto out_unregister_thread;
if (conf->reshape_progress != MaxSector) {
unsigned long before_length, after_length;
@@ -4094,7 +4094,7 @@ static int raid10_run(struct mddev *mddev)
if (max(before_length, after_length) > min_offset_diff) {
/* This cannot work */
pr_warn("md/raid10: offset difference not enough to continue reshape\n");
- goto out_free_conf;
+ goto out_unregister_thread;
}
conf->offset_diff = min_offset_diff;
@@ -4106,10 +4106,8 @@ static int raid10_run(struct mddev *mddev)
return 0;
-out_free_conf:
+out_unregister_thread:
md_unregister_thread(mddev, &mddev->thread);
- raid10_free_conf(conf);
- mddev->private = NULL;
out:
return ret;
}
--
2.52.0
prev parent reply other threads:[~2026-09-23 11:30 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-23 11:21 [PATCH v3 0/4] md: Fix two raid5/raid10 bugs Zhihao Cheng
2026-09-23 11:21 ` [PATCH v3 1/4] md/raid5: Hide the origin mddev->thread before takeover Zhihao Cheng
2026-10-09 4:31 ` yu kuai
2026-10-09 7:12 ` Zhihao Cheng
2026-09-23 11:21 ` [PATCH v3 2/4] md: Handle pers->run failure in level_store Zhihao Cheng
2026-10-09 5:05 ` yu kuai
2026-09-23 11:21 ` [PATCH v3 3/4] md/raid5: Don't free conf on raid5_run failure Zhihao Cheng
2026-09-23 11:21 ` Zhihao Cheng [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260923112159.94175-5-chengzhihao1@huawei.com \
--to=chengzhihao1@huawei.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-raid@vger.kernel.org \
--cc=neil@brown.name \
--cc=shli@kernel.org \
--cc=song@kernel.org \
--cc=yangerkun@huawei.com \
--cc=yi.zhang@huawei.com \
--cc=yukuai@fygo.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®