- Update mdadm to latest upstream state upto commit 582945c2d3bb. (jsc#PED-7542) 1) The testing changes are not included here. 2) Code clean up, and more helper routines added for Manage.c, Monitor.c, mdadm.c, ReadMe.c, super-intel.c, super0.c, super1.c, Create.c, Incremental.c and so on. 3) Man page update for mdadm.8.in. 4) Several memory leak and double free fixes. 5) Check /etc/initrd-release for whether systemd running on an initrd. - Manage: Block unsafe member failing 0062-Manage-Block-unsafe-member-failing.patch - Mdmonitor: Split alert() into separate functions 0063-Mdmonitor-Split-alert-into-separate-functions.patch - Monitor: block if monitor modes are combined. 0064-Monitor-block-if-monitor-modes-are-combined.patch - Update mdadm Monitor manual. 0065-Update-mdadm-Monitor-manual.patch - mdadm: create ident_init() 0066-mdadm-create-ident_init.patch - mdadm: Add option validation for --update-subarray 0067-mdadm-Add-option-validation-for-update-subarray.patch - Fix --update-subarray on active volume 0068-Fix-update-subarray-on-active-volume.patch - Add code specific update options to enum. 0069-Add-code-specific-update-options-to-enum.patch - super-ddf: Remove update_super_ddf. 0070-super-ddf-Remove-update_super_ddf.patch - super0: refactor the code for enum 0071-super0-refactor-the-code-for-enum.patch - super1: refactor the code for enum OBS-URL: https://build.opensuse.org/request/show/1137473 OBS-URL: https://build.opensuse.org/package/show/Base:System/mdadm?expand=0&rev=231
39 lines
1.3 KiB
Diff
39 lines
1.3 KiB
Diff
From ef6236da232e968dcf08b486178cd20d5ea97e2a Mon Sep 17 00:00:00 2001
|
|
From: Mateusz Grzonka <mateusz.grzonka@intel.com>
|
|
Date: Thu, 23 Mar 2023 12:50:00 +0100
|
|
Subject: [PATCH] Create: Fix checking for container in update_metadata
|
|
|
|
The commit 8a4ce2c05386 ("Create: Factor out add_disks() helpers")
|
|
introduced a regression that caused timeouts and udev failing to create
|
|
links.
|
|
|
|
Steps to reproduce the issue were as following:
|
|
$ mdadm -CR imsm -e imsm -n4 /dev/nvme[0-3]n1
|
|
$ mdadm -CR vol -l5 -n4 /dev/nvme[0-3]n1 --assume-clean
|
|
|
|
I found the check for container was wrong because negation was missing.
|
|
|
|
Fixes: 8a4ce2c05386 ("Create: Factor out add_disks() helpers")
|
|
Signed-off-by: Mateusz Grzonka <mateusz.grzonka@intel.com>
|
|
Signed-off-by: Jes Sorensen <jes@trained-monkey.org>
|
|
---
|
|
Create.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/Create.c b/Create.c
|
|
index bbe9e13..0911bf9 100644
|
|
--- a/Create.c
|
|
+++ b/Create.c
|
|
@@ -328,7 +328,7 @@ static int update_metadata(int mdfd, struct shape *s, struct supertype *st,
|
|
* again returns container info.
|
|
*/
|
|
st->ss->getinfo_super(st, &info_new, NULL);
|
|
- if (st->ss->external && is_container(s->level) &&
|
|
+ if (st->ss->external && !is_container(s->level) &&
|
|
!same_uuid(info_new.uuid, info->uuid, 0)) {
|
|
map_update(map, fd2devnm(mdfd),
|
|
info_new.text_version,
|
|
--
|
|
2.35.3
|
|
|