forked from pool/mdadm
5ab69e45ee
- Update mdadm-4.3 to latest status (jsc#PED-7542) - Remove hardcoded checkpoint interval checking 0001-Remove-hardcoded-checkpoint-interval-checking.patch - monitor: refactor checkpoint update 0002-monitor-refactor-checkpoint-update.patch - Super-intel: Fix first checkpoint restart 0003-Super-intel-Fix-first-checkpoint-restart.patch - Grow: Move update_tail assign to Grow_reshape() 0004-Grow-Move-update_tail-assign-to-Grow_reshape.patch - Add understanding output section in man 0005-Add-understanding-output-section-in-man.patch - Upgrade to mdadm-4.3 (jsc#PED-7542). Beside previous already back ported patches, mdadm-4.3 has the following extra changes since last update upto commit 582945c2d3bb, - Fix null pointer for incremental in mdadm. - Super1: fix truncation check for journal device. - Fix some cases eyesore formatting. - Bump minimum kernel version to 2.6.32. - Remove the config files in mdcheck_start|continue service. - Define DEV_MD_DIR, DEV_NUM_PREF, is_devname_ignore(), ident_set_devname(). - Enable RAID for SATA under VMD. - Imsm: Fix possible segfault in check_no_platform() - Imsm refactor on imsm_get_free_size(), merge_extents(). - Imsm: return free space after volume for expand. - Imsm: fix free space calculations. - Add secure gethostname() wrapper. - mdadm: Stop mdcheck_continue timer when mdcheck_start service can finish check. OBS-URL: https://build.opensuse.org/request/show/1149803 OBS-URL: https://build.opensuse.org/package/show/Base:System/mdadm?expand=0&rev=233
66 lines
2.2 KiB
Diff
66 lines
2.2 KiB
Diff
From ea2ca7ed3dbbf881ce08d80fe371f2aaf05011c3 Mon Sep 17 00:00:00 2001
|
|
From: Mateusz Kusiak <mateusz.kusiak@intel.com>
|
|
Date: Thu, 18 Jan 2024 11:30:18 +0100
|
|
Subject: [PATCH 4/5] Grow: Move update_tail assign to Grow_reshape()
|
|
Git-commit: ea2ca7ed3dbbf881ce08d80fe371f2aaf05011c3
|
|
Patch-mainline: mdadm-4.3+
|
|
References: jsc#PED-7542
|
|
|
|
Due to e919fb0af245 ("FIX: Enable metadata updates for raid0") code
|
|
can't enter super-intel.c:3415, resulting in checkpoint not being
|
|
saved to metadata for second volume in matrix raid array.
|
|
This results in checkpoint being stuck at last value for the
|
|
first volume.
|
|
|
|
Move st->update_tail to Grow_reshape() so it is assigned for each
|
|
volume.
|
|
|
|
Signed-off-by: Mateusz Kusiak <mateusz.kusiak@intel.com>
|
|
Signed-off-by: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
|
|
Signed-off-by: Coly Li <colyli@suse.de>
|
|
---
|
|
Grow.c | 13 +++++++------
|
|
1 file changed, 7 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/Grow.c b/Grow.c
|
|
index f95dae8..5498e54 100644
|
|
--- a/Grow.c
|
|
+++ b/Grow.c
|
|
@@ -2085,9 +2085,10 @@ int Grow_reshape(char *devname, int fd,
|
|
if (!mdmon_running(st->container_devnm))
|
|
start_mdmon(st->container_devnm);
|
|
ping_monitor(container);
|
|
- if (mdmon_running(st->container_devnm) &&
|
|
- st->update_tail == NULL)
|
|
- st->update_tail = &st->updates;
|
|
+ if (mdmon_running(st->container_devnm) == false) {
|
|
+ pr_err("No mdmon found. Grow cannot continue.\n");
|
|
+ goto release;
|
|
+ }
|
|
}
|
|
|
|
if (s->size == MAX_SIZE)
|
|
@@ -3048,6 +3049,8 @@ static int reshape_array(char *container, int fd, char *devname,
|
|
dprintf("Cannot get array information.\n");
|
|
goto release;
|
|
}
|
|
+ if (st->update_tail == NULL)
|
|
+ st->update_tail = &st->updates;
|
|
if (array.level == 0 && info->component_size == 0) {
|
|
get_dev_size(fd, NULL, &array_size);
|
|
info->component_size = array_size / array.raid_disks;
|
|
@@ -5152,9 +5155,7 @@ int Grow_continue_command(char *devname, int fd,
|
|
start_mdmon(container);
|
|
ping_monitor(container);
|
|
|
|
- if (mdmon_running(container))
|
|
- st->update_tail = &st->updates;
|
|
- else {
|
|
+ if (mdmon_running(container) == false) {
|
|
pr_err("No mdmon found. Grow cannot continue.\n");
|
|
ret_val = 1;
|
|
goto Grow_continue_command_exit;
|
|
--
|
|
2.35.3
|
|
|