| Message ID | 20240604172607.3185916-3-hch@lst.de (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Headers | show |
| Series | [1/2] md/raid0: don't free conf on raid0_run failure | expand |
| Context | Check | Description |
|---|---|---|
| mdraidci/vmtest-md-6_11-VM_Test-1 | success | Logs for ShellCheck |
| mdraidci/vmtest-md-6_11-VM_Test-2 | success | Logs for Unittests |
| mdraidci/vmtest-md-6_11-VM_Test-3 | success | Logs for Validate matrix.py |
| mdraidci/vmtest-md-6_11-VM_Test-7 | pending | Logs for x86_64-llvm-17 / build / build for x86_64 with llvm-17 |
| mdraidci/vmtest-md-6_11-VM_Test-9 | pending | Logs for x86_64-llvm-18 / build / build for x86_64 with llvm-18 |
| mdraidci/vmtest-md-6_11-VM_Test-6 | success | Logs for x86_64-gcc / build-release |
| mdraidci/vmtest-md-6_11-VM_Test-4 | success | Logs for set-matrix |
| mdraidci/vmtest-md-6_11-VM_Test-10 | pending | Logs for x86_64-llvm-18 / build-release / build for x86_64 with llvm-18 and -O2 optimization |
| mdraidci/vmtest-md-6_11-VM_Test-8 | pending | Logs for x86_64-llvm-17 / build-release / build for x86_64 with llvm-17 and -O2 optimization |
| mdraidci/vmtest-md-6_11-VM_Test-5 | pending | Logs for x86_64-gcc / build / build for x86_64 with gcc |
| mdraidci/vmtest-md-6_11-PR | success | PR summary |
| mdraidci/vmtest-md-6_11-VM_Test-0 | success | Logs for build-kernel |
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c index 7b8a71ca66dde0..1f321826ef02ba 100644 --- a/drivers/md/raid1.c +++ b/drivers/md/raid1.c @@ -3204,7 +3204,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; @@ -3238,7 +3237,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; @@ -3252,8 +3251,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) @@ -3277,14 +3275,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; }
The core md code calls the ->free method which already frees conf. Fixes: 07f1a6850c5d ("md/raid1: fail run raid1 array when active disk less than one") Signed-off-by: Christoph Hellwig <hch@lst.de> --- drivers/md/raid1.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-)