.gitignore

@@ -1 +1,6 @@
-SOURCES/mdadm-4.2.tar.xz
+.build*
+clog
+*.src.rpm
+*/
+/mdadm-4.*.tar.xz
+/mdadm-4.4.tar.gz

.mdadm.metadata

@@ -1 +0,0 @@
-27f240cff200e00c28a486a028bcdb14f67f8790 SOURCES/mdadm-4.2.tar.xz

0001-Coverity-fixes-resources-leaks.patch

@@ -0,0 +1,91 @@
+From 8f54ce5b7eb0ca982803e270082e33f50897b9a6 Mon Sep 17 00:00:00 2001
+From: Nigel Croxon <ncroxon@redhat.com>
+Date: Mon, 4 Nov 2024 11:17:46 -0500
+Subject: [PATCH 01/37] Coverity fixes resources leaks
+
+Handle variable going out of scope leaks the handle.
+
+Signed-off-by: Nigel Croxon <ncroxon@redhat.com>
+---
+ Assemble.c    | 3 ++-
+ Incremental.c | 2 +-
+ bitmap.c      | 7 +++++--
+ 3 files changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/Assemble.c b/Assemble.c
+index 37a530ee..f8099cd3 100644
+--- a/Assemble.c
++++ b/Assemble.c
+@@ -753,6 +753,7 @@ static int load_devices(struct devs *devices, char *devmap,
+ 			tst->ss->free_super(tst);
+ 			free(tst);
+ 			*stp = st;
++			free(best);
+ 			return -1;
+ 		}
+ 		close(dfd);
+@@ -834,7 +835,6 @@ static int load_devices(struct devs *devices, char *devmap,
+ 				       inargv ? "the list" :
+ 				       "the\n      DEVICE list in mdadm.conf"
+ 					);
+-				free(best);
+ 				*stp = st;
+ 				goto error;
+ 			}
+@@ -857,6 +857,7 @@ error:
+ 	close(mdfd);
+ 	free(devices);
+ 	free(devmap);
++	free(best);
+ 	return -1;
+ 
+ }
+diff --git a/Incremental.c b/Incremental.c
+index aa5db3bf..9b455a12 100644
+--- a/Incremental.c
++++ b/Incremental.c
+@@ -282,7 +282,7 @@ int Incremental(struct mddev_dev *devlist, struct context *c,
+ 		 * clustering resource agents
+ 		 */
+ 		if (info.array.state & (1 << MD_SB_CLUSTERED))
+-			goto out;
++			goto out_unlock;
+ 
+ 		/* Couldn't find an existing array, maybe make a new one */
+ 		mdfd = create_mddev(match ? match->devname : NULL, name_to_use, trustworthy,
+diff --git a/bitmap.c b/bitmap.c
+index c62d18d4..3f8da63d 100644
+--- a/bitmap.c
++++ b/bitmap.c
+@@ -260,8 +260,11 @@ int ExamineBitmap(char *filename, int brief, struct supertype *st)
+ 		return rv;
+ 
+ 	info = bitmap_fd_read(fd, brief);
+-	if (!info)
++	if (!info) {
++		close_fd(&fd);
++		free(info);
+ 		return rv;
++	}
+ 	sb = &info->sb;
+ 	if (sb->magic != BITMAP_MAGIC) {
+ 		pr_err("This is an md array.  To view a bitmap you need to examine\n");
+@@ -336,7 +339,6 @@ int ExamineBitmap(char *filename, int brief, struct supertype *st)
+ 		printf("    Cluster name : %-64s\n", sb->cluster_name);
+ 		for (i = 0; i < (int)sb->nodes; i++) {
+ 			st = NULL;
+-			free(info);
+ 			fd = bitmap_file_open(filename, &st, i, fd);
+ 			if (fd < 0) {
+ 				printf("   Unable to open bitmap file on node: %i\n", i);
+@@ -347,6 +349,7 @@ int ExamineBitmap(char *filename, int brief, struct supertype *st)
+ 				printf("   Unable to read bitmap on node: %i\n", i);
+ 				continue;
+ 			}
++			free(sb);
+ 			sb = &info->sb;
+ 			if (sb->magic != BITMAP_MAGIC)
+ 				pr_err("invalid bitmap magic 0x%x, the bitmap file appears to be corrupted\n", sb->magic);
+-- 
+2.41.0
+

0002-Incremental-Document-workaround.patch

@@ -0,0 +1,64 @@
+From 7de5dc53bfbc3bae7d43fc81e51c7c56638004f6 Mon Sep 17 00:00:00 2001
+From: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
+Date: Mon, 4 Nov 2024 11:37:41 +0100
+Subject: [PATCH 02/37] Incremental: Document workaround
+
+Keep it documented in code.
+
+Signed-off-by: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
+---
+ Incremental.c | 28 ++++++++++++++++++++++------
+ 1 file changed, 22 insertions(+), 6 deletions(-)
+
+diff --git a/Incremental.c b/Incremental.c
+index 9b455a12..60d6f8cb 100644
+--- a/Incremental.c
++++ b/Incremental.c
+@@ -1693,15 +1693,30 @@ int Incremental_remove(char *devname, char *id_path, int verbose)
+ 
+ 	mdfd = open_dev_excl(ent->devnm);
+ 	if (is_fd_valid(mdfd)) {
++		char *array_state_file = "array_state";
++
++		/**
++		 * This is a workaround for the old issue.
++		 * Incremental_remove() triggered from udev rule when disk is removed from OS
++		 * tries to set array in auto-read-only mode. This can interrupt rebuild
++		 * process which is started automatically, e.g. if array is mounted and
++		 * spare disk is available (I/O errors limit might be achieved faster than disk is
++		 * removed by mdadm). Prevent Incremental_remove() from setting array
++		 * into "auto-read-only", by requiring  exclusive open to succeed.
++		 */
+ 		close_fd(&mdfd);
+-		if (sysfs_get_str(&mdi, NULL, "array_state",
+-				  buf, sizeof(buf)) > 0) {
+-			if (strncmp(buf, "active", 6) == 0 ||
+-			    strncmp(buf, "clean", 5) == 0)
+-				sysfs_set_str(&mdi, NULL,
+-					      "array_state", "read-auto");
++
++		if (sysfs_get_str(&mdi, NULL, array_state_file, buf, sizeof(buf)) > 0) {
++			char *str_read_auto = map_num_s(sysfs_array_states, ARRAY_READ_AUTO);
++			char *str_active = map_num_s(sysfs_array_states, ARRAY_ACTIVE);
++			char *str_clean = map_num_s(sysfs_array_states, ARRAY_CLEAN);
++
++			if (strncmp(buf, str_active, strlen(str_active)) == 0 ||
++			    strncmp(buf, str_clean, strlen(str_clean)) == 0)
++				sysfs_set_str(&mdi, NULL, array_state_file, str_read_auto);
+ 		}
+ 	}
++
+ 	mdfd = open_dev(ent->devnm);
+ 	if (mdfd < 0) {
+ 		if (verbose >= 0)
+@@ -1711,6 +1726,7 @@ int Incremental_remove(char *devname, char *id_path, int verbose)
+ 
+ 	if (id_path) {
+ 		struct map_ent *map = NULL, *me;
++
+ 		me = map_by_devnm(&map, ent->devnm);
+ 		if (me)
+ 			policy_save_path(id_path, me);
+-- 
+2.41.0
+

0003-sysfs-functions-for-writing-md-memb-state.patch

@@ -0,0 +1,164 @@
+From 42db5429cba52c7d86db965100873928e29c512b Mon Sep 17 00:00:00 2001
+From: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
+Date: Mon, 4 Nov 2024 15:08:30 +0100
+Subject: [PATCH 03/37] sysfs: functions for writing md/<memb>/state
+
+Add dedicated enum to reflect possible values for mentioned file.
+Not all values are mapped. Add map to present sysfs keywords.
+
+Signed-off-by: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
+---
+ Manage.c  |  4 +---
+ mdadm.h   | 19 +++++++++++++++++++
+ monitor.c | 12 ++++++------
+ sysfs.c   | 32 ++++++++++++++++++++++++++++++++
+ util.c    |  3 +--
+ 5 files changed, 59 insertions(+), 11 deletions(-)
+
+diff --git a/Manage.c b/Manage.c
+index b14a9ab9..d618a2f0 100644
+--- a/Manage.c
++++ b/Manage.c
+@@ -1675,9 +1675,7 @@ int Manage_subdevs(char *devname, int fd,
+ 			}
+ 		case 'I':
+ 			if (is_fd_valid(sysfd)) {
+-				static const char val[] = "faulty";
+-
+-				rv = sysfs_write_descriptor(sysfd, val, strlen(val), &err);
++				rv = sysfs_set_memb_state_fd(sysfd, MEMB_STATE_FAULTY, &err);
+ 			} else {
+ 				rv = ioctl(fd, SET_DISK_FAULTY, rdev);
+ 				if (rv)
+diff --git a/mdadm.h b/mdadm.h
+index ebb2ca18..218056c8 100644
+--- a/mdadm.h
++++ b/mdadm.h
+@@ -807,9 +807,28 @@ enum sysfs_read_flags {
+ 
+ #define SYSFS_MAX_BUF_SIZE 64
+ 
++/**
++ * Defines md/<disk>/state possible values.
++ * Note that remove can't be read-back from the file.
++ *
++ * This is not complete list.
++ */
++typedef enum memb_state {
++	MEMB_STATE_EXTERNAL_BBL,
++	MEMB_STATE_BLOCKED,
++	MEMB_STATE_SPARE,
++	MEMB_STATE_WRITE_MOSTLY,
++	MEMB_STATE_IN_SYNC,
++	MEMB_STATE_FAULTY,
++	MEMB_STATE_REMOVE,
++	MEMB_STATE_UNKNOWN
++} memb_state_t;
++char *map_memb_state(memb_state_t state);
++
+ extern mdadm_status_t sysfs_write_descriptor(const int fd, const char *value,
+ 					     const ssize_t len, int *errno_p);
+ extern mdadm_status_t write_attr(const char *value, const int fd);
++extern mdadm_status_t sysfs_set_memb_state_fd(int fd, memb_state_t state, int *err);
+ extern void sysfs_get_container_devnm(struct mdinfo *mdi, char *buf);
+ 
+ extern int sysfs_open(char *devnm, char *devname, char *attr);
+diff --git a/monitor.c b/monitor.c
+index 3c54f8cb..b771707a 100644
+--- a/monitor.c
++++ b/monitor.c
+@@ -140,17 +140,17 @@ int read_dev_state(int fd)
+ 
+ 	cp = buf;
+ 	while (cp) {
+-		if (sysfs_attr_match(cp, "faulty"))
++		if (sysfs_attr_match(cp, map_memb_state(MEMB_STATE_FAULTY)))
+ 			rv |= DS_FAULTY;
+-		if (sysfs_attr_match(cp, "in_sync"))
++		if (sysfs_attr_match(cp, map_memb_state(MEMB_STATE_IN_SYNC)))
+ 			rv |= DS_INSYNC;
+-		if (sysfs_attr_match(cp, "write_mostly"))
++		if (sysfs_attr_match(cp, map_memb_state(MEMB_STATE_WRITE_MOSTLY)))
+ 			rv |= DS_WRITE_MOSTLY;
+-		if (sysfs_attr_match(cp, "spare"))
++		if (sysfs_attr_match(cp, map_memb_state(MEMB_STATE_SPARE)))
+ 			rv |= DS_SPARE;
+-		if (sysfs_attr_match(cp, "blocked"))
++		if (sysfs_attr_match(cp, map_memb_state(MEMB_STATE_BLOCKED)))
+ 			rv |= DS_BLOCKED;
+-		if (sysfs_attr_match(cp, "external_bbl"))
++		if (sysfs_attr_match(cp, map_memb_state(MEMB_STATE_EXTERNAL_BBL)))
+ 			rv |= DS_EXTERNAL_BB;
+ 		cp = strchr(cp, ',');
+ 		if (cp)
+diff --git a/sysfs.c b/sysfs.c
+index a3bcb432..60b27459 100644
+--- a/sysfs.c
++++ b/sysfs.c
+@@ -75,6 +75,23 @@ void sysfs_free(struct mdinfo *sra)
+ 		sra = sra2;
+ 	}
+ }
++
++mapping_t sysfs_memb_states[] = {
++	{"external_bbl", MEMB_STATE_EXTERNAL_BBL},
++	{"blocked", MEMB_STATE_BLOCKED},
++	{"spare", MEMB_STATE_SPARE},
++	{"write_mostly", MEMB_STATE_WRITE_MOSTLY},
++	{"in_sync", MEMB_STATE_IN_SYNC},
++	{"faulty", MEMB_STATE_FAULTY},
++	{"remove",  MEMB_STATE_REMOVE},
++	{NULL,  MEMB_STATE_UNKNOWN}
++};
++
++char *map_memb_state(memb_state_t state)
++{
++	return map_num_s(sysfs_memb_states, state);
++}
++
+ /**
+  * write_attr() - write value to fd, don't check errno.
+  * @attr: value to write.
+@@ -117,6 +134,21 @@ mdadm_status_t sysfs_write_descriptor(const int fd, const char *value, const ssi
+ 	return MDADM_STATUS_SUCCESS;
+ }
+ 
++/**
++ * sysfs_set_memb_state_fd() - write to md/<memb>/state file.
++ * @fd: open file descriptor to the file.
++ * @state: enum value describing value to write
++ * @err: errno value pointer in case of error.
++ *
++ * This is helper to avoid inlining values, they are extracted from map now.
++ */
++mdadm_status_t sysfs_set_memb_state_fd(int fd, memb_state_t state, int *err)
++{
++	const char *val = map_memb_state(state);
++
++	return sysfs_write_descriptor(fd, val, strlen(val), err);
++}
++
+ /**
+  * sysfs_get_container_devnm() - extract container device name.
+  * @mdi: md_info describes member array, with GET_VERSION option.
+diff --git a/util.c b/util.c
+index a120c985..6aa44a80 100644
+--- a/util.c
++++ b/util.c
+@@ -1808,12 +1808,11 @@ int hot_remove_disk(int mdfd, unsigned long dev, int force)
+ 
+ int sys_hot_remove_disk(int statefd, int force)
+ {
+-	static const char val[] = "remove";
+ 	int cnt = force ? 500 : 5;
+ 
+ 	while (cnt--) {
+ 		int err = 0;
+-		int ret = sysfs_write_descriptor(statefd, val, strlen(val), &err);
++		int ret = sysfs_set_memb_state_fd(statefd, MEMB_STATE_REMOVE, &err);
+ 
+ 		if (ret == MDADM_STATUS_SUCCESS)
+ 			return 0;
+-- 
+2.41.0
+

0004-Incremental-Simplify-remove-logic.patch

@@ -0,0 +1,259 @@
+From b9888145987e273a7613209721a68f75e060263e Mon Sep 17 00:00:00 2001
+From: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
+Date: Tue, 5 Nov 2024 13:07:16 +0100
+Subject: [PATCH 04/37] Incremental: Simplify remove logic
+
+Incremental_remove() does not execute Manage_subdevs() now.
+
+Signed-off-by: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
+---
+ Incremental.c | 116 ++++++++++++++++++++++++++++++++------------------
+ Manage.c      |  10 ++---
+ mdadm.h       |   1 +
+ sysfs.c       |  23 ++++++++++
+ 4 files changed, 102 insertions(+), 48 deletions(-)
+
+diff --git a/Incremental.c b/Incremental.c
+index 60d6f8cb..228d2bdd 100644
+--- a/Incremental.c
++++ b/Incremental.c
+@@ -1610,22 +1610,6 @@ release:
+ 	return rv;
+ }
+ 
+-static void remove_from_member_array(struct mdstat_ent *memb,
+-				    struct mddev_dev *devlist, int verbose)
+-{
+-	int subfd = open_dev(memb->devnm);
+-
+-	if (subfd >= 0) {
+-		/*
+-		 * Ignore the return value because it's necessary
+-		 * to handle failure condition here.
+-		 */
+-		Manage_subdevs(memb->devnm, subfd, devlist, verbose,
+-			       0, UOPT_UNDEFINED, 0);
+-		close(subfd);
+-	}
+-}
+-
+ /**
+  * is_devnode_path() - check if the devname passed might be devnode path.
+  * @devnode: the path to check.
+@@ -1646,25 +1630,81 @@ static bool is_devnode_path(char *devnode)
+ 	return false;
+ }
+ 
++/**
++ * Incremental_remove_external() - Remove the device from external container.
++ * @device_devnm: block device to remove.
++ * @container_devnm: the parent container
++ * @mdstat: mdstat file content.
++ * @verbose: verbose flag.
++ *
++ * Fail member device in each subarray and remove member device from external container.
++ * The resposibility of removing member disks from external subararys belongs to mdmon.
++ */
++static mdadm_status_t Incremental_remove_external(char *device_devnm, char *container_devnm,
++						  struct mdstat_ent *mdstat, int verbose)
++{
++	mdadm_status_t rv = MDADM_STATUS_SUCCESS;
++	struct mdstat_ent *memb;
++
++	for (memb = mdstat ; memb ; memb = memb->next) {
++		mdadm_status_t ret = MDADM_STATUS_SUCCESS;
++		int state_fd;
++
++		if (!is_container_member(memb, container_devnm))
++			continue;
++
++		/*
++		 * Checking mdstat is pointles because it might be outdated, try open descriptor
++		 * instead. If it fails, we are fine with that, device is already gone.
++		 */
++		state_fd = sysfs_open_memb_attr(memb->devnm, device_devnm, "state", O_RDWR);
++		if (!is_fd_valid(state_fd))
++			continue;
++
++		ret = sysfs_set_memb_state_fd(state_fd, MEMB_STATE_FAULTY, NULL);
++		if (ret && verbose >= 0)
++			pr_err("Cannot fail member device %s in external subarray %s.\n",
++				device_devnm, memb->devnm);
++
++		close_fd(&state_fd);
++
++		/*
++		 * Don't remove member device from container if it failed to remove it
++		 * from any member array.
++		 */
++		rv |= ret;
++	}
++
++	if (rv == MDADM_STATUS_SUCCESS)
++		rv = sysfs_set_memb_state(container_devnm, device_devnm, MEMB_STATE_REMOVE);
++
++	if (rv && verbose >= 0)
++		pr_err("Cannot remove member device %s from container %s.\n", device_devnm,
++		       container_devnm);
++
++	return rv;
++}
++
+ /**
+  * Incremental_remove() - Remove the device from all raid arrays.
+  * @devname: the device we want to remove, it could be kernel device name or devnode.
+  * @id_path: optional, /dev/disk/by-path path to save for bare scenarios support.
+  * @verbose: verbose flag.
+  *
+- * First, fail the device (if needed) and then remove the device from native raid array or external
+- * container.  If it is external container, the device is removed from each subarray first.
++ * First, fail the device (if needed) and then remove the device. This code is critical for system
++ * funtionality and that is why it is keept as simple as possible. We do not load devices using
++ * sysfs_read() because any unerelated failure may lead us to abort. We also do not call
++ * Manage_Subdevs().
+  */
+ int Incremental_remove(char *devname, char *id_path, int verbose)
+ {
++	mdadm_status_t rv = MDADM_STATUS_SUCCESS;
+ 	char *devnm = basename(devname);
+-	struct mddev_dev devlist = {0};
+ 	char buf[SYSFS_MAX_BUF_SIZE];
+ 	struct mdstat_ent *mdstat;
+ 	struct mdstat_ent *ent;
+ 	struct mdinfo mdi;
+-	int rv = 1;
+-	int mdfd;
++	int mdfd = -1;
+ 
+ 	if (strcmp(devnm, devname) != 0)
+ 		if (!is_devnode_path(devname)) {
+@@ -1733,32 +1773,24 @@ int Incremental_remove(char *devname, char *id_path, int verbose)
+ 		map_free(map);
+ 	}
+ 
+-	devlist.devname = devnm;
+-	devlist.disposition = 'I';
+-	/* for a container, we must fail each member array */
+ 	if (is_mdstat_ent_external(ent)) {
+-		struct mdstat_ent *memb;
+-		for (memb = mdstat ; memb ; memb = memb->next) {
+-			if (is_container_member(memb, ent->devnm))
+-				remove_from_member_array(memb,
+-					&devlist, verbose);
+-		}
+-	} else {
+-		/*
+-		 * This 'I' incremental remove is a try-best effort,
+-		 * the failure condition can be safely ignored
+-		 * because of the following up 'r' remove.
+-		 */
+-		Manage_subdevs(ent->devnm, mdfd, &devlist,
+-			       verbose, 0, UOPT_UNDEFINED, 0);
++		rv = Incremental_remove_external(devnm, ent->devnm, mdstat, verbose);
++		goto out;
+ 	}
+ 
+-	devlist.disposition = 'r';
+-	rv = Manage_subdevs(ent->devnm, mdfd, &devlist,
+-			    verbose, 0, UOPT_UNDEFINED, 0);
++	/* Native arrays are handled separatelly to provide more detailed error handling */
++	rv = sysfs_set_memb_state(ent->devnm, devnm, MEMB_STATE_FAULTY);
++	if (rv && verbose >= 0)
++		pr_err("Cannot fail member device %s in array %s.\n", devnm, ent->devnm);
++
++	if (rv == MDADM_STATUS_SUCCESS)
++		rv = sysfs_set_memb_state(ent->devnm, devnm, MEMB_STATE_REMOVE);
++
++	if (rv && verbose >= 0)
++		pr_err("Cannot remove member device %s from %s.\n", devnm, ent->devnm);
+ 
+-	close_fd(&mdfd);
+ out:
++	close_fd(&mdfd);
+ 	free_mdstat(mdstat);
+ 	return rv;
+ }
+diff --git a/Manage.c b/Manage.c
+index d618a2f0..034eb00c 100644
+--- a/Manage.c
++++ b/Manage.c
+@@ -1381,8 +1381,6 @@ bool is_remove_safe(mdu_array_info_t *array, const int fd, char *devname, const
+  * 'f' - set the device faulty SET_DISK_FAULTY
+  *       device can be 'detached' in which case any device that
+  *       is inaccessible will be marked faulty.
+- * 'I' - remove device by using incremental fail
+- *       which is executed when device is removed surprisingly.
+  * 'R' - mark this device as wanting replacement.
+  * 'W' - this device is added if necessary and activated as
+  *       a replacement for a previous 'R' device.
+@@ -1544,9 +1542,9 @@ int Manage_subdevs(char *devname, int fd,
+ 
+ 			/* This is a kernel-internal name like 'sda1' */
+ 
+-			if (!strchr("rfI", dv->disposition)) {
+-				pr_err("%s only meaningful with -r, -f or -I, not -%c\n",
+-					dv->devname, dv->disposition);
++			if (!strchr("rf", dv->disposition)) {
++				pr_err("%s only meaningful with -r, -f, not -%c\n", dv->devname,
++				       dv->disposition);
+ 				goto abort;
+ 			}
+ 
+@@ -1673,7 +1671,7 @@ int Manage_subdevs(char *devname, int fd,
+ 				close_fd(&sysfd);
+ 				goto abort;
+ 			}
+-		case 'I':
++
+ 			if (is_fd_valid(sysfd)) {
+ 				rv = sysfs_set_memb_state_fd(sysfd, MEMB_STATE_FAULTY, &err);
+ 			} else {
+diff --git a/mdadm.h b/mdadm.h
+index 218056c8..77705b11 100644
+--- a/mdadm.h
++++ b/mdadm.h
+@@ -829,6 +829,7 @@ extern mdadm_status_t sysfs_write_descriptor(const int fd, const char *value,
+ 					     const ssize_t len, int *errno_p);
+ extern mdadm_status_t write_attr(const char *value, const int fd);
+ extern mdadm_status_t sysfs_set_memb_state_fd(int fd, memb_state_t state, int *err);
++extern mdadm_status_t sysfs_set_memb_state(char *array_devnm, char *memb_devnm, memb_state_t state);
+ extern void sysfs_get_container_devnm(struct mdinfo *mdi, char *buf);
+ 
+ extern int sysfs_open(char *devnm, char *devname, char *attr);
+diff --git a/sysfs.c b/sysfs.c
+index 60b27459..c030d634 100644
+--- a/sysfs.c
++++ b/sysfs.c
+@@ -149,6 +149,29 @@ mdadm_status_t sysfs_set_memb_state_fd(int fd, memb_state_t state, int *err)
+ 	return sysfs_write_descriptor(fd, val, strlen(val), err);
+ }
+ 
++/**
++ * sysfs_set_memb_state() - write to member disk state file.
++ * @array_devnm: kernel name of the array.
++ * @memb_devnm: kernel name of member device.
++ * @state: value to write.
++ *
++ * Function expects that the device exists, error is unconditionally printed.
++ */
++mdadm_status_t sysfs_set_memb_state(char *array_devnm, char *memb_devnm, memb_state_t state)
++{
++	int state_fd = sysfs_open_memb_attr(array_devnm, memb_devnm, "state", O_RDWR);
++
++	if (!is_fd_valid(state_fd)) {
++		pr_err("Cannot open file descriptor to %s in array %s, aborting.\n",
++		       memb_devnm, array_devnm);
++			return MDADM_STATUS_ERROR;
++	}
++
++	return sysfs_set_memb_state_fd(state_fd, state, NULL);
++
++	close_fd(&state_fd);
++}
++
+ /**
+  * sysfs_get_container_devnm() - extract container device name.
+  * @mdi: md_info describes member array, with GET_VERSION option.
+-- 
+2.41.0
+

0005-checkpatch.conf-ignore-NEW_TYPEDEFS.patch

@@ -0,0 +1,24 @@
+From 143d94f684b738d1aa89024b182ad4cfa1b9018b Mon Sep 17 00:00:00 2001
+From: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
+Date: Tue, 12 Nov 2024 14:05:11 +0100
+Subject: [PATCH 05/37] checkpatch.conf: ignore NEW_TYPEDEFS
+
+In mdadm, we have more flexible apporach to typedefs.
+
+Signed-off-by: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
+---
+ .github/tools/.checkpatch.conf | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/.github/tools/.checkpatch.conf b/.github/tools/.checkpatch.conf
+index d6e3bc44..03114847 100644
+--- a/.github/tools/.checkpatch.conf
++++ b/.github/tools/.checkpatch.conf
+@@ -8,3 +8,4 @@
+ --exclude tests
+ --ignore FILE_PATH_CHANGES
+ --ignore EMAIL_SUBJECT
++--ignore NEW_TYPEDEFS
+-- 
+2.41.0
+

0006-mdadm-add-MAINTAINERS-file.patch

@@ -0,0 +1,55 @@
+From 7f57f9b79dada30cdc64de1d2fe7541093c5b4e3 Mon Sep 17 00:00:00 2001
+From: Nigel Croxon <ncroxon@redhat.com>
+Date: Thu, 9 Jan 2025 15:09:51 -0500
+Subject: [PATCH 06/37] mdadm: add MAINTAINERS file
+
+Create a maintainers file to keep track of people
+to contact when dealing with mdadm questions/issues.
+
+Signed-off-by: Nigel Croxon <ncroxon@redhat.com>
+---
+ MAINTAINERS | 32 ++++++++++++++++++++++++++++++++
+ 1 file changed, 32 insertions(+)
+ create mode 100644 MAINTAINERS
+
+diff --git a/MAINTAINERS b/MAINTAINERS
+new file mode 100644
+index 00000000..0a1229fd
+--- /dev/null
++++ b/MAINTAINERS
+@@ -0,0 +1,32 @@
++
++# List of maintainers for mdadm
++
++
++Descriptions of section entries:
++
++M:	Mail patches to: FullName <address@domain>
++L:	Mailing list that is relevant to mdadm
++
++
++Alphabetical Order:
++
++M:	Blazej Kucman <blazej.kucman@linux.intel.com>
++L:	linux-raid@vger.kernel.org
++
++M:	Mateusz Kusiak <mateusz.kusiak@intel.com>
++L:	linux-raid@vger.kernel.org
++
++M:	Mariusz Tkaczyk <mtkaczyk@kernel.org>
++L:	linux-raid@vger.kernel.org
++
++M:	Nigel Croxon <ncroxon@redhat.com>
++L:	linux-raid@vger.kernel.org
++
++M:	Song Liu <song@kernel.org>
++L:	linux-raid@vger.kernel.org
++
++M:	Xiao Ni <xni@redhat.com>
++L:	linux-raid@vger.kernel.org
++
++M:	Yu Kuai <yukuai@kernel.org>
++L:	linux-raid@vger.kernel.org
+-- 
+2.41.0
+

0007-mdadm.man-Remove-external-bitmap.patch

@@ -0,0 +1,127 @@
+From ef4b6a23189d804bfd8fa81f5038afe6ce825bde Mon Sep 17 00:00:00 2001
+From: Mariusz Tkaczyk <mtkaczyk@kernel.org>
+Date: Tue, 7 Jan 2025 10:09:16 +0100
+Subject: [PATCH 07/37] mdadm.man: Remove external bitmap
+
+Remove  external bitmap support from manual.
+
+Signed-off-by: Mariusz Tkaczyk <mtkaczyk@kernel.org>
+---
+ mdadm.8.in | 55 ++++++------------------------------------------------
+ 1 file changed, 6 insertions(+), 49 deletions(-)
+
+diff --git a/mdadm.8.in b/mdadm.8.in
+index 2b6f3e50..83c0689f 100644
+--- a/mdadm.8.in
++++ b/mdadm.8.in
+@@ -740,27 +740,11 @@ parameter and are stored internally.
+ .B none
+ - create array with no bitmap or remove any present bitmap (grow mode).
+ 
+-Setting bitmap for file is deprecated and should not be used. The file should not exist unless
+-.B \-\-force
+-is also given. The same file should be provided when assembling the array. The file name must
+-contain at least one slash ('/'). Bitmap files are only known to work on ext2 and ext3. Storing
+-bitmap files on other filesystems may result in serious problems.
+-
+-When creating an array on devices which are 100G or larger,
+-.I mdadm
+-automatically adds an internal bitmap as it will usually be
+-beneficial.  This can be suppressed with
+-.B "\-\-bitmap=none"
+-or by selecting a different consistency policy with
+-.BR \-\-consistency\-policy .
+-
+ .TP
+ .BR \-\-bitmap\-chunk=
+ Set the chunk size of the bitmap.  Each bit corresponds to that many
+ Kilobytes of storage.
+-When using a file-based bitmap, the default is to use the smallest
+-size that is at least 4 and requires no more than 2^21 chunks.
+-When using an
++
+ .B internal
+ bitmap, the chunk size defaults to 64Meg, or larger if necessary to
+ fit the bitmap into the available space.
+@@ -1108,13 +1092,6 @@ are present.  This is only needed with
+ and can be used if the physical connections to devices are
+ not as reliable as you would like.
+ 
+-.TP
+-.BR \-b ", " \-\-bitmap=
+-Specify the bitmap file that was given when the array was created.  If
+-an array has an
+-.B internal
+-bitmap, there is no need to specify this when assembling the array.
+-
+ .TP
+ .BR \-\-backup\-file=
+ If
+@@ -1614,9 +1591,8 @@ applies to a whole array which is currently active.
+ 
+ .TP
+ .BR \-X ", " \-\-examine\-bitmap
+-Report information about a bitmap file.
+-The argument is either an external bitmap file or an array component
+-in case of an internal bitmap.  Note that running this on an array
++Report information about a bitmap.
++The argument is an array component. Note that running this on an array
+ device (e.g.
+ .BR /dev/md0 )
+ does not report the bitmap for that array.
+@@ -1774,10 +1750,7 @@ Only meaningful with
+ this will scan the
+ .B map
+ file for arrays that are being incrementally assembled and will try to
+-start any that are not already started.  If any such array is listed
+-in
+-.B mdadm.conf
+-as requiring an external bitmap, that bitmap will be attached first.
++start any that are not already started.
+ 
+ .TP
+ .BR \-\-fail ", " \-f
+@@ -2151,15 +2124,7 @@ setting.
+ .\".B \-\-size
+ .\"is given, the apparent size of the smallest drive given is used.
+ 
+-If the array type supports a write-intent bitmap, and if the devices
+-in the array exceed 100G is size, an internal write-intent bitmap
+-will automatically be added unless some other option is explicitly
+-requested with the
+-.B \-\-bitmap
+-option or a different consistency policy is selected with the
+-.B \-\-consistency\-policy
+-option. In any case, space for a bitmap will be reserved so that one
+-can be added later with
++Space for a bitmap will be reserved so that one can be added later with
+ .BR "\-\-grow \-\-bitmap=internal" .
+ 
+ If the metadata type supports it (currently only 1.x and IMSM metadata),
+@@ -2735,11 +2700,6 @@ Also, the size of an array cannot be changed while it has an active
+ bitmap.  If an array has a bitmap, it must be removed before the size
+ can be changed. Once the change is complete a new bitmap can be created.
+ 
+-.PP
+-Note:
+-.B "--grow --size"
+-is not yet supported for external file bitmap.
+-
+ .SS RAID\-DEVICES CHANGES
+ 
+ A RAID1 array can work with any number of devices from 1 upwards
+@@ -2834,10 +2794,7 @@ stored on the device being reshaped.
+ .SS BITMAP CHANGES
+ 
+ A write-intent bitmap can be added to, or removed from, an active
+-array.  Either internal bitmaps, or bitmaps stored in a separate file,
+-can be added.  Note that if you add a bitmap stored in a file which is
+-in a filesystem that is on the RAID array being affected, the system
+-will deadlock.  The bitmap must be on a separate filesystem.
++array.
+ 
+ .SS CONSISTENCY POLICY CHANGES
+ 
+-- 
+2.41.0
+

0008-Remove-freeze-reshape-logic.patch

@@ -0,0 +1,223 @@
+From cbc1cd589496a4ae16eb226a7fbad71a7d3d842d Mon Sep 17 00:00:00 2001
+From: Mateusz Kusiak <mateusz.kusiak@intel.com>
+Date: Wed, 16 Oct 2024 10:48:08 +0000
+Subject: [PATCH 08/37] Remove --freeze-reshape logic
+
+This commit removes --freeze-reshape logic, it basicaly reverts
+commit b76b30e0f950 ("Do not continue reshape during initrd phase").
+--freeze-reshape was supposed to be used to restore critical sector in
+incremental and assemble operations without starting a reshape process,
+but it's meaning has been lost through the years and it is not
+currently used.
+
+A replacement for this logic will be added in incoming patches, so
+reshapes won't be started in initrd phrase.
+
+Signed-off-by: Mateusz Kusiak <mateusz.kusiak@intel.com>
+---
+ Grow.c     | 30 +++++++-----------------------
+ ReadMe.c   |  1 -
+ mdadm.8.in | 37 -------------------------------------
+ mdadm.c    |  6 ------
+ mdadm.h    |  2 --
+ 5 files changed, 7 insertions(+), 69 deletions(-)
+
+diff --git a/Grow.c b/Grow.c
+index cc1be6cc..0d9e3b53 100644
+--- a/Grow.c
++++ b/Grow.c
+@@ -1746,7 +1746,7 @@ static int reshape_array(char *container, int fd, char *devname,
+ 			 int force, struct mddev_dev *devlist,
+ 			 unsigned long long data_offset,
+ 			 char *backup_file, int verbose, int forked,
+-			 int restart, int freeze_reshape);
++			 int restart);
+ static int reshape_container(char *container, char *devname,
+ 			     int mdfd,
+ 			     struct supertype *st,
+@@ -2341,7 +2341,7 @@ size_change_error:
+ 		sync_metadata(st);
+ 		rv = reshape_array(container, fd, devname, st, &info, c->force,
+ 				   devlist, s->data_offset, c->backup_file,
+-				   c->verbose, 0, 0, 0);
++				   c->verbose, 0, 0);
+ 		frozen = 0;
+ 	}
+ release:
+@@ -3000,7 +3000,7 @@ static int reshape_array(char *container, int fd, char *devname,
+ 			 int force, struct mddev_dev *devlist,
+ 			 unsigned long long data_offset,
+ 			 char *backup_file, int verbose, int forked,
+-			 int restart, int freeze_reshape)
++			 int restart)
+ {
+ 	struct reshape reshape;
+ 	int spares_needed;
+@@ -3484,14 +3484,6 @@ started:
+ 	}
+ 	if (restart)
+ 		sysfs_set_str(sra, NULL, "array_state", "active");
+-	if (freeze_reshape) {
+-		free(fdlist);
+-		free(offsets);
+-		sysfs_free(sra);
+-		pr_err("Reshape has to be continued from location %llu when root filesystem has been mounted.\n",
+-			sra->reshape_progress);
+-		return 1;
+-	}
+ 
+ 	if (!forked)
+ 		if (continue_via_systemd(container ?: sra->sys_name,
+@@ -3688,7 +3680,7 @@ int reshape_container(char *container, char *devname,
+ 	 */
+ 	ping_monitor(container);
+ 
+-	if (!forked && !c->freeze_reshape)
++	if (!forked)
+ 		if (continue_via_systemd(container, GROW_SERVICE, NULL))
+ 			return 0;
+ 
+@@ -3698,8 +3690,7 @@ int reshape_container(char *container, char *devname,
+ 		unfreeze(st);
+ 		return 1;
+ 	default: /* parent */
+-		if (!c->freeze_reshape)
+-			printf("%s: multi-array reshape continues in background\n", Name);
++		printf("%s: multi-array reshape continues in background\n", Name);
+ 		return 0;
+ 	case 0: /* child */
+ 		manage_fork_fds(0);
+@@ -3797,15 +3788,9 @@ int reshape_container(char *container, char *devname,
+ 
+ 		rv = reshape_array(container, fd, adev, st,
+ 				   content, c->force, NULL, INVALID_SECTORS,
+-				   c->backup_file, c->verbose, 1, restart,
+-				   c->freeze_reshape);
++				   c->backup_file, c->verbose, 1, restart);
+ 		close(fd);
+ 
+-		if (c->freeze_reshape) {
+-			sysfs_free(cc);
+-			exit(0);
+-		}
+-
+ 		restart = 0;
+ 		if (rv)
+ 			break;
+@@ -5220,8 +5205,7 @@ int Grow_continue(int mdfd, struct supertype *st, struct mdinfo *info,
+ 	} else
+ 		ret_val = reshape_array(NULL, mdfd, "array", st, info, 1,
+ 					NULL, INVALID_SECTORS, c->backup_file,
+-					0, forked, 1 | info->reshape_active,
+-					c->freeze_reshape);
++					0, forked, 1 | info->reshape_active);
+ 
+ 	return ret_val;
+ }
+diff --git a/ReadMe.c b/ReadMe.c
+index 9c29723f..c2415c26 100644
+--- a/ReadMe.c
++++ b/ReadMe.c
+@@ -158,7 +158,6 @@ struct option long_options[] = {
+ 	{"scan", 0, 0, 's'},
+ 	{"force", 0, 0, Force},
+ 	{"update", 1, 0, 'U'},
+-	{"freeze-reshape", 0, 0, FreezeReshape},
+ 
+ 	/* Management */
+ 	{"add", 0, 0, Add},
+diff --git a/mdadm.8.in b/mdadm.8.in
+index 83c0689f..45255521 100644
+--- a/mdadm.8.in
++++ b/mdadm.8.in
+@@ -880,31 +880,6 @@ different versions of
+ .I mdadm
+ are used to add different devices).
+ 
+-.TP
+-.BR \-\-continue
+-This option is complementary to the
+-.B \-\-freeze-reshape
+-option for assembly. It is needed when
+-.B \-\-grow
+-operation is interrupted and it is not restarted automatically due to
+-.B \-\-freeze-reshape
+-usage during array assembly.  This option is used together with
+-.BR \-G
+-, (
+-.BR \-\-grow
+-) command and device for a pending reshape to be continued.
+-All parameters required for reshape continuation will be read from array metadata.
+-If initial
+-.BR \-\-grow
+-command had required
+-.BR \-\-backup\-file=
+-option to be set, continuation option will require to have exactly the same
+-backup file given as well.
+-.IP
+-Any other parameter passed together with
+-.BR \-\-continue
+-option will be ignored.
+-
+ .TP
+ .BR \-N ", " \-\-name=
+ Set a
+@@ -1302,18 +1277,6 @@ or
+ and allows the array to be again used on a kernel prior to Linux 5.3.
+ This option should be used with great caution.
+ 
+-.TP
+-.BR \-\-freeze\-reshape
+-This option is intended to be used in start-up scripts during the initrd boot phase.
+-When the array under reshape is assembled during the initrd phase, this option
+-stops the reshape after the reshape-critical section has been restored. This happens
+-before the file system pivot operation and avoids loss of filesystem context.
+-Losing file system context would cause reshape to be broken.
+-
+-Reshape can be continued later using the
+-.B \-\-continue
+-option for the grow command.
+-
+ .SH For Manage mode:
+ 
+ .TP
+diff --git a/mdadm.c b/mdadm.c
+index 7d3b656b..a72058b4 100644
+--- a/mdadm.c
++++ b/mdadm.c
+@@ -710,12 +710,6 @@ int main(int argc, char *argv[])
+ 		case O(MANAGE,Force): /* add device which is too large */
+ 			c.force = 1;
+ 			continue;
+-			/* now for the Assemble options */
+-		case O(ASSEMBLE, FreezeReshape):   /* Freeze reshape during
+-						    * initrd phase */
+-		case O(INCREMENTAL, FreezeReshape):
+-			c.freeze_reshape = 1;
+-			continue;
+ 		case O(CREATE,'u'): /* uuid of array */
+ 		case O(ASSEMBLE,'u'): /* uuid of array */
+ 			if (ident.uuid_set) {
+diff --git a/mdadm.h b/mdadm.h
+index 77705b11..6062e167 100644
+--- a/mdadm.h
++++ b/mdadm.h
+@@ -530,7 +530,6 @@ enum special_options {
+ 	RebuildMapOpt,
+ 	InvalidBackup,
+ 	UdevRules,
+-	FreezeReshape,
+ 	Continue,
+ 	OffRootOpt,
+ 	Prefer,
+@@ -680,7 +679,6 @@ struct context {
+ 	int	scan;
+ 	int	SparcAdjust;
+ 	int	delay;
+-	int	freeze_reshape;
+ 	char	*backup_file;
+ 	int	invalid_backup;
+ 	char	*action;
+-- 
+2.41.0
+

0009-Detail-Export-reshape-status.patch

@@ -0,0 +1,33 @@
+From 25267bcc1eb403b2d837069289990afdc097031f Mon Sep 17 00:00:00 2001
+From: Mateusz Kusiak <mateusz.kusiak@intel.com>
+Date: Wed, 9 Oct 2024 11:24:13 +0000
+Subject: [PATCH 09/37] Detail: Export reshape status
+
+Display if there's an ongoing reshape happening in mdadm --detail
+--export output.
+
+This change is needed for incoming patches that will change "grow
+continue" udev rules, to be based on actual array state.
+
+Signed-off-by: Mateusz Kusiak <mateusz.kusiak@intel.com>
+---
+ Detail.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/Detail.c b/Detail.c
+index 5819ced9..b804a624 100644
+--- a/Detail.c
++++ b/Detail.c
+@@ -290,6 +290,9 @@ int Detail(char *dev, struct context *c)
+ 
+ 		map_free(map);
+ 		if (st && st->sb) {
++			if (info)
++				printf("MD_RESHAPE_ACTIVE=%s\n",
++				       info->reshape_active ? "True" : "False");
+ 			if (st->ss->export_detail_super)
+ 				st->ss->export_detail_super(st);
+ 		}
+-- 
+2.41.0
+

0010-mdadm-Do-not-start-reshape-before-switchroot.patch

@@ -0,0 +1,217 @@
+From 8a0d3fea424c1c19c51993c0849ea76ea41e8003 Mon Sep 17 00:00:00 2001
+From: Mateusz Kusiak <mateusz.kusiak@intel.com>
+Date: Thu, 10 Oct 2024 10:31:06 +0000
+Subject: [PATCH 10/37] mdadm: Do not start reshape before switchroot
+
+There are numerous issues for --grow --continue in switchroot phrase,
+they include:
+* Events being missed for restarting grow-continue service. This is
+  apparent mostly on OS on RAID scenarios. When a checkpoint (next step)
+  is committed, we have no reliable way to gracefully stop reshape until
+  it reaches that checkpoint. During boot, there's heavy I/O utilisation,
+  which causes sync speed drop, and naturally checkpoint takes longer to
+  reach. This further causes systemd to forcefully kill grow-continue
+  service due to timeouts, which results in udev event being missed for
+  grow-continue service restart.
+* Grow-continue (seemingly) was not designed to be restarted without
+  reassembly, some things like stopping chunksize (to lower) migration
+  were straight up not working until recently.
+This patch makes grow-continue (actual reshape) start after switchroot
+phrase. This way we should not encounter issues related to restarting
+the service.
+
+Add checks not start a reshape if in initrd, let it initialise only.
+Change grow-continue udev rule to be triggered whenever there's a
+reshape happening in metadata, rely on udev event to kick reshape after
+switchroot. Add handle_forking helper function for reshapes to avoid
+duplicating code.
+
+Signed-off-by: Mateusz Kusiak <mateusz.kusiak@intel.com>
+---
+ Grow.c                    | 81 +++++++++++++++++++++++++++------------
+ mdadm_status.h            |  3 +-
+ udev-md-raid-arrays.rules |  3 +-
+ util.c                    |  1 +
+ 4 files changed, 61 insertions(+), 27 deletions(-)
+
+diff --git a/Grow.c b/Grow.c
+index 0d9e3b53..2719346c 100644
+--- a/Grow.c
++++ b/Grow.c
+@@ -2995,6 +2995,34 @@ static void catch_term(int sig)
+ 	sigterm = 1;
+ }
+ 
++
++/**
++ * handle_forking() - Handle reshape forking.
++ *
++ * @forked: if already forked.
++ * @devname: device name.
++ * Returns: -1 if fork() failed,
++ *           0 if child process,
++ *           1 if job delegated to forked process or systemd.
++ *
++ * This function is a helper function for reshapes for fork handling.
++ */
++static mdadm_status_t handle_forking(bool forked, char *devname)
++{
++	if (forked)
++		return MDADM_STATUS_FORKED;
++
++	if (devname && continue_via_systemd(devname, GROW_SERVICE, NULL))
++		return MDADM_STATUS_SUCCESS;
++
++	switch (fork()) {
++	case -1: return MDADM_STATUS_ERROR; /* error */
++	case 0: return MDADM_STATUS_FORKED; /* child */
++	default: return MDADM_STATUS_SUCCESS; /* parent */
++	}
++
++}
++
+ static int reshape_array(char *container, int fd, char *devname,
+ 			 struct supertype *st, struct mdinfo *info,
+ 			 int force, struct mddev_dev *devlist,
+@@ -3485,33 +3513,35 @@ started:
+ 	if (restart)
+ 		sysfs_set_str(sra, NULL, "array_state", "active");
+ 
+-	if (!forked)
+-		if (continue_via_systemd(container ?: sra->sys_name,
+-					 GROW_SERVICE, NULL)) {
+-			free(fdlist);
+-			free(offsets);
+-			sysfs_free(sra);
+-			return 0;
+-		}
++	/* Do not run in initrd */
++	if (in_initrd()) {
++		free(fdlist);
++		free(offsets);
++		sysfs_free(sra);
++		pr_info("Reshape has to be continued from location %llu when root filesystem has been mounted.\n",
++			sra->reshape_progress);
++		return 1;
++	}
+ 
+ 	/* Now we just need to kick off the reshape and watch, while
+ 	 * handling backups of the data...
+ 	 * This is all done by a forked background process.
+ 	 */
+-	switch(forked ? 0 : fork()) {
+-	case -1:
++	switch (handle_forking(forked, container ? container : sra->sys_name)) {
++	default: /* Unused, only to satisfy compiler. */
++	case MDADM_STATUS_ERROR: /* error */
+ 		pr_err("Cannot run child to monitor reshape: %s\n",
+ 			strerror(errno));
+ 		abort_reshape(sra);
+ 		goto release;
+-	default:
++	case MDADM_STATUS_FORKED: /* child */
++		map_fork();
++		break;
++	case MDADM_STATUS_SUCCESS: /* parent */
+ 		free(fdlist);
+ 		free(offsets);
+ 		sysfs_free(sra);
+ 		return 0;
+-	case 0:
+-		map_fork();
+-		break;
+ 	}
+ 
+ 	/* Close unused file descriptor in the forked process */
+@@ -3680,22 +3710,19 @@ int reshape_container(char *container, char *devname,
+ 	 */
+ 	ping_monitor(container);
+ 
+-	if (!forked)
+-		if (continue_via_systemd(container, GROW_SERVICE, NULL))
+-			return 0;
+-
+-	switch (forked ? 0 : fork()) {
+-	case -1: /* error */
++	switch (handle_forking(forked, container)) {
++	default: /* Unused, only to satisfy compiler. */
++	case MDADM_STATUS_ERROR: /* error */
+ 		perror("Cannot fork to complete reshape\n");
+ 		unfreeze(st);
+ 		return 1;
+-	default: /* parent */
+-		printf("%s: multi-array reshape continues in background\n", Name);
+-		return 0;
+-	case 0: /* child */
++	case MDADM_STATUS_FORKED: /* child */
+ 		manage_fork_fds(0);
+ 		map_fork();
+ 		break;
++	case MDADM_STATUS_SUCCESS: /* parent */
++		printf("%s: multi-array reshape continues in background\n", Name);
++		return 0;
+ 	}
+ 
+ 	/* close unused handle in child process
+@@ -3791,6 +3818,12 @@ int reshape_container(char *container, char *devname,
+ 				   c->backup_file, c->verbose, 1, restart);
+ 		close(fd);
+ 
++		/* Do not run reshape in initrd but let it initialize.*/
++		if (in_initrd()) {
++			sysfs_free(cc);
++			exit(0);
++		}
++
+ 		restart = 0;
+ 		if (rv)
+ 			break;
+diff --git a/mdadm_status.h b/mdadm_status.h
+index 905105e2..e244127c 100644
+--- a/mdadm_status.h
++++ b/mdadm_status.h
+@@ -7,7 +7,8 @@ typedef enum mdadm_status {
+ 	MDADM_STATUS_SUCCESS = 0,
+ 	MDADM_STATUS_ERROR,
+ 	MDADM_STATUS_UNDEF,
+-	MDADM_STATUS_MEM_FAIL
++	MDADM_STATUS_MEM_FAIL,
++	MDADM_STATUS_FORKED
+ } mdadm_status_t;
+ 
+ #endif
+diff --git a/udev-md-raid-arrays.rules b/udev-md-raid-arrays.rules
+index 4e64b249..d8de6d00 100644
+--- a/udev-md-raid-arrays.rules
++++ b/udev-md-raid-arrays.rules
+@@ -15,7 +15,6 @@ ENV{DEVTYPE}=="partition", GOTO="md_ignore_state"
+ ATTR{md/metadata_version}=="external:[A-Za-z]*", ATTR{md/array_state}=="inactive", GOTO="md_ignore_state"
+ TEST!="md/array_state", ENV{SYSTEMD_READY}="0", GOTO="md_end"
+ ATTR{md/array_state}=="clear*|inactive", ENV{SYSTEMD_READY}="0", GOTO="md_end"
+-ATTR{md/sync_action}=="reshape", ENV{RESHAPE_ACTIVE}="yes"
+ LABEL="md_ignore_state"
+ 
+ IMPORT{program}="BINDIR/mdadm --detail --no-devices --export $devnode"
+@@ -40,6 +39,6 @@ ENV{MD_LEVEL}=="raid[1-9]*", ENV{SYSTEMD_WANTS}+="mdmonitor.service"
+ ENV{MD_LEVEL}=="raid[1-9]*", ENV{MD_CONTAINER}=="?*", PROGRAM="/usr/bin/readlink $env{MD_CONTAINER}", ENV{MD_MON_THIS}="%c"
+ ENV{MD_MON_THIS}=="?*", TEST=="/etc/initrd-release", PROGRAM="/usr/bin/basename $env{MD_MON_THIS}", ENV{SYSTEMD_WANTS}+="mdmon@initrd-%c.service"
+ ENV{MD_MON_THIS}=="?*", TEST!="/etc/initrd-release", PROGRAM="/usr/bin/basename $env{MD_MON_THIS}", ENV{SYSTEMD_WANTS}+="mdmon@%c.service"
+-ENV{RESHAPE_ACTIVE}=="yes", PROGRAM="/usr/bin/basename $env{MD_MON_THIS}", ENV{SYSTEMD_WANTS}+="mdadm-grow-continue@%c.service"
++ENV{MD_RESHAPE_ACTIVE}=="True", PROGRAM="/usr/bin/basename $env{MD_MON_THIS}", ENV{SYSTEMD_WANTS}+="mdadm-grow-continue@%c.service"
+ 
+ LABEL="md_end"
+diff --git a/util.c b/util.c
+index 6aa44a80..8099852f 100644
+--- a/util.c
++++ b/util.c
+@@ -2307,6 +2307,7 @@ int continue_via_systemd(char *devnm, char *service_name, char *prefix)
+ 	int pid, status;
+ 	char pathbuf[1024];
+ 
++	dprintf("Start %s service\n", service_name);
+ 	/* Simply return that service cannot be started */
+ 	if (check_env("MDADM_NO_SYSTEMCTL"))
+ 		return 0;
+-- 
+2.41.0
+

0011-Better-error-messages-for-broken-reshape.patch

@@ -0,0 +1,48 @@
+From 70cba6ba8e83f2971d17ce6e36076d46191766d9 Mon Sep 17 00:00:00 2001
+From: Mateusz Kusiak <mateusz.kusiak@intel.com>
+Date: Thu, 10 Oct 2024 12:45:11 +0000
+Subject: [PATCH 11/37] Better error messages for broken reshape
+
+mdadm --grow --continue has no functionality to restore critical sectors
+if reshape was stopped during operation. This functionality belongs to
+assemble or incremental.
+
+This patch adds hints to error messages, to try to reassemble array in
+case of reshape failure to restore critical sector, so assemble can
+handle restoration.
+
+Signed-off-by: Mateusz Kusiak <mateusz.kusiak@intel.com>
+---
+ Grow.c        | 1 +
+ super-intel.c | 3 ++-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/Grow.c b/Grow.c
+index 2719346c..818eb6a4 100644
+--- a/Grow.c
++++ b/Grow.c
+@@ -2387,6 +2387,7 @@ static int verify_reshape_position(struct mdinfo *info, int level)
+ 			} else if (info->reshape_progress > position) {
+ 				pr_err("Fatal error: array reshape was not properly frozen (expected reshape position is %llu, but reshape progress is %llu.\n",
+ 				       position, info->reshape_progress);
++				pr_err("Reassemble array to try to restore critical sector.\n");
+ 				ret_val = -1;
+ 			} else {
+ 				dprintf("Reshape position in md and metadata are the same;");
+diff --git a/super-intel.c b/super-intel.c
+index 7e3c5f2b..cab84198 100644
+--- a/super-intel.c
++++ b/super-intel.c
+@@ -12596,7 +12596,8 @@ static int imsm_manage_reshape(
+ 		init_migr_record_imsm(st, dev, sra);
+ 	else {
+ 		if (__le32_to_cpu(migr_rec->rec_status) != UNIT_SRC_NORMAL) {
+-			dprintf("imsm: cannot restart migration when data are present in copy area.\n");
++			pr_err("imsm: Cannot restart migration when data are present in copy area.\n"
++			       "      Reassemble array to try to restore critical sector.\n");
+ 			goto abort;
+ 		}
+ 		/* Save checkpoint to update migration record for current
+-- 
+2.41.0
+

0012-Refactor-continue_via_systemd.patch

@@ -0,0 +1,117 @@
+From 82ccad68d46d4b10a928bc860c0feedf26e483e3 Mon Sep 17 00:00:00 2001
+From: Mateusz Kusiak <mateusz.kusiak@intel.com>
+Date: Wed, 20 Nov 2024 19:01:30 +0000
+Subject: [PATCH 12/37] Refactor continue_via_systemd()
+
+Refactor continue_via_systemd() and it's calls to make it more readable.
+No functional changes.
+
+Signed-off-by: Mateusz Kusiak <mateusz.kusiak@intel.com>
+---
+ Grow.c  |  2 +-
+ mdadm.h |  2 +-
+ util.c  | 43 ++++++++++++++++++++++++-------------------
+ 3 files changed, 26 insertions(+), 21 deletions(-)
+
+diff --git a/Grow.c b/Grow.c
+index 818eb6a4..53b0b387 100644
+--- a/Grow.c
++++ b/Grow.c
+@@ -3013,7 +3013,7 @@ static mdadm_status_t handle_forking(bool forked, char *devname)
+ 	if (forked)
+ 		return MDADM_STATUS_FORKED;
+ 
+-	if (devname && continue_via_systemd(devname, GROW_SERVICE, NULL))
++	if (devname && continue_via_systemd(devname, GROW_SERVICE, NULL) == MDADM_STATUS_SUCCESS)
+ 		return MDADM_STATUS_SUCCESS;
+ 
+ 	switch (fork()) {
+diff --git a/mdadm.h b/mdadm.h
+index 6062e167..e84c341c 100644
+--- a/mdadm.h
++++ b/mdadm.h
+@@ -1694,7 +1694,7 @@ extern int same_dev(char *one, char *two);
+ extern int compare_paths (char* path1,char* path2);
+ extern void enable_fds(int devices);
+ extern void manage_fork_fds(int close_all);
+-extern int continue_via_systemd(char *devnm, char *service_name, char *prefix);
++extern mdadm_status_t continue_via_systemd(char *devnm, char *service_name, char *prefix);
+ 
+ extern void ident_init(struct mddev_ident *ident);
+ extern mdadm_status_t ident_set_devname(struct mddev_ident *ident, const char *devname);
+diff --git a/util.c b/util.c
+index 8099852f..8c45f0e1 100644
+--- a/util.c
++++ b/util.c
+@@ -1982,7 +1982,7 @@ int start_mdmon(char *devnm)
+ 
+ 	if (check_env("MDADM_NO_MDMON"))
+ 		return 0;
+-	if (continue_via_systemd(devnm, MDMON_SERVICE, prefix))
++	if (continue_via_systemd(devnm, MDMON_SERVICE, prefix) == MDADM_STATUS_SUCCESS)
+ 		return 0;
+ 
+ 	/* That failed, try running mdmon directly */
+@@ -2299,36 +2299,41 @@ void manage_fork_fds(int close_all)
+ /* In a systemd/udev world, it is best to get systemd to
+  * run daemon rather than running in the background.
+  * Returns:
+- *	1- if systemd service has been started
+- *	0- otherwise
++ *	MDADM_STATUS_SUCCESS - if systemd service has been started.
++ *	MDADM_STATUS_ERROR - otherwise.
+  */
+-int continue_via_systemd(char *devnm, char *service_name, char *prefix)
++mdadm_status_t continue_via_systemd(char *devnm, char *service_name, char *prefix)
+ {
+ 	int pid, status;
+-	char pathbuf[1024];
++	char pathbuf[PATH_MAX];
+ 
+ 	dprintf("Start %s service\n", service_name);
+ 	/* Simply return that service cannot be started */
+ 	if (check_env("MDADM_NO_SYSTEMCTL"))
+-		return 0;
++		return MDADM_STATUS_SUCCESS;
++
++	/* Fork in attempt to start services */
+ 	switch (fork()) {
+-	case  0:
+-		manage_fork_fds(1);
+-		snprintf(pathbuf, sizeof(pathbuf),
+-			 "%s@%s%s.service", service_name, prefix ?: "", devnm);
+-		status = execl("/usr/bin/systemctl", "systemctl", "restart",
+-			       pathbuf, NULL);
+-		status = execl("/bin/systemctl", "systemctl", "restart",
+-			       pathbuf, NULL);
+-		exit(1);
+-	case -1: /* Just do it ourselves. */
++	case -1: /* Fork failed, just do it ourselves. */
+ 		break;
+-	default: /* parent - good */
++	case  0: /* child */
++		manage_fork_fds(1);
++		snprintf(pathbuf, sizeof(pathbuf), "%s@%s%s.service",
++			 service_name, prefix ? prefix : "", devnm);
++
++		/* Attempt to start service.
++		 * On success execl() will "kill" the fork, and return status of systemctl call.
++		 */
++		execl("/usr/bin/systemctl", "systemctl", "restart", pathbuf, NULL);
++		execl("/bin/systemctl", "systemctl", "restart", pathbuf, NULL);
++		exit(MDADM_STATUS_ERROR);
++	default: /* parent */
++		/* Check if forked process successfully trigered service */
+ 		pid = wait(&status);
+ 		if (pid >= 0 && status == 0)
+-			return 1;
++			return MDADM_STATUS_SUCCESS;
+ 	}
+-	return 0;
++	return MDADM_STATUS_ERROR;
+ }
+ 
+ int in_initrd(void)
+-- 
+2.41.0
+

0013-mdadm-raid6check-add-xmalloc.h-to-raid6check.c.patch

@@ -0,0 +1,32 @@
+From e0df6c4c984d564e9e40913727e916a6cd8f466e Mon Sep 17 00:00:00 2001
+From: Xiao Ni <xni@redhat.com>
+Date: Fri, 17 Jan 2025 15:15:40 +0800
+Subject: [PATCH 13/37] mdadm/raid6check: add xmalloc.h to raid6check.c
+
+It reports building error:
+raid6check.c:324:26: error: implicit declaration of function xmalloc
+
+Add xmalloc.h to raid6check.c file to fix this.
+
+Signed-off-by: Xiao Ni <xni@redhat.com>
+Link: https://lore.kernel.org/r/20250117071540.4094-1-xni@redhat.com
+Signed-off-by: Song Liu <song@kernel.org>
+---
+ raid6check.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/raid6check.c b/raid6check.c
+index 99477761..95533f7d 100644
+--- a/raid6check.c
++++ b/raid6check.c
+@@ -23,6 +23,7 @@
+  */
+ 
+ #include "mdadm.h"
++#include "xmalloc.h"
+ #include <stdint.h>
+ #include <sys/mman.h>
+ 
+-- 
+2.41.0
+

0014-mdopen-add-sbin-path-to-env-PATH-when-call-system-mo.patch

@@ -0,0 +1,56 @@
+From b1ee932b89a16c881a3336f9fd728d46c1f8c65d Mon Sep 17 00:00:00 2001
+From: Coly Li <colyli@suse.de>
+Date: Wed, 22 Jan 2025 23:18:59 +0800
+Subject: [PATCH 14/37] mdopen: add sbin path to env PATH when call
+ system("modprobe md_mod")
+
+During the boot process if mdadm is called in udev context, sbin paths
+like /sbin, /usr/sbin, /usr/local/sbin normally not defined in PATH env
+variable, calling system("modprobe md_mod") in create_named_array() may
+fail with 'sh: modprobe: command not found' error message.
+
+We don't want to move modprobe binary into udev private directory, so
+setting the PATH env is a more proper method to avoid the above issue.
+
+This patch sets PATH env variable with "/sbin:/usr/sbin:/usr/local/sbin"
+before calling system("modprobe md_mod"). The change only takes effect
+within the udev worker context, not seen by global udev environment.
+
+Signed-off-by: Coly Li <colyli@suse.de>
+Signed-off-by: Mariusz Tkaczyk <mtkaczyk@kernel.org>
+---
+ mdopen.c | 18 ++++++++++++++++++
+ 1 file changed, 18 insertions(+)
+
+diff --git a/mdopen.c b/mdopen.c
+index 26f0c716..57252b64 100644
+--- a/mdopen.c
++++ b/mdopen.c
+@@ -39,6 +39,24 @@ int create_named_array(char *devnm)
+ 
+ 	fd = open(new_array_file, O_WRONLY);
+ 	if (fd < 0 && errno == ENOENT) {
++		char buf[PATH_MAX] = {0};
++		char *env_ptr;
++
++		env_ptr = getenv("PATH");
++		/*
++		 * When called by udev worker context, path of modprobe
++		 * might not be in env PATH. Set sbin paths into PATH
++		 * env to avoid potential failure when run modprobe here.
++		 */
++		if (env_ptr)
++			snprintf(buf, PATH_MAX - 1, "%s:%s", env_ptr,
++				 "/sbin:/usr/sbin:/usr/local/sbin");
++		else
++			snprintf(buf, PATH_MAX - 1, "%s",
++				 "/sbin:/usr/sbin:/usr/local/sbin");
++
++		setenv("PATH", buf, 1);
++
+ 		if (system("modprobe md_mod") == 0)
+ 			fd = open(new_array_file, O_WRONLY);
+ 	}
+-- 
+2.41.0
+

0015-udev-persist-properties-of-MD-devices-after-switch_r.patch

@@ -0,0 +1,40 @@
+From 21e4efb1cd15c4de4a57de26b0ea2e4234aa8ce5 Mon Sep 17 00:00:00 2001
+From: Antonio Alvarez Feijoo <antonio.feijoo@suse.com>
+Date: Thu, 23 Jan 2025 19:46:38 +0100
+Subject: [PATCH 15/37] udev: persist properties of MD devices after
+ switch_root
+
+dracut installs in the initrd a custom udev rule for MD devices
+(59-persistent-storage-md.rules) only to set the db_persist option (see
+[1]). The main purpose is that if an MD device is activated in the initrd,
+its properties are kept on the udev database after the transition from the
+initrd to the rootfs. This was added to fix detection issues when LVM is
+on top.
+
+This patch would allow to remove the custom udev rule shipped by dracut
+(63-md-raid-arrays.rules is already being installed in the initrd), and it
+will also benefit other initrd generators that do not want to create
+custom udev rules.
+
+[1] https://github.com/dracutdevs/dracut/blob/master/modules.d/90mdraid
+
+Signed-off-by: Antonio Alvarez Feijoo <antonio.feijoo@suse.com>
+---
+ udev-md-raid-arrays.rules | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/udev-md-raid-arrays.rules b/udev-md-raid-arrays.rules
+index d8de6d00..a8098dc5 100644
+--- a/udev-md-raid-arrays.rules
++++ b/udev-md-raid-arrays.rules
+@@ -29,6 +29,7 @@ ENV{DEVTYPE}=="partition", ENV{MD_DEVNAME}=="*[0-9]", SYMLINK+="md/$env{MD_DEVNA
+ IMPORT{builtin}="blkid"
+ OPTIONS+="link_priority=100"
+ OPTIONS+="watch"
++OPTIONS+="db_persist"
+ ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID_ENC}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}"
+ ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_PART_ENTRY_UUID}=="?*", SYMLINK+="disk/by-partuuid/$env{ID_PART_ENTRY_UUID}"
+ ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_FS_LABEL_ENC}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_ENC}"
+-- 
+2.41.0
+

0016-mdadm-fix-grow-with-add-for-linear.patch

@@ -0,0 +1,36 @@
+From c09ae8417dc9e11da1d5bf2867c6498050c6ddb9 Mon Sep 17 00:00:00 2001
+From: Yu Kuai <yukuai3@huawei.com>
+Date: Fri, 27 Dec 2024 14:07:02 +0800
+Subject: [PATCH 16/37] mdadm: fix --grow with --add for linear
+
+For the case mdadm --grow with --add, the s.btype should not be
+initialized yet, hence BitmapUnknown should be checked instead of
+BitmapNone.
+
+Noted that this behaviour should only support by md-linear, which is
+removed from kernel, howerver, it turns out md-linear is used widely
+in home NAS and we're planning to reintroduce it soon.
+
+Fixes: 581ba1341017 ("mdadm: remove bitmap file support")
+Signed-off-by: Yu Kuai <yukuai3@huawei.com>
+Signed-off-by: Mariusz Tkaczyk <mtkaczyk@kernel.org>
+---
+ mdadm.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mdadm.c b/mdadm.c
+index a72058b4..6200cd0e 100644
+--- a/mdadm.c
++++ b/mdadm.c
+@@ -1619,7 +1619,7 @@ int main(int argc, char *argv[])
+ 		if (devs_found > 1 && s.raiddisks == 0 && s.level == UnSet) {
+ 			/* must be '-a'. */
+ 			if (s.size > 0 || s.chunk ||
+-			    s.layout_str || s.btype != BitmapNone) {
++			    s.layout_str || s.btype != BitmapUnknown) {
+ 				pr_err("--add cannot be used with other geometry changes in --grow mode\n");
+ 				rv = 1;
+ 				break;
+-- 
+2.41.0
+

0017-platform-intel-Disable-legacy-option-ROM-scan-on-UEF.patch

@@ -0,0 +1,41 @@
+From 1fc0f290caeb0720aa6c97177ab429953f5bf10f Mon Sep 17 00:00:00 2001
+From: Ross Lagerwall <ross.lagerwall@citrix.com>
+Date: Wed, 29 Jan 2025 13:31:11 +0000
+Subject: [PATCH 17/37] platform-intel: Disable legacy option ROM scan on UEFI
+ machines
+
+The legacy option ROM memory range from 0xc0000-0xeffff is not defined
+on UEFI machines so don't attempt to scan it. This avoids lockdown log
+spam when Secure Boot is enabled (avoids use of /dev/mem).
+
+Signed-off-by: Ross Lagerwall <ross.lagerwall@citrix.com>
+---
+ platform-intel.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/platform-intel.c b/platform-intel.c
+index 95bc4929..270aef36 100644
+--- a/platform-intel.c
++++ b/platform-intel.c
+@@ -607,6 +607,7 @@ const struct imsm_orom *imsm_platform_test(struct sys_dev *hba)
+ 
+ static const struct imsm_orom *find_imsm_hba_orom(struct sys_dev *hba)
+ {
++	struct stat st;
+ 	unsigned long align;
+ 
+ 	if (check_env("IMSM_TEST_OROM"))
+@@ -616,6 +617,10 @@ static const struct imsm_orom *find_imsm_hba_orom(struct sys_dev *hba)
+ 	if (check_env("IMSM_TEST_AHCI_EFI") || check_env("IMSM_TEST_SCU_EFI"))
+ 		return NULL;
+ 
++	/* Skip legacy option ROM scan when EFI booted */
++	if (stat("/sys/firmware/efi", &st) == 0 && S_ISDIR(st.st_mode))
++		return NULL;
++
+ 	find_intel_devices();
+ 
+ 	if (intel_devices == NULL)
+-- 
+2.41.0
+

0018-super-ddf-Prevent-crash-when-handling-DDF-metadata.patch

@@ -0,0 +1,61 @@
+From 9e8b3b1492cff63dafb759382c74a479460f49e6 Mon Sep 17 00:00:00 2001
+From: lilinzhe <llz@antiy.cn>
+Date: Mon, 16 Dec 2024 12:00:02 +0800
+Subject: [PATCH 18/37] super-ddf: Prevent crash when handling DDF metadata
+
+A dummy function is defined because availability of ss->update_super is
+not always verified.
+
+This fix addresses a crash reported when assembling a RAID array using
+mdadm with DDF metadata. For more details, see the discussion at:
+https://lore.kernel.org/all/
+CALHdMH30LuxR4tz9jP2ykDaDJtZ3P7L3LrZ+9e4Fq=Q6NwSM=Q@mail.gmail.com/
+
+The discussion centers on an issue with mdadm where attempting to
+assemble a RAID array caused a null pointer dereference. The problem
+was traced to a missing update_super() function in super-ddf.c, which
+led to a crash in Assemble.c.
+
+Signed-off-by: lilinzhe <llz@antiy.cn>
+---
+ super-ddf.c | 17 +++++++++++++++++
+ 1 file changed, 17 insertions(+)
+
+diff --git a/super-ddf.c b/super-ddf.c
+index 6cd099ab..a06ed435 100644
+--- a/super-ddf.c
++++ b/super-ddf.c
+@@ -5195,6 +5195,21 @@ static void default_geometry_ddf(struct supertype *st, int *level, int *layout,
+ 		*layout = ddf_level_to_layout(*level);
+ }
+ 
++static int update_super_ddf_dummy(struct supertype *st, struct mdinfo *info,
++			 enum update_opt update,
++			 char *devname, int verbose,
++			 int uuid_set, char *homehost)
++{
++	/*
++	 * A dummy update_super function is required to ensure
++	 * reliable handling of DDF metadata in mdadm.
++	 * This implementation acts as a placeholder for cases
++	 * where ss->update_super is not verified.
++	 */
++	dprintf("update_super is not implemented in DDF\n");
++	return 0;
++}
++
+ struct superswitch super_ddf = {
+ 	.examine_super	= examine_super_ddf,
+ 	.brief_examine_super = brief_examine_super_ddf,
+@@ -5213,6 +5228,8 @@ struct superswitch super_ddf = {
+ 	.uuid_from_super= uuid_from_super_ddf,
+ 	.getinfo_super  = getinfo_super_ddf,
+ 
++	.update_super = update_super_ddf_dummy,
++
+ 	.avail_size	= avail_size_ddf,
+ 
+ 	.compare_super	= compare_super_ddf,
+-- 
+2.41.0
+

0019-super-ddf-optimize-DDF-header-search-for-widely-used.patch

@@ -0,0 +1,297 @@
+From f2197b6b6c14af6c788c628acd1fc6d92c268c53 Mon Sep 17 00:00:00 2001
+From: lilinzhe <llz@antiy.cn>
+Date: Mon, 16 Dec 2024 12:11:41 +0800
+Subject: [PATCH 19/37] super-ddf: optimize DDF header search for widely used
+ RAID controllers
+
+Implemented fallback logic to search the last 32MB of the device
+for the DDF header (magic). If found, proceeds to load the DDF metadata
+from the located position.
+
+When clearing metadata as required by the mdadm --zero (function Kill),
+also erase the last 32MB of data; otherwise, it may result in an
+infinite loop.
+
+According to the specification, the Anchor Header should be placed at
+the end of the disk. However,some widely used RAID hardware, such as
+LSI and PERC, do not position it within the last 512 bytes of the disk.
+
+Signed-off-by: lilinzhe <llz@antiy.cn>
+---
+ super-ddf.c | 190 +++++++++++++++++++++++++++++++++++++++++++++++-----
+ xmalloc.c   |  11 +++
+ xmalloc.h   |   1 +
+ 3 files changed, 185 insertions(+), 17 deletions(-)
+
+diff --git a/super-ddf.c b/super-ddf.c
+index a06ed435..6e7db924 100644
+--- a/super-ddf.c
++++ b/super-ddf.c
+@@ -272,6 +272,10 @@ struct phys_disk {
+ #define	DDF_ReadErrors			32
+ #define	DDF_Missing			64
+ 
++
++#define SEARCH_BLOCK_SIZE  4096
++#define SEARCH_REGION_SIZE (32 * 1024 * 1024)
++
+ /* The content of the virt_section global scope */
+ struct virtual_disk {
+ 	be32	magic;		/* DDF_VIRT_RECORDS_MAGIC */
+@@ -877,30 +881,180 @@ static void *load_section(int fd, struct ddf_super *super, void *buf,
+ 	return buf;
+ }
+ 
+-static int load_ddf_headers(int fd, struct ddf_super *super, char *devname)
++
++/*
++ * Search for DDF_HEADER_MAGIC in the last 32MB of the device
++ *
++ * According to the specification, the Anchor Header should be placed at
++ * the end of the disk. However,some widely used RAID hardware, such as
++ * LSI and PERC, do not position it within the last 512 bytes of the disk.
++ *
++ */
++static int search_for_ddf_headers(int fd, char *devname,
++				  unsigned long long *out)
+ {
++	unsigned long long search_start;
++	unsigned long long search_end;
++	size_t bytes_block_to_read;
+ 	unsigned long long dsize;
++	unsigned long long pos;
++	int bytes_current_read;
++	size_t offset;
++
++	void *buffer = NULL;
++	be32 *magic_ptr = NULL;
++
++	int result = 0;
+ 
+ 	get_dev_size(fd, NULL, &dsize);
+ 
+-	if (lseek64(fd, dsize - 512, 0) == -1L) {
+-		if (devname)
+-			pr_err("Cannot seek to anchor block on %s: %s\n",
++
++	/* Determine the search range */
++	if (dsize > SEARCH_REGION_SIZE)
++		search_start = dsize - SEARCH_REGION_SIZE;
++	else
++		search_start = 0;
++
++	search_end = dsize;
++	pos = search_start;
++
++
++	buffer = xmemalign(SEARCH_BLOCK_SIZE, SEARCH_BLOCK_SIZE);
++
++	if (buffer == NULL) {
++		result = 1;
++		goto cleanup;
++	}
++
++	while (pos < search_end) {
++		/* Calculate the number of bytes to read in the current block */
++		bytes_block_to_read = SEARCH_BLOCK_SIZE;
++		if (search_end - pos < SEARCH_BLOCK_SIZE)
++			bytes_block_to_read = search_end - pos;
++
++		if (lseek64(fd, pos, SEEK_SET) < 0) {
++			pr_err("lseek64 for %s failed %d:%s\n",
++				fd2devnm(fd), errno, strerror(errno));
++			result = 2;
++			goto cleanup;
++		}
++
++		/*Read data from the device */
++		bytes_current_read = read(fd, buffer, bytes_block_to_read);
++
++		if (bytes_current_read <= 0) {
++			pr_err("Failed to read %s. %d:%s, Position=%llu, Bytes to read=%zu. Skipping.\n",
++			       fd2devnm(fd), errno, strerror(errno), pos, bytes_block_to_read);
++			pos += SEARCH_BLOCK_SIZE;	/* Skip to the next block */
++			continue;
++		}
++
++		/* Search for the magic value within the read block */
++		for (offset = 0;
++		    offset + sizeof(be32) <= (size_t)bytes_current_read;
++		    offset += sizeof(be32)) {
++
++			magic_ptr = (be32 *) ((char *)buffer + offset);
++			if (be32_eq(*magic_ptr, DDF_HEADER_MAGIC)) {
++				*out = pos + offset;
++				result = 0;
++				goto cleanup;
++			}
++		}
++
++		pos += SEARCH_BLOCK_SIZE;
++	}
++
++cleanup:
++	free(buffer);
++	return result;
++}
++
++static int load_ddf_headers(int fd, struct ddf_super *super, char *devname)
++{
++	/*
++	 * Load DDF headers from a device.
++	 * First, check at dsize - 512, and if not found, search for it.
++	 */
++	unsigned long long dsize = 0;
++	unsigned long long ddfpos = 0;
++	unsigned long long ddffound = 0;
++	bool found_anchor = false;
++
++	get_dev_size(fd, NULL, &dsize);
++
++	/* Check the last 512 bytes for the DDF header. */
++	if (lseek64(fd, dsize - 512, SEEK_SET) == -1L) {
++		if (devname) {
++			pr_err("Cannot seek to last 512 bytes on %s: %s\n",
+ 			       devname, strerror(errno));
++		}
+ 		return 1;
+ 	}
+-	if (read(fd, &super->anchor, 512) != 512) {
+-		if (devname)
+-			pr_err("Cannot read anchor block on %s: %s\n",
++
++
++	/* Read the last 512 bytes into the anchor block */
++	if (read(fd, &super->anchor, 512) == 512) {
++		/* Check if the magic value matches */
++		if (be32_eq(super->anchor.magic, DDF_HEADER_MAGIC))
++			found_anchor = true;
++
++	} else {
++		if (devname) {
++			pr_err("Cannot read last 512 bytes on %s: %s\n",
+ 			       devname, strerror(errno));
+-		return 1;
++		}
+ 	}
+-	if (!be32_eq(super->anchor.magic, DDF_HEADER_MAGIC)) {
++
++	if (!found_anchor) {
++		/* If not found, perform a full search for DDF headers */
++		ddffound = search_for_ddf_headers(fd, devname, &ddfpos);
++		if (ddffound != 0) {
++			if (devname) {
++				pr_err
++				    ("DDF headers not found during search on %s\n",
++				     devname);
++			}
++			return 2;
++		}
++
++		/* Seek to the found position */
++		if (lseek64(fd, ddfpos, SEEK_SET) == -1L) {
++			if (devname) {
++				pr_err("Cannot seek to anchor block on %s\n",
++					devname);
++			}
++			return 1;
++		}
++
++		/* Read the header from the found position */
++		if (read(fd, &super->anchor, 512) != 512) {
++			if (devname) {
++				pr_err
++				    ("Cannot read DDF header at found position on %s: %s\n",
++				     devname, strerror(errno));
++			}
++			return 1;
++		}
++
++		/* Verify the magic value again */
++		if (!be32_eq(super->anchor.magic, DDF_HEADER_MAGIC)) {
++			if (devname) {
++				pr_err("Invalid DDF header magic value on %s\n",
++				       devname);
++			}
++			return 2;
++		}
++		found_anchor = true;
++	}
++	if (!found_anchor) {
++
+ 		if (devname)
+-			pr_err("no DDF anchor found on %s\n",
+-				devname);
++			pr_err("DDF headers not found on %s\n", devname);
++
+ 		return 2;
+ 	}
++
+ 	if (!be32_eq(calc_crc(&super->anchor, 512), super->anchor.crc)) {
+ 		if (devname)
+ 			pr_err("bad CRC on anchor on %s\n",
+@@ -3889,16 +4043,17 @@ static int store_super_ddf(struct supertype *st, int fd)
+ 		dl->fd = ofd;
+ 		return ret;
+ 	}
++	// this is used for cleanup (Kill). to clean up 512 bytes
++	// at the end of the disk is not enough.
++	// clears SEARCH_REGION_SIZE bytes at the end of the disk.
+ 
+-	if (posix_memalign(&buf, 512, 512) != 0)
+-		return 1;
+-	memset(buf, 0, 512);
+-
+-	if (lseek64(fd, dsize - 512, 0) == -1L) {
++	buf = xmemalign(SEARCH_BLOCK_SIZE, SEARCH_REGION_SIZE);
++	memset(buf, 0, SEARCH_REGION_SIZE);
++	if (lseek64(fd, dsize - SEARCH_REGION_SIZE, 0) == -1L) {
+ 		free(buf);
+ 		return 1;
+ 	}
+-	rc = write(fd, buf, 512);
++	rc = write(fd, buf, SEARCH_REGION_SIZE);
+ 	free(buf);
+ 	if (rc < 0)
+ 		return 1;
+@@ -5208,6 +5363,7 @@ static int update_super_ddf_dummy(struct supertype *st, struct mdinfo *info,
+ 	 */
+ 	dprintf("update_super is not implemented in DDF\n");
+ 	return 0;
++
+ }
+ 
+ struct superswitch super_ddf = {
+diff --git a/xmalloc.c b/xmalloc.c
+index e28d3bd6..9472005e 100644
+--- a/xmalloc.c
++++ b/xmalloc.c
+@@ -75,3 +75,14 @@ char *xstrdup(const char *str)
+ 
+ 	return exit_memory_alloc_failure();
+ }
++
++void *xmemalign(size_t alignment, size_t size)
++{
++	void *ptr = NULL;
++	int result = posix_memalign(&ptr, alignment, size);
++
++	if (result == 0)
++		return ptr;
++
++	return exit_memory_alloc_failure();
++}
+diff --git a/xmalloc.h b/xmalloc.h
+index 0904b0ab..789948ae 100644
+--- a/xmalloc.h
++++ b/xmalloc.h
+@@ -9,5 +9,6 @@ void *xmalloc(size_t len);
+ void *xrealloc(void *ptr, size_t len);
+ void *xcalloc(size_t num, size_t size);
+ char *xstrdup(const char *str);
++void *xmemalign(size_t alignment, size_t size);
+ 
+ #endif
+-- 
+2.41.0
+

0020-bitmap.h-clear-__KERNEL__-based-headers.patch

@@ -0,0 +1,200 @@
+From eb9876f58658a107705a689852110903723e4d3b Mon Sep 17 00:00:00 2001
+From: Mariusz Tkaczyk <mtkaczyk@kernel.org>
+Date: Mon, 3 Feb 2025 11:36:01 +0100
+Subject: [PATCH 20/37] bitmap.h - clear __KERNEL__ based headers
+
+It is unused for years. Clear it.
+
+Signed-off-by: Mariusz Tkaczyk <mtkaczyk@kernel.org>
+---
+ bitmap.h | 169 -------------------------------------------------------
+ 1 file changed, 169 deletions(-)
+
+diff --git a/bitmap.h b/bitmap.h
+index 7b1f80f2..2614a14e 100644
+--- a/bitmap.h
++++ b/bitmap.h
+@@ -78,63 +78,6 @@
+  *
+  */
+ 
+-#ifdef __KERNEL__
+-
+-#define PAGE_BITS (PAGE_SIZE << 3)
+-#define PAGE_BIT_SHIFT (PAGE_SHIFT + 3)
+-
+-typedef __u16 bitmap_counter_t;
+-#define COUNTER_BITS 16
+-#define COUNTER_BIT_SHIFT 4
+-#define COUNTER_BYTE_RATIO (COUNTER_BITS / 8)
+-#define COUNTER_BYTE_SHIFT (COUNTER_BIT_SHIFT - 3)
+-
+-#define NEEDED_MASK ((bitmap_counter_t) (1 << (COUNTER_BITS - 1)))
+-#define RESYNC_MASK ((bitmap_counter_t) (1 << (COUNTER_BITS - 2)))
+-#define COUNTER_MAX ((bitmap_counter_t) RESYNC_MASK - 1)
+-#define NEEDED(x) (((bitmap_counter_t) x) & NEEDED_MASK)
+-#define RESYNC(x) (((bitmap_counter_t) x) & RESYNC_MASK)
+-#define COUNTER(x) (((bitmap_counter_t) x) & COUNTER_MAX)
+-
+-/* how many counters per page? */
+-#define PAGE_COUNTER_RATIO (PAGE_BITS / COUNTER_BITS)
+-/* same, except a shift value for more efficient bitops */
+-#define PAGE_COUNTER_SHIFT (PAGE_BIT_SHIFT - COUNTER_BIT_SHIFT)
+-/* same, except a mask value for more efficient bitops */
+-#define PAGE_COUNTER_MASK  (PAGE_COUNTER_RATIO - 1)
+-
+-#define BITMAP_BLOCK_SIZE 512
+-#define BITMAP_BLOCK_SHIFT 9
+-
+-/* how many blocks per chunk? (this is variable) */
+-#define CHUNK_BLOCK_RATIO(bitmap) ((bitmap)->chunksize >> BITMAP_BLOCK_SHIFT)
+-#define CHUNK_BLOCK_SHIFT(bitmap) ((bitmap)->chunkshift - BITMAP_BLOCK_SHIFT)
+-#define CHUNK_BLOCK_MASK(bitmap) (CHUNK_BLOCK_RATIO(bitmap) - 1)
+-
+-/* when hijacked, the counters and bits represent even larger "chunks" */
+-/* there will be 1024 chunks represented by each counter in the page pointers */
+-#define PAGEPTR_BLOCK_RATIO(bitmap) \
+-			(CHUNK_BLOCK_RATIO(bitmap) << PAGE_COUNTER_SHIFT >> 1)
+-#define PAGEPTR_BLOCK_SHIFT(bitmap) \
+-			(CHUNK_BLOCK_SHIFT(bitmap) + PAGE_COUNTER_SHIFT - 1)
+-#define PAGEPTR_BLOCK_MASK(bitmap) (PAGEPTR_BLOCK_RATIO(bitmap) - 1)
+-
+-/*
+- * on-disk bitmap:
+- *
+- * Use one bit per "chunk" (block set). We do the disk I/O on the bitmap
+- * file a page at a time. There's a superblock at the start of the file.
+- */
+-
+-/* map chunks (bits) to file pages - offset by the size of the superblock */
+-#define CHUNK_BIT_OFFSET(chunk) ((chunk) + (sizeof(bitmap_super_t) << 3))
+-
+-#endif
+-
+-/*
+- * bitmap structures:
+- */
+-
+ #define BITMAP_MAGIC 0x6d746962
+ 
+ /* use these for bitmap->flags and bitmap->sb->state bit-fields */
+@@ -176,116 +119,4 @@ typedef struct bitmap_super_s {
+  *    devices.  For raid10 it is the size of the array.
+  */
+ 
+-#ifdef __KERNEL__
+-
+-/* the in-memory bitmap is represented by bitmap_pages */
+-struct bitmap_page {
+-	/*
+-	 * map points to the actual memory page
+-	 */
+-	char *map;
+-	/*
+-	 * in emergencies (when map cannot be allocated), hijack the map
+-	 * pointer and use it as two counters itself
+-	 */
+-	unsigned int hijacked;
+-	/*
+-	 * count of dirty bits on the page
+-	 */
+-	int count;
+-};
+-
+-/* keep track of bitmap file pages that have pending writes on them */
+-struct page_list {
+-	struct list_head list;
+-	struct page *page;
+-};
+-
+-/* the main bitmap structure - one per mddev */
+-struct bitmap {
+-	struct bitmap_page *bp;
+-	unsigned long pages; /* total number of pages in the bitmap */
+-	unsigned long missing_pages; /* number of pages not yet allocated */
+-
+-	mddev_t *mddev; /* the md device that the bitmap is for */
+-
+-	int counter_bits; /* how many bits per block counter */
+-
+-	/* bitmap chunksize -- how much data does each bit represent? */
+-	unsigned long chunksize;
+-	unsigned long chunkshift; /* chunksize = 2^chunkshift (for bitops) */
+-	unsigned long chunks; /* total number of data chunks for the array */
+-
+-	/* We hold a count on the chunk currently being synced, and drop
+-	 * it when the last block is started.  If the resync is aborted
+-	 * midway, we need to be able to drop that count, so we remember
+-	 * the counted chunk..
+-	 */
+-	unsigned long syncchunk;
+-
+-	__u64	events_cleared;
+-
+-	/* bitmap spinlock */
+-	spinlock_t lock;
+-
+-	struct file *file; /* backing disk file */
+-	struct page *sb_page; /* cached copy of the bitmap file superblock */
+-	struct page **filemap; /* list of cache pages for the file */
+-	unsigned long *filemap_attr; /* attributes associated w/ filemap pages */
+-	unsigned long file_pages; /* number of pages in the file */
+-
+-	unsigned long flags;
+-
+-	/*
+-	 * the bitmap daemon - periodically wakes up and sweeps the bitmap
+-	 * file, cleaning up bits and flushing out pages to disk as necessary
+-	 */
+-	mdk_thread_t *daemon;
+-	unsigned long daemon_sleep; /* how many seconds between updates? */
+-
+-	/*
+-	 * bitmap write daemon - this daemon performs writes to the bitmap file
+-	 * this thread is only needed because of a limitation in ext3 (jbd)
+-	 * that does not allow a task to have two journal transactions ongoing
+-	 * simultaneously (even if the transactions are for two different
+-	 * filesystems) -- in the case of bitmap, that would be the filesystem
+-	 * that the bitmap file resides on and the filesystem that is mounted
+-	 * on the md device -- see current->journal_info in jbd/transaction.c
+-	 */
+-	mdk_thread_t *write_daemon;
+-	mdk_thread_t *writeback_daemon;
+-	spinlock_t write_lock;
+-	struct semaphore write_ready;
+-	struct semaphore write_done;
+-	unsigned long writes_pending;
+-	wait_queue_head_t write_wait;
+-	struct list_head write_pages;
+-	struct list_head complete_pages;
+-	mempool_t *write_pool;
+-};
+-
+-/* the bitmap API */
+-
+-/* these are used only by md/bitmap */
+-int  bitmap_create(mddev_t *mddev);
+-void bitmap_destroy(mddev_t *mddev);
+-int  bitmap_active(struct bitmap *bitmap);
+-
+-char *file_path(struct file *file, char *buf, int count);
+-void bitmap_print_sb(struct bitmap *bitmap);
+-int bitmap_update_sb(struct bitmap *bitmap);
+-
+-int  bitmap_setallbits(struct bitmap *bitmap);
+-
+-/* these are exported */
+-void bitmap_startwrite(struct bitmap *bitmap, sector_t offset, unsigned long sectors);
+-void bitmap_endwrite(struct bitmap *bitmap, sector_t offset, unsigned long sectors,
+-		     int success);
+-int bitmap_start_sync(struct bitmap *bitmap, sector_t offset, int *blocks);
+-void bitmap_end_sync(struct bitmap *bitmap, sector_t offset, int *blocks, int aborted);
+-void bitmap_close_sync(struct bitmap *bitmap);
+-
+-int bitmap_unplug(struct bitmap *bitmap);
+-#endif
+-
+ #endif
+-- 
+2.41.0
+

0021-bitmap.h-Minor-fixes.patch

@@ -0,0 +1,206 @@
+From 17fed47a64e1890df9820b93548c396b7de54e31 Mon Sep 17 00:00:00 2001
+From: Mariusz Tkaczyk <mtkaczyk@kernel.org>
+Date: Wed, 5 Feb 2025 11:34:45 +0100
+Subject: [PATCH 21/37] bitmap.h: Minor fixes
+
+Move documentation to documentation/bitmap.md. Add Neil's copyrights,
+add missing license. Remove unused macros.
+
+Signed-off-by: Mariusz Tkaczyk <mtkaczyk@kernel.org>
+---
+ bitmap.h                | 94 ++++-------------------------------------
+ documentation/bitmap.md | 67 +++++++++++++++++++++++++++++
+ 2 files changed, 75 insertions(+), 86 deletions(-)
+ create mode 100644 documentation/bitmap.md
+
+diff --git a/bitmap.h b/bitmap.h
+index 2614a14e..9f3d4f3e 100644
+--- a/bitmap.h
++++ b/bitmap.h
+@@ -1,83 +1,19 @@
++// SPDX-License-Identifier: GPL-2.0-only
++
+ /*
+- * bitmap.h: Copyright (C) Peter T. Breuer (ptb@ot.uc3m.es) 2003
+- *
+- * additions: Copyright (C) 2003-2004, Paul Clements, SteelEye Technology, Inc.
++ * Copyright (C) Peter T. Breuer (ptb@ot.uc3m.es) 2003
++ * Copyright (C) 2003-2004, Paul Clements, SteelEye Technology, Inc.
++ * Copyright (C) 2005 Neil Brown <neilb@suse.com>
+  */
++
++/* See documentation/bitmap.md */
++
+ #ifndef BITMAP_H
+ #define BITMAP_H 1
+ 
+ #define BITMAP_MAJOR_LO 3
+-/* version 4 insists the bitmap is in little-endian order
+- * with version 3, it is host-endian which is non-portable
+- */
+ #define BITMAP_MAJOR_HI 4
+-#define	BITMAP_MAJOR_HOSTENDIAN 3
+ #define	BITMAP_MAJOR_CLUSTERED 5
+-
+-#define BITMAP_MINOR 39
+-
+-/*
+- * in-memory bitmap:
+- *
+- * Use 16 bit block counters to track pending writes to each "chunk".
+- * The 2 high order bits are special-purpose, the first is a flag indicating
+- * whether a resync is needed.  The second is a flag indicating whether a
+- * resync is active.
+- * This means that the counter is actually 14 bits:
+- *
+- * +--------+--------+------------------------------------------------+
+- * | resync | resync |               counter                          |
+- * | needed | active |                                                |
+- * |  (0-1) |  (0-1) |              (0-16383)                         |
+- * +--------+--------+------------------------------------------------+
+- *
+- * The "resync needed" bit is set when:
+- *    a '1' bit is read from storage at startup.
+- *    a write request fails on some drives
+- *    a resync is aborted on a chunk with 'resync active' set
+- * It is cleared (and resync-active set) when a resync starts across all drives
+- * of the chunk.
+- *
+- *
+- * The "resync active" bit is set when:
+- *    a resync is started on all drives, and resync_needed is set.
+- *       resync_needed will be cleared (as long as resync_active wasn't already set).
+- * It is cleared when a resync completes.
+- *
+- * The counter counts pending write requests, plus the on-disk bit.
+- * When the counter is '1' and the resync bits are clear, the on-disk
+- * bit can be cleared as well, thus setting the counter to 0.
+- * When we set a bit, or in the counter (to start a write), if the fields is
+- * 0, we first set the disk bit and set the counter to 1.
+- *
+- * If the counter is 0, the on-disk bit is clear and the stipe is clean
+- * Anything that dirties the stipe pushes the counter to 2 (at least)
+- * and sets the on-disk bit (lazily).
+- * If a periodic sweep find the counter at 2, it is decremented to 1.
+- * If the sweep find the counter at 1, the on-disk bit is cleared and the
+- * counter goes to zero.
+- *
+- * Also, we'll hijack the "map" pointer itself and use it as two 16 bit block
+- * counters as a fallback when "page" memory cannot be allocated:
+- *
+- * Normal case (page memory allocated):
+- *
+- *     page pointer (32-bit)
+- *
+- *     [ ] ------+
+- *               |
+- *               +-------> [   ][   ]..[   ] (4096 byte page == 2048 counters)
+- *                          c1   c2    c2048
+- *
+- * Hijacked case (page memory allocation failed):
+- *
+- *     hijacked page pointer (32-bit)
+- *
+- *     [		  ][		  ] (no page memory allocated)
+- *      counter #1 (16-bit) counter #2 (16-bit)
+- *
+- */
+-
+ #define BITMAP_MAGIC 0x6d746962
+ 
+ /* use these for bitmap->flags and bitmap->sb->state bit-fields */
+@@ -105,18 +41,4 @@ typedef struct bitmap_super_s {
+ 	__u8  pad[256 - 136]; /* set to zero */
+ } bitmap_super_t;
+ 
+-/* notes:
+- * (1) This event counter is updated before the eventcounter in the md superblock
+- *    When a bitmap is loaded, it is only accepted if this event counter is equal
+- *    to, or one greater than, the event counter in the superblock.
+- * (2) This event counter is updated when the other one is *if*and*only*if* the
+- *    array is not degraded.  As bits are not cleared when the array is degraded,
+- *    this represents the last time that any bits were cleared.
+- *    If a device is being added that has an event count with this value or
+- *    higher, it is accepted as conforming to the bitmap.
+- * (3)This is the number of sectors represented by the bitmap, and is the range that
+- *    resync happens across.  For raid1 and raid5/6 it is the size of individual
+- *    devices.  For raid10 it is the size of the array.
+- */
+-
+ #endif
+diff --git a/documentation/bitmap.md b/documentation/bitmap.md
+new file mode 100644
+index 00000000..bdc146e5
+--- /dev/null
++++ b/documentation/bitmap.md
+@@ -0,0 +1,67 @@
++# Internal bitmap block design
++
++Use 16 bit block counters to track pending writes to each "chunk".
++The 2 high order bits are special-purpose, the first is a flag indicating
++whether a resync is needed.  The second is a flag indicating whether a
++resync is active. This means that the counter is actually 14 bits:
++
++| resync_needed | resync_active |   counter |
++|     :----:    |     :----:    |   :----:  |
++|     (0-1)     |      (0-1)    | (0-16383) |
++
++The `resync_needed` bit is set when:
++- a `1` bit is read from storage at startup;
++- a write request fails on some drives;
++- a resync is aborted on a chunk with `resync_active` set;
++- It is cleared (and `resync_active` set) when a resync starts across all drives of the chunk.
++
++The `resync_active` bit is set when:
++- a resync is started on all drives, and `resync_needed` is set.
++- `resync_needed` will be cleared (as long as `resync_active` wasn't already set).
++- It is cleared when a resync completes.
++
++The counter counts pending write requests, plus the on-disk bit.
++When the counter is `1` and the resync bits are clear, the on-disk
++bit can be cleared as well, thus setting the counter to `0`.
++When we set a bit, or in the counter (to start a write), if the fields is
++`0`, we first set the disk bit and set the counter to `1`.
++
++If the counter is `0`, the on-disk bit is clear and the stipe is clean
++Anything that dirties the stipe pushes the counter to `2` (at least)
++and sets the on-disk bit (lazily).
++If a periodic sweep find the counter at `2`, it is decremented to `1`.
++If the sweep find the counter at `1`, the on-disk bit is cleared and the
++counter goes to `0`.
++
++Also, we'll hijack the "map" pointer itself and use it as two 16 bit block
++counters as a fallback when "page" memory cannot be allocated:
++
++Normal case (page memory allocated):
++
++page pointer (32-bit)
++
++     [ ] ------+
++               |
++               +-------> [   ][   ]..[   ] (4096 byte page == 2048 counters)
++                          c1   c2    c2048
++
++ Hijacked case (page memory allocation failed):
++
++     hijacked page pointer (32-bit)
++
++     [		  ][		  ] (no page memory allocated)
++      counter #1 (16-bit) counter #2 (16-bit)
++
++
++## Notes:
++1. bitmap_super_s->events counter is updated before the event counter in the md superblock;
++   When a bitmap is loaded, it is only accepted if this event counter is equal
++   to, or one greater than, the event counter in the superblock.
++2. bitmap_super_s->events is updated when the other one is `if` and `only if` the
++   array is not degraded.  As bits are not cleared when the array is degraded,
++   this represents the last time that any bits were cleared. If a device is being
++   added that has an event count with this value or higher, it is accepted
++   as conforming to the bitmap.
++3. bitmap_super_s->chunksize is the number of sectors represented by the bitmap,
++   and is the range that  resync happens across.  For raid1 and raid5/6 it is the
++   size of individual devices.  For raid10 it is the size of the array.
+-- 
+2.41.0
+

0022-Move-release-steps-to-documentation.patch

@@ -0,0 +1,20 @@
+From 4b3932487a8dc2e87530e595ccabe48c79446f30 Mon Sep 17 00:00:00 2001
+From: Mariusz Tkaczyk <mtkaczyk@kernel.org>
+Date: Wed, 12 Feb 2025 11:29:05 +0100
+Subject: [PATCH 22/37] Move release steps to documentation/
+
+Make a room for release MAINTAINERS file.
+
+Signed-off-by: Mariusz Tkaczyk <mtkaczyk@kernel.org>
+---
+ MAINTAINERS.md => documentation/HOW_TO_RELEASE.md | 0
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename MAINTAINERS.md => documentation/HOW_TO_RELEASE.md (100%)
+
+diff --git a/MAINTAINERS.md b/documentation/HOW_TO_RELEASE.md
+similarity index 100%
+rename from MAINTAINERS.md
+rename to documentation/HOW_TO_RELEASE.md
+-- 
+2.41.0
+

0023-Rework-MAINTAINERS-file.patch

@@ -0,0 +1,102 @@
+From dacce2a0009f3506a5accf91f8fa9956eb36218e Mon Sep 17 00:00:00 2001
+From: Mariusz Tkaczyk <mtkaczyk@kernel.org>
+Date: Wed, 12 Feb 2025 12:41:58 +0100
+Subject: [PATCH 23/37] Rework MAINTAINERS file
+
+Remove Mateusz. Intergrate it with README.md
+
+Signed-off-by: Mariusz Tkaczyk <mtkaczyk@kernel.org>
+---
+ MAINTAINERS    | 32 --------------------------------
+ MAINTAINERS.md | 23 +++++++++++++++++++++++
+ README.md      |  5 +----
+ 3 files changed, 24 insertions(+), 36 deletions(-)
+ delete mode 100644 MAINTAINERS
+ create mode 100644 MAINTAINERS.md
+
+diff --git a/MAINTAINERS b/MAINTAINERS
+deleted file mode 100644
+index 0a1229fd..00000000
+--- a/MAINTAINERS
++++ /dev/null
+@@ -1,32 +0,0 @@
+-
+-# List of maintainers for mdadm
+-
+-
+-Descriptions of section entries:
+-
+-M:	Mail patches to: FullName <address@domain>
+-L:	Mailing list that is relevant to mdadm
+-
+-
+-Alphabetical Order:
+-
+-M:	Blazej Kucman <blazej.kucman@linux.intel.com>
+-L:	linux-raid@vger.kernel.org
+-
+-M:	Mateusz Kusiak <mateusz.kusiak@intel.com>
+-L:	linux-raid@vger.kernel.org
+-
+-M:	Mariusz Tkaczyk <mtkaczyk@kernel.org>
+-L:	linux-raid@vger.kernel.org
+-
+-M:	Nigel Croxon <ncroxon@redhat.com>
+-L:	linux-raid@vger.kernel.org
+-
+-M:	Song Liu <song@kernel.org>
+-L:	linux-raid@vger.kernel.org
+-
+-M:	Xiao Ni <xni@redhat.com>
+-L:	linux-raid@vger.kernel.org
+-
+-M:	Yu Kuai <yukuai@kernel.org>
+-L:	linux-raid@vger.kernel.org
+diff --git a/MAINTAINERS.md b/MAINTAINERS.md
+new file mode 100644
+index 00000000..00587484
+--- /dev/null
++++ b/MAINTAINERS.md
+@@ -0,0 +1,23 @@
++If you are sending patch through mailing list, please include everyone listed
++in this file.
++
++## Github maintainers team
++
++Github Pull Request must be `approved` by at least 2 maintainers team members:
++
++  Name | Github Profile | Email address |
++|  --  |----------------|---------------|
++| Blazej Kucman | [bkucman](https://github.com/bkucman) | <blazej.kucman@linux.intel.com> |
++| Mariusz Tkaczyk | [mtkaczyk](https://github.com/mtkaczyk) | <mtkaczyk@kernel.org> |
++| Nigel Croxon | [ncroxon](https://github.com/ncroxon) | <ncroxon@redhat.com> |
++| Xiao Ni | [XiaoNi87](https://github.com/XiaoNi87) | <xni@redhat.com> |
++
++## Kernel.org maintainers
++Reach this team specifically if you are observing differences
++between kernel.org and Github.
++
++| Name |  Email address |
++|------|----------------|
++| Mariusz Tkaczyk | <mtkaczyk@kernel.org> |
++| Song Liu | <song@kernel.org> |
++| Yu Kuai | <yukuai@kernel.org> |
+diff --git a/README.md b/README.md
+index 0c299a9a..029e0ee2 100644
+--- a/README.md
++++ b/README.md
+@@ -77,10 +77,7 @@ to the chosen branch, then Pull Request will be automatically updated.
+ 
+ # Maintainers of mdadm repository on kernel.org
+ 
+-If there are differences between github and kernel.org, please contact kernel.org mdadm maintainers:
+-
+-- Jes Sorensen <jes@trained-monkey.org>;
+-- Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>;
++See [Maintainers File](MAINTAINERS.md).
+ 
+ # Minimal supported kernel version
+ 
+-- 
+2.41.0
+

0024-mdmon-imsm-fix-metadata-corruption-when-managing-new.patch

@@ -0,0 +1,122 @@
+From 7d29b3823c18a24d6efbb502f08638788f97e04b Mon Sep 17 00:00:00 2001
+From: Junxiao Bi <junxiao.bi@oracle.com>
+Date: Tue, 18 Feb 2025 10:48:31 -0800
+Subject: [PATCH 24/37] mdmon: imsm: fix metadata corruption when managing new
+ array
+
+When manager thread detects new array, it will invoke manage_new().
+For imsm array, it will further invoke imsm_open_new(). Since
+commit bbab0940fa75("imsm: write bad block log on metadata sync"),
+it preallocates bad block log when opening the array, that requires
+increasing the mpb buffer size.
+For that, imsm_open_new() invokes function imsm_update_metadata_locally(),
+which first uses imsm_prepare_update() to allocate a larger mpb buffer
+and store it at "mpb->next_buf", and then invoke imsm_process_update()
+to copy the content from current mpb buffer "mpb->buf" to "mpb->next_buf",
+and then free the current mpb buffer and set the new buffer as current.
+
+There is a small race window, when monitor thread is syncing metadata,
+it gets current buffer pointer in imsm_sync_metadata()->write_super_imsm(),
+but before flushing the buffer to disk, manager thread does above switching
+buffer which frees current buffer, then monitor thread will run into
+use-after-free issue and could cause on-disk metadata corruption.
+If system keeps running, further metadata update could fix the corruption,
+because after switching buffer, the new buffer will contain good metadata,
+but if panic/power cycle happens while disk metadata is corrupted,
+the system will run into bootup failure if array is used as root,
+otherwise the array can not be assembled after boot if not used as root.
+
+This issue will not happen for imsm array with only one member array,
+because the memory array has not be opened yet, monitor thread will not
+do any metadata updates.
+This can happen for imsm array with at lease two member array, in the
+following two scenarios:
+1. Restarting mdmon process with at least two member array
+This will happen during system boot up or user restart mdmon after mdadm
+upgrade
+2. Adding new member array to exist imsm array with at least one member
+array.
+
+To fix this, delay the switching buffer operation to monitor thread.
+
+Fixes: bbab0940fa75 ("imsm: write bad block log on metadata sync")
+Signed-off-by: Junxiao Bi <junxiao.bi@oracle.com>
+---
+ managemon.c   | 10 ++++++++--
+ super-intel.c | 14 +++++++++++---
+ 2 files changed, 19 insertions(+), 5 deletions(-)
+
+diff --git a/managemon.c b/managemon.c
+index d7981328..74b64bfc 100644
+--- a/managemon.c
++++ b/managemon.c
+@@ -721,11 +721,12 @@ static void manage_new(struct mdstat_ent *mdstat,
+ 	 * the monitor.
+ 	 */
+ 
++	struct metadata_update *update = NULL;
+ 	struct active_array *new = NULL;
+ 	struct mdinfo *mdi = NULL, *di;
+-	int i, inst;
+-	int failed = 0;
+ 	char buf[SYSFS_MAX_BUF_SIZE];
++	int failed = 0;
++	int i, inst;
+ 
+ 	/* check if array is ready to be monitored */
+ 	if (!mdstat->active || !mdstat->level)
+@@ -824,9 +825,14 @@ static void manage_new(struct mdstat_ent *mdstat,
+ 	/* if everything checks out tell the metadata handler we want to
+ 	 * manage this instance
+ 	 */
++	container->update_tail = &update;
+ 	if (!aa_ready(new) || container->ss->open_new(container, new, inst) < 0) {
++		container->update_tail = NULL;
+ 		goto error;
+ 	} else {
++		if (update)
++			queue_metadata_update(update);
++		container->update_tail = NULL;
+ 		replace_array(container, victim, new);
+ 		if (failed) {
+ 			new->check_degraded = 1;
+diff --git a/super-intel.c b/super-intel.c
+index cab84198..4988eef1 100644
+--- a/super-intel.c
++++ b/super-intel.c
+@@ -8467,12 +8467,15 @@ static int imsm_count_failed(struct intel_super *super, struct imsm_dev *dev,
+ 	return failed;
+ }
+ 
++static int imsm_prepare_update(struct supertype *st,
++			       struct metadata_update *update);
+ static int imsm_open_new(struct supertype *c, struct active_array *a,
+ 			 int inst)
+ {
+ 	struct intel_super *super = c->sb;
+ 	struct imsm_super *mpb = super->anchor;
+-	struct imsm_update_prealloc_bb_mem u;
++	struct imsm_update_prealloc_bb_mem *u;
++	struct metadata_update mu;
+ 
+ 	if (inst >= mpb->num_raid_devs) {
+ 		pr_err("subarry index %d, out of range\n", inst);
+@@ -8482,8 +8485,13 @@ static int imsm_open_new(struct supertype *c, struct active_array *a,
+ 	dprintf("imsm: open_new %d\n", inst);
+ 	a->info.container_member = inst;
+ 
+-	u.type = update_prealloc_badblocks_mem;
+-	imsm_update_metadata_locally(c, &u, sizeof(u));
++	u = xmalloc(sizeof(*u));
++	u->type = update_prealloc_badblocks_mem;
++	mu.len = sizeof(*u);
++	mu.buf = (char *)u;
++	imsm_prepare_update(c, &mu);
++	if (c->update_tail)
++		append_metadata_update(c, u, sizeof(*u));
+ 
+ 	return 0;
+ }
+-- 
+2.41.0
+

0025-Regression-fix-156.patch

@@ -0,0 +1,217 @@
+From c2fbf66ba0243f499f78ed43fa1207a9bd9361b5 Mon Sep 17 00:00:00 2001
+From: XiaoNi87 <xni@redhat.com>
+Date: Tue, 18 Mar 2025 08:18:04 +0800
+Subject: [PATCH 25/37] Regression fix (#156)
+
+Signed-off-by: Xiao Ni <xni@redhat.com>
+---
+ .github/tools/run_mdadm_tests.sh   |  2 +-
+ test                               | 22 +++++++++++++++++++---
+ tests/05r6tor0.broken              | 15 +++++++++++++++
+ tests/07revert-inplace.broken      |  8 ++++++++
+ tests/10ddf-create.broken          |  5 -----
+ tests/10ddf-fail-two-spares.broken |  5 -----
+ tests/20raid5journal.broken        | 17 +++++++++++++++++
+ tests/env-ddf-template             |  3 +--
+ tests/skiptests                    |  9 +++++++++
+ util.c                             |  2 +-
+ 10 files changed, 71 insertions(+), 17 deletions(-)
+ create mode 100644 tests/05r6tor0.broken
+ create mode 100644 tests/07revert-inplace.broken
+ delete mode 100644 tests/10ddf-create.broken
+ delete mode 100644 tests/10ddf-fail-two-spares.broken
+ create mode 100644 tests/20raid5journal.broken
+ create mode 100644 tests/skiptests
+
+diff --git a/.github/tools/run_mdadm_tests.sh b/.github/tools/run_mdadm_tests.sh
+index 456874b5..22d89a8c 100755
+--- a/.github/tools/run_mdadm_tests.sh
++++ b/.github/tools/run_mdadm_tests.sh
+@@ -11,7 +11,7 @@ sudo ./test setup
+ 
+ #sudo ./test --tests=00createnames
+ 
+-sudo ./test --skip-broken --no-error --disable-integrity --disable-multipath --disable-linear --keep-going
++sudo ./test --skip-broken --no-error --disable-integrity --disable-multipath --disable-linear --keep-going --skip-bigcase
+ 
+ ret=$?
+ sudo ./test cleanup
+diff --git a/test b/test
+index 88e44f18..7fa68177 100755
+--- a/test
++++ b/test
+@@ -26,6 +26,10 @@ savelogs=0
+ exitonerror=1
+ ctrl_c_error=0
+ skipbroken=0
++skipbigcase=0
++skipfile="skiptests"
++skipcheckfile=$testdir/$skipfile
++checkscript=""
+ loop=1
+ prefix='[0-9][0-9]'
+ 
+@@ -192,6 +196,7 @@ do_help() {
+ 		--loop=N                    Run tests N times (0 to run forever)
+ 		--skip-broken               Skip tests that are known to be broken
+ 		--skip-always-broken        Skip tests that are known to always fail
++		--skip-bigcase              Skip tests that need time than 200 seconds
+ 		--dev=loop|lvm|ram|disk     Use loop devices (default), LVM, RAM or disk
+ 		--disks=                    Provide a bunch of physical devices for test
+ 		--volgroup=name             LVM volume group for LVM test
+@@ -295,6 +300,9 @@ parse_args() {
+ 		--skip-always-broken )
+ 			skipbroken=always
+ 			;;
++		--skip-bigcase )
++			skipbigcase=all
++			;;
+ 		--disable-multipath )
+ 			unset MULTIPATH
+ 			;;
+@@ -369,9 +377,17 @@ main() {
+ 		else
+ 			for script in $testdir/$prefix $testdir/$prefix*[^~]
+ 			do
+-				case $script in *.broken) ;;
+-				 *)
+-				     do_test $script
++				checkscript="${script##*/}"
++				case $script in
++				*.broken)
++					;;
++				*)
++					if grep -q "$checkscript" "$skipcheckfile"; then
++						if [ "$skipbigcase" == "all" ]; then
++							continue
++						fi
++					fi
++					do_test $script
+ 				esac
+ 			done
+ 		fi
+diff --git a/tests/05r6tor0.broken b/tests/05r6tor0.broken
+new file mode 100644
+index 00000000..930a0941
+--- /dev/null
++++ b/tests/05r6tor0.broken
+@@ -0,0 +1,15 @@
++Sometimes
++
+++++ pgrep -f 'mdadm --grow --continue'
++++ [[ '' != '' ]]
++++ break
++++ echo 100
++++ echo 500
++++ sleep 2
++++ check raid5
++++ case $1 in
++++ grep -sq 'active raid5 ' /proc/mdstat
++++ die 'active raid5 not found'
++++ echo -e '\n\tERROR: active raid5 not found \n'
++
++        ERROR: active raid5 not found
+diff --git a/tests/07revert-inplace.broken b/tests/07revert-inplace.broken
+new file mode 100644
+index 00000000..73d98a04
+--- /dev/null
++++ b/tests/07revert-inplace.broken
+@@ -0,0 +1,8 @@
++always fails
++
++Fails with errors:
++	++ /usr/sbin/mdadm -A /dev/md0 --update=revert-reshape /dev/loop0 /dev/loop1 /dev/loop2 /dev/loop3 /dev/loop4 --backup-file=/tmp/md-backup
++++ rv=1
++++ case $* in
++++ cat /var/tmp/stderr
++mdadm: failed to RUN_ARRAY /dev/md0: Invalid argument
+diff --git a/tests/10ddf-create.broken b/tests/10ddf-create.broken
+deleted file mode 100644
+index 0f7d25e5..00000000
+--- a/tests/10ddf-create.broken
++++ /dev/null
+@@ -1,5 +0,0 @@
+-Fails due to segmentation fault at assemble.
+-
+-Too much effort to diagnose this now, marking as broken to make CI clear.
+-	++ /usr/sbin/mdadm -A /dev/md/ddf0 /dev/loop8 /dev/loop9 /dev/loop10 /dev/loop11 /dev/loop12
+-	./test: line 76: 101955 Segmentation fault      (core dumped) $mdadm "$@" 2> $targetdir/stderr
+diff --git a/tests/10ddf-fail-two-spares.broken b/tests/10ddf-fail-two-spares.broken
+deleted file mode 100644
+index eeea56d9..00000000
+--- a/tests/10ddf-fail-two-spares.broken
++++ /dev/null
+@@ -1,5 +0,0 @@
+-fails infrequently
+-
+-Fails roughly 1 in 3 with error:
+-
+-   ERROR: /dev/md/vol1 should be optimal in meta data
+diff --git a/tests/20raid5journal.broken b/tests/20raid5journal.broken
+new file mode 100644
+index 00000000..c7b214af
+--- /dev/null
++++ b/tests/20raid5journal.broken
+@@ -0,0 +1,17 @@
++always fail
++
++++ /usr/sbin/mdadm -I /dev/loop4
++++ rv=0
++++ case $* in
++++ cat /var/tmp/stderr
++mdadm: /dev/loop4 attached to /dev/md/0_0, which has been started.
++++ return 0
++++ check raid5
++++ case $1 in
++++ grep -sq 'active raid5 ' /proc/mdstat
++++ die 'active raid5 not found'
++++ echo -e '\n\tERROR: active raid5 not found \n'
++
++        ERROR: active raid5 not found
++
++++ save_log fail
+diff --git a/tests/env-ddf-template b/tests/env-ddf-template
+index 4f4ad0f3..ebc0ebf3 100644
+--- a/tests/env-ddf-template
++++ b/tests/env-ddf-template
+@@ -3,8 +3,7 @@ sha1_sum() {
+ }
+ 
+ get_rootdev() {
+-    local part=$(grep ' / ' /proc/mounts | awk '{print $1}')
+-    local bd=/dev/$(lsblk -no PKNAME $part)
++    local bd=$(grep ' / ' /proc/mounts | awk '{print $1}')
+     [ -b $bd ] || exit 1
+     echo $bd
+ }
+diff --git a/tests/skiptests b/tests/skiptests
+new file mode 100644
+index 00000000..fd0893f1
+--- /dev/null
++++ b/tests/skiptests
+@@ -0,0 +1,9 @@
++casename:seconds
++01raid6integ:1732
++01replace:396
++07layouts:836
++11spare-migration:1140
++12imsm-r0_2d-grow-r0_5d:218
++13imsm-r0_r0_2d-grow-r0_r0_4d:218
++13imsm-r0_r0_2d-grow-r0_r0_5d:246
++19raid6check:268
+diff --git a/util.c b/util.c
+index 8c45f0e1..9fe2d227 100644
+--- a/util.c
++++ b/util.c
+@@ -2310,7 +2310,7 @@ mdadm_status_t continue_via_systemd(char *devnm, char *service_name, char *prefi
+ 	dprintf("Start %s service\n", service_name);
+ 	/* Simply return that service cannot be started */
+ 	if (check_env("MDADM_NO_SYSTEMCTL"))
+-		return MDADM_STATUS_SUCCESS;
++		return MDADM_STATUS_ERROR;
+ 
+ 	/* Fork in attempt to start services */
+ 	switch (fork()) {
+-- 
+2.41.0
+

0026-super1-Clear-extra-flags-when-initializing-metadata.patch

@@ -0,0 +1,72 @@
+From 4e2e208c8d3e9ba0fae88136d7c4cd0292af73b0 Mon Sep 17 00:00:00 2001
+From: Wu Guanghao <wuguanghao3@huawei.com>
+Date: Tue, 11 Mar 2025 03:11:55 +0000
+Subject: [PATCH 26/37] super1: Clear extra flags when initializing metadata
+
+When adding a disk to a RAID1 array, the metadata is read from the
+existing member disks for sync. However, only the bad_blocks flag are
+copied, the bad_blocks records are not copied, so the bad_blocks
+records are all zeros. The kernel function super_1_load() detects
+bad_blocks flag and reads the bad_blocks record, then sets the bad
+block using badblocks_set().
+
+After the kernel commit 1726c7746783 (badblocks: improve badblocks_set()
+for multiple ranges handling) if the length of a bad_blocks record is 0,
+it will return a failure. Therefore the device addition will fail.
+
+So when adding a new disk, some flags cannot be sync and need to be clead.
+
+Signed-off-by: Wu Guanghao <wuguanghao3@huawei.com>
+---
+ super1.c                 |  3 +++
+ tests/05r1-add-badblocks | 24 ++++++++++++++++++++++++
+ 2 files changed, 27 insertions(+)
+ create mode 100644 tests/05r1-add-badblocks
+
+diff --git a/super1.c b/super1.c
+index fe3c4c64..c828b682 100644
+--- a/super1.c
++++ b/super1.c
+@@ -1971,6 +1971,9 @@ static int write_init_super1(struct supertype *st)
+ 	long bm_offset;
+ 	bool raid0_need_layout = false;
+ 
++	/* Clear extra flags */
++	sb->feature_map &= ~__cpu_to_le32(MD_FEATURE_BAD_BLOCKS | MD_FEATURE_REPLACEMENT);
++
+ 	/* Since linux kernel v5.4, raid0 always has a layout */
+ 	if (has_raid0_layout(sb) && get_linux_version() >= 5004000)
+ 		raid0_need_layout = true;
+diff --git a/tests/05r1-add-badblocks b/tests/05r1-add-badblocks
+new file mode 100644
+index 00000000..6192327a
+--- /dev/null
++++ b/tests/05r1-add-badblocks
+@@ -0,0 +1,24 @@
++#
++# create a raid1 with a drive and set badblocks for the drive.
++# add a new drive does not cause an error.
++#
++
++# create raid1
++mdadm -CR $md0 -l1 -n2 -e1.0 $dev1 missing
++testdev $md0 1 $mdsize1a 64
++sleep 3
++
++# set badblocks for the drive
++dev1_name=$(basename $dev1)
++echo "100 100" > /sys/block/md0/md/dev-$dev1_name/bad_blocks
++echo "write_error" > /sys/block/md0/md/dev-$dev1_name/state
++
++# write badblocks to metadata
++dd if=/dev/zero of=$md0 bs=512 count=200 oflag=direct
++
++# re-add and recovery
++mdadm $md0 -a $dev2
++check recovery
++
++mdadm -S $md0
++
+-- 
+2.41.0
+

0027-imsm-Fix-RAID0-to-RAID10-migration.patch

@@ -0,0 +1,74 @@
+From 127e38b59cbdf717d1569bcdc75b8d823d8485f3 Mon Sep 17 00:00:00 2001
+From: Blazej Kucman <blazej.kucman@intel.com>
+Date: Mon, 31 Mar 2025 12:46:52 +0200
+Subject: [PATCH 27/37] imsm: Fix RAID0 to RAID10 migration
+
+Support for RAID10 with +4 disks in IMSM introduced an inconsistency
+between the VROC UEFI driver and Linux IMSM. VROC UEFI does not
+support RAID10 with +4 disks, therefore appropriate protections were
+added to the mdadm IMSM code that results in skipping processing of
+such RAID in the UEFI phase. Unfortunately the case of migration
+RAID0 2 disks to RAID10 4 disks was omitted, this case requires
+maintaining compatibility with the VROC UEFI driver because it is
+supported.
+
+For RAID10 +4 disk the MPB_ATTRIB_RAID10_EXT attribute is set in the
+metadata, thanks to which the UEFI driver does not process such RAID.
+In the series adding support, a new metadata raid level value
+IMSM_T_RAID10 was also introduced. It is not recognized by VROC UEFI.
+
+The issue is caused by the fact that in the case of the mentioned
+migration, IMSM_T_RAID10 is entered into the metadata but attribute
+MPB_ATTRIB_RAID10_EXT is not entered, which causes an attempt to
+process such RAID in the UEFI phase. This situation results in
+the platform hang during booting in UEFI phase, this also results in
+data loss after failed and interrupted RAID processing in VROC UEFI.
+
+The above situation is result of the update_imsm_raid_level()
+function, for the mentioned migration function is executed on a map
+with a not yet updated number of disks.
+
+The fix is to explicitly handle migration in the function mentioned
+above to maintain compatibility with VROC UEFI driver.
+
+Steps to reproduce:
+mdadm -C /dev/md/imsm0 -e imsm -n 2 /dev/nvme[1,2]n1 -R
+mdadm -C /dev/md/vol -l 0 -n 2 /dev/nvme[1,2]n1 --assume-clean -R
+mdadm -a /dev/md127 /dev/nvme3n1
+mdadm -a /dev/md127 /dev/nvme4n1
+mdadm -G /dev/md126 -l 10
+reboot
+
+Fixes: 27550b13297a ("imsm: add support for literal RAID 10")
+Signed-off-by: Blazej Kucman <blazej.kucman@intel.com>
+---
+ super-intel.c | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+diff --git a/super-intel.c b/super-intel.c
+index 4988eef1..b7b030a2 100644
+--- a/super-intel.c
++++ b/super-intel.c
+@@ -1327,6 +1327,19 @@ static void update_imsm_raid_level(struct imsm_map *map, int new_level)
+ 		return;
+ 	}
+ 
++	/*
++	 * RAID0 to RAID10 migration.
++	 * Due to the compatibility with VROC UEFI must be maintained, this case must be handled
++	 * separately, because the map does not have an updated number of disks.
++	 */
++	if (map->raid_level == IMSM_T_RAID0) {
++		if (map->num_members == 2)
++			map->raid_level = IMSM_T_RAID1;
++		else
++			map->raid_level = IMSM_T_RAID10;
++		return;
++	}
++
+ 	if (map->num_members == 4) {
+ 		if (map->raid_level == IMSM_T_RAID10 || map->raid_level == IMSM_T_RAID1)
+ 			return;
+-- 
+2.41.0
+

0028-Allow-RAID0-to-be-created-with-v0.90-metadata-161.patch

@@ -0,0 +1,193 @@
+From 6ce7f21bb822fd0125f78434d9fbf6c3db524892 Mon Sep 17 00:00:00 2001
+From: NeilBrown <neil@brown.name>
+Date: Fri, 4 Apr 2025 11:56:04 +1100
+Subject: [PATCH 28/37] Allow RAID0 to be created with v0.90 metadata #161
+
+It is not currently possible to create a RAID0 with 0.90 metadata.
+This is because 0.90 cannot specify the layout of RAID0 (it is
+traditionally ignored) and different kernels do different things with
+RAID0 layouts.
+
+However it should be possible to use --layout=dangerous as that
+acknowledges the risk.
+It also should be possible to create a RAID0 with all devices the same
+size because in that case all layouts are identical.
+
+The metadata handler can only check that all devices are the same size
+quite late - in write_init_super().  By that time the default is
+currently set - set to a value that super0 cannot handle.
+
+So this patch delays the setting of the default value and leave it for
+the metadata handler (or for the Build handler).
+
+super1 selects ORIG in that case.
+intel and ddf don't support non-uniform RAID0 so they don't need any
+change.
+super0 now checks the sizes of devices if the default RAID0 layout was
+requested and rejects the request in they are not the same.
+
+validiate_geometry0 now allows "dangerous" layouts for raid0.
+
+Signed-off-by: NeilBrown <neil@brown.name>
+---
+ Build.c       |  4 ++++
+ Create.c      |  2 +-
+ maps.c        |  2 +-
+ mdadm.h       |  1 +
+ super0.c      | 34 +++++++++++++++++++++++++++++++++-
+ super1.c      |  4 ++++
+ tests/00raid0 |  4 ++--
+ 7 files changed, 46 insertions(+), 5 deletions(-)
+
+diff --git a/Build.c b/Build.c
+index 70aab7a0..9eb85a13 100644
+--- a/Build.c
++++ b/Build.c
+@@ -103,6 +103,10 @@ int Build(struct mddev_ident *ident, struct mddev_dev *devlist, struct shape *s,
+ 		s->chunk = 64;
+ 	array.chunk_size = s->chunk*1024;
+ 	array.layout = s->layout;
++
++	if (array.level == 0 && array.layout == UnSet)
++		/* Raid0 leaves default to metadata handler.  That is us. */
++		array.layout = RAID0_ORIG_LAYOUT;
+ 	if (md_set_array_info(mdfd, &array)) {
+ 		pr_err("md_set_array_info() failed for %s: %s\n", chosen_name, strerror(errno));
+ 		goto abort;
+diff --git a/Create.c b/Create.c
+index fd6c9215..2b181dbf 100644
+--- a/Create.c
++++ b/Create.c
+@@ -77,7 +77,7 @@ int default_layout(struct supertype *st, int level, int verbose)
+ 		layout = 0;
+ 		break;
+ 	case 0:
+-		layout = RAID0_ORIG_LAYOUT;
++		/* Leave unset - metadata handlers choose default */
+ 		break;
+ 	case 10:
+ 		layout = 0x102; /* near=2, far=1 */
+diff --git a/maps.c b/maps.c
+index 17f8b54d..2181b4ac 100644
+--- a/maps.c
++++ b/maps.c
+@@ -81,7 +81,7 @@ mapping_t r0layout[] = {
+ 	{ "alternate", RAID0_ALT_MULTIZONE_LAYOUT},
+ 	{ "1", 1}, /* aka ORIG */
+ 	{ "2", 2}, /* aka ALT */
+-	{ "dangerous", 0},
++	{ "dangerous", RAID0_DANGEROUS_LAYOUT},
+ 	{ NULL, UnSet},
+ };
+ 
+diff --git a/mdadm.h b/mdadm.h
+index e84c341c..0ea83ad3 100644
+--- a/mdadm.h
++++ b/mdadm.h
+@@ -2003,6 +2003,7 @@ static inline int xasprintf(char **strp, const char *fmt, ...) {
+ #endif
+ 
+ enum r0layout {
++	RAID0_DANGEROUS_LAYOUT = 0, /* layout depends on kernel version */
+ 	RAID0_ORIG_LAYOUT = 1,
+ 	RAID0_ALT_MULTIZONE_LAYOUT = 2,
+ };
+diff --git a/super0.c b/super0.c
+index ff4905b9..4a462bdc 100644
+--- a/super0.c
++++ b/super0.c
+@@ -837,6 +837,7 @@ struct devinfo {
+ 	int fd;
+ 	char *devname;
+ 	mdu_disk_info_t disk;
++	unsigned long long dev_size;
+ 	struct devinfo *next;
+ };
+ 
+@@ -866,6 +867,10 @@ static int add_to_super0(struct supertype *st, mdu_disk_info_t *dinfo,
+ 	di->devname = devname;
+ 	di->disk = *dinfo;
+ 	di->next = NULL;
++
++	if (is_fd_valid(fd))
++		get_dev_size(fd, NULL, &di->dev_size);
++
+ 	*dip = di;
+ 
+ 	return 0;
+@@ -929,6 +934,33 @@ static int write_init_super0(struct supertype *st)
+ 	int rv = 0;
+ 	struct devinfo *di;
+ 
++	if (sb->level == 0 && sb->layout == UnSet) {
++		/* Without requesting a dangerous (0) layout
++		 * we can only allow this RAID0 if all devices are
++		 * the same size
++		 */
++		unsigned long long chunks = 0;
++		unsigned long chunk_sectors = sb->chunk_size >> 9;
++
++		for (di = st->info; di; di = di->next) {
++			unsigned long long this_chunks;
++
++			this_chunks = st->ss->avail_size(st, di->dev_size, 0) / chunk_sectors;
++
++			if (chunks == 0) {
++				chunks = this_chunks;
++				continue;
++			}
++
++			if (this_chunks != chunks) {
++				pr_err("Need explicit layout=dangerous to create 0.90 raid0 on non-uniform sized devices\n");
++				return 1;
++			}
++		}
++		/* looks safe */
++		sb->layout = 0;
++	}
++
+ 	for (di = st->info ; di && ! rv ; di = di->next) {
+ 
+ 		if (di->disk.state & (1 << MD_DISK_FAULTY))
+@@ -1321,7 +1353,7 @@ static int validate_geometry0(struct supertype *st, int level,
+ 	if (*chunk == UnSet)
+ 		*chunk = DEFAULT_CHUNK;
+ 
+-	if (level == 0 && layout != UnSet) {
++	if (level == 0 && layout != UnSet && layout != RAID0_DANGEROUS_LAYOUT) {
+ 		if (verbose)
+ 			pr_err("0.90 metadata does not support layouts for RAID0\n");
+ 		return 0;
+diff --git a/super1.c b/super1.c
+index c828b682..fb93f462 100644
+--- a/super1.c
++++ b/super1.c
+@@ -1677,6 +1677,10 @@ static int init_super1(struct supertype *st, mdu_array_info_t *info,
+ 		       sizeof(sb->set_name) - namelen);
+ 	}
+ 
++	if (info->level == 0 && info->layout == UnSet)
++		/* Metadata chooses default layout for RAID0 */
++		info->layout = RAID0_ORIG_LAYOUT;
++
+ 	sb->ctime = __cpu_to_le64((unsigned long long)time(0));
+ 	sb->level = __cpu_to_le32(info->level);
+ 	sb->layout = __cpu_to_le32(info->layout);
+diff --git a/tests/00raid0 b/tests/00raid0
+index 6407c320..94abcd49 100644
+--- a/tests/00raid0
++++ b/tests/00raid0
+@@ -6,8 +6,8 @@ check raid0
+ testdev $md0 3 $mdsize2_l 512
+ mdadm -S $md0
+ 
+-# verify raid0 with layouts fail for 0.90
+-mdadm -CR $md0 -e0.90 -l0 -n4 $dev0 $dev1 $dev2 $dev3
++# verify raid0 with explicit layouts fail for 0.90
++mdadm -CR $md0 -e0.90 -l0 --layout=original -n4 $dev0 $dev1 $dev2 $dev3
+ check opposite_result
+ 
+ # now with no superblock
+-- 
+2.41.0
+

0029-Update-tests.yml.patch

@@ -0,0 +1,45 @@
+From b532421e747d75223c6f7a065fb643d2d318011c Mon Sep 17 00:00:00 2001
+From: Paul Luse <paul.e.luse@intel.com>
+Date: Thu, 24 Apr 2025 07:30:10 -0700
+Subject: [PATCH 29/37] Update tests.yml
+
+Signed-off-by: Paul Luse <paul.e.luse@intel.com>
+---
+ .github/workflows/tests.yml | 12 ++++++++----
+ 1 file changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
+index ce940108..6f8e2b8e 100644
+--- a/.github/workflows/tests.yml
++++ b/.github/workflows/tests.yml
+@@ -31,9 +31,15 @@ jobs:
+      - name: 'Prepare machine'
+        run: |
+           cd ..
+-          vagrant halt
++          vagrant snapshot restore clean_vm_v42
++          echo "FYI vagrant restore command finished with exit code: $?"
++          sleep 2
+           vagrant status
+           vagrant up
++          sleep 2
++          vagrant ssh -c "sudo timedatectl set-timezone UTC && \
++            sudo systemctl restart chronyd && sudo chronyc -a makestep && sleep 1"
++          echo "FYI vagrant time command finished with exit code: $?" 
+ 
+      - name: 'Run tests'
+        id: testing
+@@ -69,9 +75,7 @@ jobs:
+     runs-on: self-hosted
+     needs: [upstream_tests]
+     steps:
+-      - name: Restore clean VM
++      - name: Halt VM
+         run:  |
+           cd ..
+-          vagrant up
+-          vagrant ssh -c "sudo mdadm -Ss"
+           vagrant halt
+-- 
+2.41.0
+

0030-Update-tests.yml.patch

@@ -0,0 +1,26 @@
+From 07bde560b71a2f6e36de5bc6f24e07e761c1c83b Mon Sep 17 00:00:00 2001
+From: Paul Luse <paul.e.luse@intel.com>
+Date: Thu, 24 Apr 2025 08:38:29 -0700
+Subject: [PATCH 30/37] Update tests.yml
+
+Signed-off-by: Paul Luse <paul.e.luse@intel.com>
+---
+ .github/workflows/tests.yml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
+index 6f8e2b8e..b4c156c0 100644
+--- a/.github/workflows/tests.yml
++++ b/.github/workflows/tests.yml
+@@ -65,7 +65,7 @@ jobs:
+        if: ${{ steps.testing.outcome == 'failure' }}
+        run: |
+           cd ..
+-          sudo rm /home/ci/actions-runner/_work/mdadm/logs/*.log
++          sudo rm -rf /home/ci/actions-runner/_work/mdadm/logs/*.log
+ 
+      - name: "Set failed"
+        if: ${{ steps.testing.outcome == 'failure' }}
+-- 
+2.41.0
+

0031-Update-tests.yml.patch

@@ -0,0 +1,26 @@
+From affe2168b807ccd48f00dc9e021196a5e2e83870 Mon Sep 17 00:00:00 2001
+From: Paul Luse <paul.e.luse@intel.com>
+Date: Thu, 24 Apr 2025 08:41:15 -0700
+Subject: [PATCH 31/37] Update tests.yml
+
+Signed-off-by: Paul Luse <paul.e.luse@intel.com>
+---
+ .github/workflows/tests.yml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
+index b4c156c0..9b361571 100644
+--- a/.github/workflows/tests.yml
++++ b/.github/workflows/tests.yml
+@@ -37,7 +37,7 @@ jobs:
+           vagrant status
+           vagrant up
+           sleep 2
+-          vagrant ssh -c "sudo timedatectl set-timezone UTC && \
++          vagrant ssh -c "uname -r && sudo timedatectl set-timezone UTC && \
+             sudo systemctl restart chronyd && sudo chronyc -a makestep && sleep 1"
+           echo "FYI vagrant time command finished with exit code: $?" 
+ 
+-- 
+2.41.0
+

0032-Update-tests.yml.patch

@@ -0,0 +1,29 @@
+From 5fd2f5da6fe7995190627f8a7bd9f6ff90aad1d4 Mon Sep 17 00:00:00 2001
+From: Paul Luse <paul.e.luse@intel.com>
+Date: Thu, 24 Apr 2025 09:03:32 -0700
+Subject: [PATCH 32/37] Update tests.yml
+
+Signed-off-by: Paul Luse <paul.e.luse@intel.com>
+---
+ .github/workflows/tests.yml | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
+index 9b361571..2556fccf 100644
+--- a/.github/workflows/tests.yml
++++ b/.github/workflows/tests.yml
+@@ -37,9 +37,8 @@ jobs:
+           vagrant status
+           vagrant up
+           sleep 2
+-          vagrant ssh -c "uname -r && sudo timedatectl set-timezone UTC && \
+-            sudo systemctl restart chronyd && sudo chronyc -a makestep && sleep 1"
+-          echo "FYI vagrant time command finished with exit code: $?" 
++          vagrant ssh -c "uname -r"
++          echo "FYI vagrant uname command finished with exit code: $?" 
+ 
+      - name: 'Run tests'
+        id: testing
+-- 
+2.41.0
+

0033-This-is-a-test-for-CI-do-not-merge.patch

@@ -0,0 +1,22 @@
+From 97ee409451a7191d3d2861b6718f79116f80b4ec Mon Sep 17 00:00:00 2001
+From: Paul E Luse <paul.e.luse@intel.com>
+Date: Thu, 24 Apr 2025 18:22:54 +0200
+Subject: [PATCH 33/37] This is a test for CI, do not merge
+
+Signed-off-by: Paul E Luse <paul.e.luse@intel.com>
+---
+ README.md | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/README.md b/README.md
+index 029e0ee2..426e3512 100644
+--- a/README.md
++++ b/README.md
+@@ -1,3 +1,4 @@
++test
+ **mdadm** is a utility used to create and manage **software RAID** devices implemented through
+ **Multiple devices driver (MD)** in kernel. It supports following RAID metadata formats:
+ 
+-- 
+2.41.0
+

0034-Update-README.md.patch

@@ -0,0 +1,24 @@
+From f5ff81d14fdd34f770120a057804d6067fd5035b Mon Sep 17 00:00:00 2001
+From: Paul Luse <paul.e.luse@intel.com>
+Date: Thu, 24 Apr 2025 09:48:56 -0700
+Subject: [PATCH 34/37] Update README.md
+
+Needed to remove the word "test" as part of testing updated CI workflow.
+
+Signed-off-by: Paul Luse <paul.e.luse@intel.com>
+---
+ README.md | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/README.md b/README.md
+index 426e3512..029e0ee2 100644
+--- a/README.md
++++ b/README.md
+@@ -1,4 +1,3 @@
+-test
+ **mdadm** is a utility used to create and manage **software RAID** devices implemented through
+ **Multiple devices driver (MD)** in kernel. It supports following RAID metadata formats:
+ 
+-- 
+2.41.0
+

0035-mdadm-Remove-klibc-and-uclibc-support.patch

@@ -0,0 +1,183 @@
+From bd648e3bec3d883d2f4addea84ac1ac8790c75e9 Mon Sep 17 00:00:00 2001
+From: Mariusz Tkaczyk <mtkaczyk@kernel.org>
+Date: Fri, 7 Mar 2025 11:38:48 +0100
+Subject: [PATCH 35/37] mdadm: Remove klibc and uclibc support
+
+Klibc compilation is not working for at least 3 years because of
+following error:
+mdadm.h:1912:15: error: unknown type name 'sighandler_t'
+
+It will have a conflict with le/be_to_cpu() functions family provided by
+asm/byteorder.h which will be included with raid/md_p.h. Therefore we
+need to remove support for it. Also, remove uclibc because it is not actively
+maintained.
+
+Remove klibc and uclibc targets from Makefile and special klibc code.
+Targets can be removed safely because using CC is recommended.
+
+Signed-off-by: Mariusz Tkaczyk <mtkaczyk@kernel.org>
+---
+ Makefile  | 34 +++-------------------------------
+ README.md |  3 ---
+ mdadm.h   | 37 +------------------------------------
+ 3 files changed, 4 insertions(+), 70 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index bcd092de..387e4a56 100644
+--- a/Makefile
++++ b/Makefile
+@@ -31,16 +31,6 @@
+ # define "CXFLAGS" to give extra flags to CC.
+ # e.g.  make CXFLAGS=-O to optimise
+ CXFLAGS ?=-O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE
+-TCC = tcc
+-UCLIBC_GCC = $(shell for nm in i386-uclibc-linux-gcc i386-uclibc-gcc; do which $$nm > /dev/null && { echo $$nm ; exit; } ; done; echo false No uclibc found )
+-#DIET_GCC = diet gcc
+-# sorry, but diet-libc doesn't know about posix_memalign,
+-# so we cannot use it any more.
+-DIET_GCC = gcc -DHAVE_STDINT_H
+-
+-KLIBC=/home/src/klibc/klibc-0.77
+-
+-KLIBC_GCC = gcc -nostdinc -iwithprefix include -I$(KLIBC)/klibc/include -I$(KLIBC)/linux/include -I$(KLIBC)/klibc/arch/i386/include -I$(KLIBC)/klibc/include/bits32
+ 
+ ifdef COVERITY
+ COVERITY_FLAGS=-include coverity-gcc-hack.h
+@@ -225,8 +215,6 @@ everything: all swap_super test_stripe raid6check \
+ 	mdadm.Os mdadm.O2 man
+ everything-test: all swap_super test_stripe \
+ 	mdadm.Os mdadm.O2 man
+-# mdadm.uclibc doesn't work on x86-64
+-# mdadm.tcc doesn't work..
+ 
+ %.o: %.c
+ 	$(CC) $(CFLAGS) $(CPPFLAGS) $(COVERITY_FLAGS) -o $@ -c $<
+@@ -237,13 +225,6 @@ mdadm : $(OBJS) | check_rundir
+ mdadm.static : $(OBJS) $(STATICOBJS)
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -static -o mdadm.static $(OBJS) $(STATICOBJS) $(LDLIBS)
+ 
+-mdadm.tcc : $(SRCS) $(INCL)
+-	$(TCC) -o mdadm.tcc $(SRCS)
+-
+-mdadm.klibc : $(SRCS) $(INCL)
+-	rm -f $(OBJS)
+-	$(CC) -nostdinc -iwithprefix include -I$(KLIBC)/klibc/include -I$(KLIBC)/linux/include -I$(KLIBC)/klibc/arch/i386/include -I$(KLIBC)/klibc/include/bits32 $(CFLAGS) $(SRCS)
+-
+ mdadm.Os : $(SRCS) $(INCL)
+ 	$(CC) -o mdadm.Os $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -DHAVE_STDINT_H -Os $(SRCS) $(LDLIBS)
+ 
+@@ -298,15 +279,6 @@ install : install-bin install-man install-udev
+ install-static : mdadm.static install-man
+ 	$(INSTALL) -D $(STRIP) -m 755 mdadm.static $(DESTDIR)$(BINDIR)/mdadm
+ 
+-install-tcc : mdadm.tcc install-man
+-	$(INSTALL) -D $(STRIP) -m 755 mdadm.tcc $(DESTDIR)$(BINDIR)/mdadm
+-
+-install-uclibc : mdadm.uclibc install-man
+-	$(INSTALL) -D $(STRIP) -m 755 mdadm.uclibc $(DESTDIR)$(BINDIR)/mdadm
+-
+-install-klibc : mdadm.klibc install-man
+-	$(INSTALL) -D $(STRIP) -m 755 mdadm.klibc $(DESTDIR)$(BINDIR)/mdadm
+-
+ install-man: mdadm.8 md.4 mdadm.conf.5 mdmon.8
+ 	$(INSTALL) -D -m 644 mdadm.8 $(DESTDIR)$(MAN8DIR)/mdadm.8
+ 	$(INSTALL) -D -m 644 mdmon.8 $(DESTDIR)$(MAN8DIR)/mdmon.8
+@@ -354,9 +326,9 @@ test: mdadm mdmon test_stripe swap_super raid6check
+ 
+ clean :
+ 	rm -f mdadm mdmon $(OBJS) $(MON_OBJS) $(STATICOBJS) core *.man \
+-	mdadm.tcc mdadm.uclibc mdadm.static *.orig *.porig *.rej *.alt \
+-	.merge_file_* mdadm.Os mdadm.O2 mdmon.O2 swap_super init.cpio.gz \
+-	mdadm.uclibc.static test_stripe raid6check raid6check.o mdmon mdadm.8
++	mdadm.static *.orig *.porig *.rej *.alt merge_file_* \
++	mdadm.Os mdadm.O2 mdmon.O2 swap_super init.cpio.gz \
++	test_stripe raid6check raid6check.o mdmon mdadm.8
+ 	rm -rf cov-int
+ 
+ dist : clean
+diff --git a/README.md b/README.md
+index 029e0ee2..ba611ec5 100644
+--- a/README.md
++++ b/README.md
+@@ -135,9 +135,6 @@ List of installation targets:
+ 
+ The following targets are deprecated and should not be used:
+ - `install-static`
+-- `install-tcc`
+-- `install-uclibc`
+-- `install-klibc`
+ 
+ # License
+ 
+diff --git a/mdadm.h b/mdadm.h
+index 0ea83ad3..592bd1ba 100644
+--- a/mdadm.h
++++ b/mdadm.h
+@@ -43,6 +43,7 @@ extern __off64_t lseek64 __P ((int __fd, __off64_t __offset, int __whence));
+ #include	<sys/time.h>
+ #include	<getopt.h>
+ #include	<fcntl.h>
++#include	<ftw.h>
+ #include	<stdio.h>
+ #include	<errno.h>
+ #include	<string.h>
+@@ -189,7 +190,6 @@ struct dlm_lksb {
+ 			     ((x) & 0x00000000ff000000ULL) << 8 |  \
+ 			     ((x) & 0x000000ff00000000ULL) >> 8)
+ 
+-#if !defined(__KLIBC__)
+ #if BYTE_ORDER == LITTLE_ENDIAN
+ #define	__cpu_to_le16(_x) (unsigned int)(_x)
+ #define __cpu_to_le32(_x) (unsigned int)(_x)
+@@ -221,7 +221,6 @@ struct dlm_lksb {
+ #else
+ #  error "unknown endianness."
+ #endif
+-#endif /* __KLIBC__ */
+ 
+ /*
+  * Partially stolen from include/linux/unaligned/packed_struct.h
+@@ -1530,40 +1529,6 @@ extern void sysfsline(char *line);
+ struct stat64;
+ #endif
+ 
+-#define HAVE_NFTW  we assume
+-#define HAVE_FTW
+-
+-#ifdef __UCLIBC__
+-# include <features.h>
+-# ifndef __UCLIBC_HAS_LFS__
+-#  define lseek64 lseek
+-# endif
+-# ifndef  __UCLIBC_HAS_FTW__
+-#  undef HAVE_FTW
+-#  undef HAVE_NFTW
+-# endif
+-#endif
+-
+-#ifdef __dietlibc__
+-# undef HAVE_NFTW
+-#endif
+-
+-#if defined(__KLIBC__)
+-# undef HAVE_NFTW
+-# undef HAVE_FTW
+-#endif
+-
+-#ifndef HAVE_NFTW
+-# define FTW_PHYS 1
+-# ifndef HAVE_FTW
+-  struct FTW {};
+-# endif
+-#endif
+-
+-#ifdef HAVE_FTW
+-# include <ftw.h>
+-#endif
+-
+ extern int add_dev(const char *name, const struct stat *stb, int flag, struct FTW *s);
+ 
+ extern int Manage_ro(char *devname, int fd, int readonly);
+-- 
+2.41.0
+

0036-mdadm-include-asm-byteorder.h.patch

@@ -0,0 +1,96 @@
+From 696207860f408534651db89c5b40133f5903fa25 Mon Sep 17 00:00:00 2001
+From: Mariusz Tkaczyk <mtkaczyk@kernel.org>
+Date: Fri, 7 Mar 2025 12:10:58 +0100
+Subject: [PATCH 36/37] mdadm: include asm/byteorder.h
+
+It will be included by raid/md_p.h anyway. Include it directly and
+remove custom functions. It is not a problem now.
+
+Signed-off-by: Mariusz Tkaczyk <mtkaczyk@kernel.org>
+---
+ mdadm.h | 55 +------------------------------------------------------
+ 1 file changed, 1 insertion(+), 54 deletions(-)
+
+diff --git a/mdadm.h b/mdadm.h
+index 592bd1ba..7471cedc 100644
+--- a/mdadm.h
++++ b/mdadm.h
+@@ -34,6 +34,7 @@ extern __off64_t lseek64 __P ((int __fd, __off64_t __offset, int __whence));
+ #endif
+ 
+ #include	<assert.h>
++#include	<asm/byteorder.h>
+ #include	<sys/types.h>
+ #include	<sys/stat.h>
+ #include	<stdarg.h>
+@@ -85,7 +86,6 @@ struct dlm_lksb {
+ #endif
+ 
+ #include	<linux/kdev_t.h>
+-/*#include	<linux/fs.h> */
+ #include	<sys/mount.h>
+ #include	<asm/types.h>
+ #include	<sys/ioctl.h>
+@@ -169,59 +169,6 @@ struct dlm_lksb {
+ #include	"msg.h"
+ #include	"mdadm_status.h"
+ 
+-#include <endian.h>
+-/* Redhat don't like to #include <asm/byteorder.h>, and
+- * some time include <linux/byteorder/xxx_endian.h> isn't enough,
+- * and there is no standard conversion function so... */
+-/* And dietlibc doesn't think byteswap is ok, so.. */
+-/*  #include <byteswap.h> */
+-#define __mdadm_bswap_16(x) (((x) & 0x00ffU) << 8 | \
+-			     ((x) & 0xff00U) >> 8)
+-#define __mdadm_bswap_32(x) (((x) & 0x000000ffU) << 24 | \
+-			     ((x) & 0xff000000U) >> 24 | \
+-			     ((x) & 0x0000ff00U) << 8  | \
+-			     ((x) & 0x00ff0000U) >> 8)
+-#define __mdadm_bswap_64(x) (((x) & 0x00000000000000ffULL) << 56 | \
+-			     ((x) & 0xff00000000000000ULL) >> 56 | \
+-			     ((x) & 0x000000000000ff00ULL) << 40 | \
+-			     ((x) & 0x00ff000000000000ULL) >> 40 | \
+-			     ((x) & 0x0000000000ff0000ULL) << 24 | \
+-			     ((x) & 0x0000ff0000000000ULL) >> 24 | \
+-			     ((x) & 0x00000000ff000000ULL) << 8 |  \
+-			     ((x) & 0x000000ff00000000ULL) >> 8)
+-
+-#if BYTE_ORDER == LITTLE_ENDIAN
+-#define	__cpu_to_le16(_x) (unsigned int)(_x)
+-#define __cpu_to_le32(_x) (unsigned int)(_x)
+-#define __cpu_to_le64(_x) (unsigned long long)(_x)
+-#define	__le16_to_cpu(_x) (unsigned int)(_x)
+-#define __le32_to_cpu(_x) (unsigned int)(_x)
+-#define __le64_to_cpu(_x) (unsigned long long)(_x)
+-
+-#define	__cpu_to_be16(_x) __mdadm_bswap_16(_x)
+-#define __cpu_to_be32(_x) __mdadm_bswap_32(_x)
+-#define __cpu_to_be64(_x) __mdadm_bswap_64(_x)
+-#define	__be16_to_cpu(_x) __mdadm_bswap_16(_x)
+-#define __be32_to_cpu(_x) __mdadm_bswap_32(_x)
+-#define __be64_to_cpu(_x) __mdadm_bswap_64(_x)
+-#elif BYTE_ORDER == BIG_ENDIAN
+-#define	__cpu_to_le16(_x) __mdadm_bswap_16(_x)
+-#define __cpu_to_le32(_x) __mdadm_bswap_32(_x)
+-#define __cpu_to_le64(_x) __mdadm_bswap_64(_x)
+-#define	__le16_to_cpu(_x) __mdadm_bswap_16(_x)
+-#define __le32_to_cpu(_x) __mdadm_bswap_32(_x)
+-#define __le64_to_cpu(_x) __mdadm_bswap_64(_x)
+-
+-#define	__cpu_to_be16(_x) (unsigned int)(_x)
+-#define __cpu_to_be32(_x) (unsigned int)(_x)
+-#define __cpu_to_be64(_x) (unsigned long long)(_x)
+-#define	__be16_to_cpu(_x) (unsigned int)(_x)
+-#define __be32_to_cpu(_x) (unsigned int)(_x)
+-#define __be64_to_cpu(_x) (unsigned long long)(_x)
+-#else
+-#  error "unknown endianness."
+-#endif
+-
+ /*
+  * Partially stolen from include/linux/unaligned/packed_struct.h
+  */
+-- 
+2.41.0
+

0037-mdadm-use-kernel-raid-headers.patch

@@ -0,0 +1,346 @@
+From f5889f9a1b8753a1472dfef9d025da2bae395239 Mon Sep 17 00:00:00 2001
+From: Mariusz Tkaczyk <mtkaczyk@kernel.org>
+Date: Mon, 10 Mar 2025 11:16:28 +0100
+Subject: [PATCH 37/37] mdadm: use kernel raid headers
+
+For a years we redefined these headers in mdadm. We should reuse headers
+exported by kernel to integrate driver and mdadm better.
+Include them and remove mdadm owned headers.
+
+There are 3 defines not available in kernel headers, so define them
+directly but put them in ifndef guard to make them transparent later.
+
+Use MD_FEATURE_CLUSTERED instead of MD_FEATURE_BITMAP_VERSIONED. The
+value is same, kernel define has different name.
+
+Signed-off-by: Mariusz Tkaczyk <mtkaczyk@kernel.org>
+---
+ Create.c    |   2 -
+ Detail.c    |   2 -
+ Examine.c   |   2 -
+ Grow.c      |   6 ---
+ Kill.c      |   2 -
+ Manage.c    |   2 -
+ Query.c     |   2 -
+ mdadm.h     |  16 ++++++-
+ mdmonitor.c |   2 -
+ super1.c    | 126 ++--------------------------------------------------
+ udev.c      |   2 -
+ 11 files changed, 17 insertions(+), 147 deletions(-)
+
+diff --git a/Create.c b/Create.c
+index 2b181dbf..de90b0b8 100644
+--- a/Create.c
++++ b/Create.c
+@@ -23,8 +23,6 @@
+  */
+ 
+ #include	"mdadm.h"
+-#include	"md_u.h"
+-#include	"md_p.h"
+ #include	"udev.h"
+ #include	"xmalloc.h"
+ 
+diff --git a/Detail.c b/Detail.c
+index b804a624..3802ef8f 100644
+--- a/Detail.c
++++ b/Detail.c
+@@ -23,8 +23,6 @@
+  */
+ 
+ #include	"mdadm.h"
+-#include	"md_p.h"
+-#include	"md_u.h"
+ #include	"xmalloc.h"
+ 
+ #include	<ctype.h>
+diff --git a/Examine.c b/Examine.c
+index 036b7a56..9c8564be 100644
+--- a/Examine.c
++++ b/Examine.c
+@@ -24,8 +24,6 @@
+ 
+ #include	"dlink.h"
+ #include	"mdadm.h"
+-#include	"md_u.h"
+-#include	"md_p.h"
+ #include	"xmalloc.h"
+ 
+ #if ! defined(__BIG_ENDIAN) && ! defined(__LITTLE_ENDIAN)
+diff --git a/Grow.c b/Grow.c
+index 53b0b387..30eaa3c6 100644
+--- a/Grow.c
++++ b/Grow.c
+@@ -30,12 +30,6 @@
+ #include	<stdint.h>
+ #include	<sys/wait.h>
+ 
+-#if ! defined(__BIG_ENDIAN) && ! defined(__LITTLE_ENDIAN)
+-#error no endian defined
+-#endif
+-#include	"md_u.h"
+-#include	"md_p.h"
+-
+ int restore_backup(struct supertype *st,
+ 		   struct mdinfo *content,
+ 		   int working_disks,
+diff --git a/Kill.c b/Kill.c
+index 43c9abed..9f05a1ac 100644
+--- a/Kill.c
++++ b/Kill.c
+@@ -26,8 +26,6 @@
+  */
+ 
+ #include	"mdadm.h"
+-#include	"md_u.h"
+-#include	"md_p.h"
+ 
+ int Kill(char *dev, struct supertype *st, int force, int verbose, int noexcl)
+ {
+diff --git a/Manage.c b/Manage.c
+index 034eb00c..22b1f52b 100644
+--- a/Manage.c
++++ b/Manage.c
+@@ -23,8 +23,6 @@
+  */
+ 
+ #include "mdadm.h"
+-#include "md_u.h"
+-#include "md_p.h"
+ #include "udev.h"
+ #include "xmalloc.h"
+ 
+diff --git a/Query.c b/Query.c
+index aedb4ce7..72f49a4e 100644
+--- a/Query.c
++++ b/Query.c
+@@ -23,8 +23,6 @@
+  */
+ 
+ #include	"mdadm.h"
+-#include	"md_p.h"
+-#include	"md_u.h"
+ 
+ int Query(char *dev)
+ {
+diff --git a/mdadm.h b/mdadm.h
+index 7471cedc..ce9c216b 100644
+--- a/mdadm.h
++++ b/mdadm.h
+@@ -163,8 +163,20 @@ struct dlm_lksb {
+ #define GROW_SERVICE "mdadm-grow-continue"
+ #endif /* GROW_SERVICE */
+ 
+-#include	"md_u.h"
+-#include	"md_p.h"
++#include	<linux/raid/md_u.h>
++#include	<linux/raid/md_p.h>
++
++/* These defines might be missing in raid headers*/
++#ifndef MD_SB_BLOCK_CONTAINER_RESHAPE
++#define MD_SB_BLOCK_CONTAINER_RESHAPE	3
++#endif
++#ifndef MD_SB_BLOCK_VOLUME
++#define MD_SB_BLOCK_VOLUME		4
++#endif
++#ifndef MD_DISK_REPLACEMENT
++#define MD_DISK_REPLACEMENT		17
++#endif
++
+ #include	"bitmap.h"
+ #include	"msg.h"
+ #include	"mdadm_status.h"
+diff --git a/mdmonitor.c b/mdmonitor.c
+index d1cfbf94..d51617cd 100644
+--- a/mdmonitor.c
++++ b/mdmonitor.c
+@@ -23,8 +23,6 @@
+  */
+ 
+ #include	"mdadm.h"
+-#include	"md_p.h"
+-#include	"md_u.h"
+ #include	"udev.h"
+ #include	"xmalloc.h"
+ 
+diff --git a/super1.c b/super1.c
+index fb93f462..84d73573 100644
+--- a/super1.c
++++ b/super1.c
+@@ -26,92 +26,6 @@
+ #include "mdadm.h"
+ #include "xmalloc.h"
+ 
+-/*
+- * The version-1 superblock :
+- * All numeric fields are little-endian.
+- *
+- * total size: 256 bytes plus 2 per device.
+- *  1K allows 384 devices.
+- */
+-struct mdp_superblock_1 {
+-	/* constant array information - 128 bytes */
+-	__u32	magic;		/* MD_SB_MAGIC: 0xa92b4efc - little endian */
+-	__u32	major_version;	/* 1 */
+-	__u32	feature_map;	/* 0 for now */
+-	__u32	pad0;		/* always set to 0 when writing */
+-
+-	__u8	set_uuid[16];	/* user-space generated. */
+-	char	set_name[32];	/* set and interpreted by user-space */
+-
+-	__u64	ctime;		/* lo 40 bits are seconds, top 24 are microseconds or 0*/
+-	__u32	level;		/* -4 (multipath), -1 (linear), 0,1,4,5 */
+-	__u32	layout;		/* used for raid5, raid6, raid10, and raid0 */
+-	__u64	size;		/* used size of component devices, in 512byte sectors */
+-
+-	__u32	chunksize;	/* in 512byte sectors */
+-	__u32	raid_disks;
+-	union {
+-		__u32	bitmap_offset;	/* sectors after start of superblock that bitmap starts
+-					 * NOTE: signed, so bitmap can be before superblock
+-					 * only meaningful of feature_map[0] is set.
+-					 */
+-
+-		/* only meaningful when feature_map[MD_FEATURE_PPL] is set */
+-		struct {
+-			__s16 offset; /* sectors from start of superblock that ppl starts */
+-			__u16 size; /* ppl size in sectors */
+-		} ppl;
+-	};
+-
+-	/* These are only valid with feature bit '4' */
+-	__u32	new_level;	/* new level we are reshaping to		*/
+-	__u64	reshape_position;	/* next address in array-space for reshape */
+-	__u32	delta_disks;	/* change in number of raid_disks		*/
+-	__u32	new_layout;	/* new layout					*/
+-	__u32	new_chunk;	/* new chunk size (sectors)			*/
+-	__u32	new_offset;	/* signed number to add to data_offset in new
+-				 * layout.  0 == no-change.  This can be
+-				 * different on each device in the array.
+-				 */
+-
+-	/* constant this-device information - 64 bytes */
+-	__u64	data_offset;	/* sector start of data, often 0 */
+-	__u64	data_size;	/* sectors in this device that can be used for data */
+-	__u64	super_offset;	/* sector start of this superblock */
+-	union {
+-		__u64	recovery_offset;/* sectors before this offset (from data_offset) have been recovered */
+-		__u64	journal_tail;/* journal tail of journal device (from data_offset) */
+-	};
+-	__u32	dev_number;	/* permanent identifier of this  device - not role in raid */
+-	__u32	cnt_corrected_read; /* number of read errors that were corrected by re-writing */
+-	__u8	device_uuid[16]; /* user-space setable, ignored by kernel */
+-	__u8    devflags;        /* per-device flags.  Only one defined...*/
+-#define WriteMostly1    1        /* mask for writemostly flag in above */
+-#define FailFast1	2        /* Device should get FailFast requests */
+-	/* bad block log.  If there are any bad blocks the feature flag is set.
+-	 * if offset and size are non-zero, that space is reserved and available.
+-	 */
+-	__u8	bblog_shift;	/* shift from sectors to block size for badblock list */
+-	__u16	bblog_size;	/* number of sectors reserved for badblock list */
+-	__u32	bblog_offset;	/* sector offset from superblock to bblog, signed */
+-
+-	/* array state information - 64 bytes */
+-	__u64	utime;		/* 40 bits second, 24 bits microseconds */
+-	__u64	events;		/* incremented when superblock updated */
+-	__u64	resync_offset;	/* data before this offset (from data_offset) known to be in sync */
+-	__u32	sb_csum;	/* checksum upto dev_roles[max_dev] */
+-	__u32	max_dev;	/* size of dev_roles[] array to consider */
+-	__u8	pad3[64-32];	/* set to 0 when writing */
+-
+-	/* device state information. Indexed by dev_number.
+-	 * 2 bytes per device
+-	 * Note there are no per-device state flags. State information is rolled
+-	 * into the 'roles' value.  If a device is spare or faulty, then it doesn't
+-	 * have a meaningful role.
+-	 */
+-	__u16	dev_roles[0];	/* role in array, or 0xffff for a spare, or 0xfffe for faulty */
+-};
+-
+ #define MAX_SB_SIZE 4096
+ /* bitmap super size is 256, but we round up to a sector for alignment */
+ #define BM_SUPER_SIZE 512
+@@ -126,40 +40,6 @@ struct misc_dev_info {
+ #define MULTIPLE_PPL_AREA_SIZE_SUPER1 (1024 * 1024) /* Size of the whole
+ 						     * mutliple PPL area
+ 						     */
+-/* feature_map bits */
+-#define MD_FEATURE_BITMAP_OFFSET	1
+-#define	MD_FEATURE_RECOVERY_OFFSET	2 /* recovery_offset is present and
+-					   * must be honoured
+-					   */
+-#define	MD_FEATURE_RESHAPE_ACTIVE	4
+-#define	MD_FEATURE_BAD_BLOCKS		8 /* badblock list is not empty */
+-#define	MD_FEATURE_REPLACEMENT		16 /* This device is replacing an
+-					    * active device with same 'role'.
+-					    * 'recovery_offset' is also set.
+-					    */
+-#define	MD_FEATURE_RESHAPE_BACKWARDS	32 /* Reshape doesn't change number
+-					    * of devices, but is going
+-					    * backwards anyway.
+-					    */
+-#define	MD_FEATURE_NEW_OFFSET		64 /* new_offset must be honoured */
+-#define	MD_FEATURE_BITMAP_VERSIONED	256 /* bitmap version number checked properly */
+-#define	MD_FEATURE_JOURNAL		512 /* support write journal */
+-#define	MD_FEATURE_PPL			1024 /* support PPL */
+-#define	MD_FEATURE_MUTLIPLE_PPLS	2048 /* support for multiple PPLs */
+-#define	MD_FEATURE_RAID0_LAYOUT		4096 /* layout is meaningful in RAID0 */
+-#define	MD_FEATURE_ALL			(MD_FEATURE_BITMAP_OFFSET	\
+-					|MD_FEATURE_RECOVERY_OFFSET	\
+-					|MD_FEATURE_RESHAPE_ACTIVE	\
+-					|MD_FEATURE_BAD_BLOCKS		\
+-					|MD_FEATURE_REPLACEMENT		\
+-					|MD_FEATURE_RESHAPE_BACKWARDS	\
+-					|MD_FEATURE_NEW_OFFSET		\
+-					|MD_FEATURE_BITMAP_VERSIONED	\
+-					|MD_FEATURE_JOURNAL		\
+-					|MD_FEATURE_PPL			\
+-					|MD_FEATURE_MULTIPLE_PPLS	\
+-					|MD_FEATURE_RAID0_LAYOUT	\
+-					)
+ 
+ static int role_from_sb(struct mdp_superblock_1 *sb)
+ {
+@@ -319,7 +199,7 @@ static int awrite(struct align_fd *afd, void *buf, int len)
+ static inline unsigned int md_feature_any_ppl_on(__u32 feature_map)
+ {
+ 	return ((__cpu_to_le32(feature_map) &
+-	    (MD_FEATURE_PPL | MD_FEATURE_MUTLIPLE_PPLS)));
++	    (MD_FEATURE_PPL | MD_FEATURE_MULTIPLE_PPLS)));
+ }
+ 
+ static inline unsigned int choose_ppl_space(int chunk)
+@@ -1483,7 +1363,7 @@ static int update_super1(struct supertype *st, struct mdinfo *info,
+ 	}
+ 	case UOPT_NO_PPL:
+ 		sb->feature_map &= ~__cpu_to_le32(MD_FEATURE_PPL |
+-						   MD_FEATURE_MUTLIPLE_PPLS);
++						  MD_FEATURE_MULTIPLE_PPLS);
+ 		break;
+ 	case UOPT_DEVICESIZE:
+ 		if (__le64_to_cpu(sb->super_offset) >=
+@@ -2650,7 +2530,7 @@ add_internal_bitmap1(struct supertype *st,
+ 	bms->nodes = __cpu_to_le32(st->nodes);
+ 	if (st->nodes)
+ 		sb->feature_map = __cpu_to_le32(__le32_to_cpu(sb->feature_map) |
+-						MD_FEATURE_BITMAP_VERSIONED);
++						MD_FEATURE_CLUSTERED);
+ 	if (st->cluster_name) {
+ 		len = sizeof(bms->cluster_name);
+ 		strncpy((char *)bms->cluster_name, st->cluster_name, len);
+diff --git a/udev.c b/udev.c
+index 88a99781..961ca970 100644
+--- a/udev.c
++++ b/udev.c
+@@ -20,8 +20,6 @@
+ 
+ #include	"mdadm.h"
+ #include	"udev.h"
+-#include	"md_p.h"
+-#include	"md_u.h"
+ #include	"xmalloc.h"
+ 
+ #include	<sys/wait.h>
+-- 
+2.41.0
+

SOURCES/0001-Unify-error-message.patch

@@ -1,47 +0,0 @@
-From f1cc8ab9ab6a92c3cd94ab7590b46285e214681e Mon Sep 17 00:00:00 2001
-From: Lukasz Florczak <lukasz.florczak@linux.intel.com>
-Date: Tue, 15 Mar 2022 09:30:30 +0100
-Subject: [PATCH 01/83] Unify error message.
-
-Provide the same error message for the same error that can occur in Grow.c and super-intel.c.
-
-Signed-off-by: Lukasz Florczak <lukasz.florczak@linux.intel.com>
-Signed-off-by: Jes Sorensen <jsorensen@fb.com>
----
- Grow.c        | 4 ++--
- super-intel.c | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/Grow.c b/Grow.c
-index 9c6fc95e..9a947204 100644
---- a/Grow.c
-+++ b/Grow.c
-@@ -1001,8 +1001,8 @@ int remove_disks_for_takeover(struct supertype *st,
- 				rv = 1;
- 			sysfs_free(arrays);
- 			if (rv) {
--				pr_err("Error. Cannot perform operation on /dev/%s\n", st->devnm);
--				pr_err("For this operation it MUST be single array in container\n");
-+				pr_err("Error. Cannot perform operation on %s- for this operation "
-+				       "it MUST be single array in container\n", st->devnm);
- 				return rv;
- 			}
- 		}
-diff --git a/super-intel.c b/super-intel.c
-index d5fad102..5ffa7636 100644
---- a/super-intel.c
-+++ b/super-intel.c
-@@ -11683,8 +11683,8 @@ enum imsm_reshape_type imsm_analyze_change(struct supertype *st,
- 		struct imsm_super *mpb = super->anchor;
- 
- 		if (mpb->num_raid_devs > 1) {
--			pr_err("Error. Cannot perform operation on %s- for this operation it MUST be single array in container\n",
--			       geo->dev_name);
-+			pr_err("Error. Cannot perform operation on %s- for this operation "
-+			       "it MUST be single array in container\n", geo->dev_name);
- 			change = -1;
- 		}
- 	}
--- 
-2.38.1
-

SOURCES/0002-mdadm-Fix-double-free.patch

@@ -1,33 +0,0 @@
-From 5ce5a15f0bf007e850e15259bba4f53736605fb2 Mon Sep 17 00:00:00 2001
-From: Lukasz Florczak <lukasz.florczak@linux.intel.com>
-Date: Fri, 25 Mar 2022 12:48:59 +0100
-Subject: [PATCH 02/83] mdadm: Fix double free
-
-If there was a size mismatch after creation it would get fixed on grow
-in imsm_fix_size_mismatch(), but due to double free "double free or corruption (fasttop)"
-error occurs and grow cannot proceed.
-
-Signed-off-by: Lukasz Florczak <lukasz.florczak@linux.intel.com>
-Signed-off-by: Jes Sorensen <jsorensen@fb.com>
----
- super-intel.c | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/super-intel.c b/super-intel.c
-index 5ffa7636..6ff336ee 100644
---- a/super-intel.c
-+++ b/super-intel.c
-@@ -11783,9 +11783,8 @@ static int imsm_fix_size_mismatch(struct supertype *st, int subarray_index)
- 			st->update_tail = &st->updates;
- 		} else {
- 			imsm_sync_metadata(st);
-+			free(update);
- 		}
--
--		free(update);
- 	}
- 	ret_val = 0;
- exit:
--- 
-2.38.1
-

SOURCES/0003-Grow_reshape-Add-r0-grow-size-error-message-and-upda.patch

@@ -1,83 +0,0 @@
-From fea026b4849182fc8413014c81456e7215af28d9 Mon Sep 17 00:00:00 2001
-From: Mateusz Kusiak <mateusz.kusiak@intel.com>
-Date: Wed, 23 Mar 2022 15:05:19 +0100
-Subject: [PATCH 03/83] Grow_reshape: Add r0 grow size error message and update
- man
-
-Grow size on r0 is not supported for imsm and native metadata.
-Add proper error message.
-Update man for proper use of --size.
-Signed-off-by: Mateusz Kusiak <mateusz.kusiak@intel.com>
-Signed-off-by: Jes Sorensen <jsorensen@fb.com>
----
- Grow.c     |  6 ++++++
- mdadm.8.in | 19 ++++++++++++-------
- 2 files changed, 18 insertions(+), 7 deletions(-)
-
-diff --git a/Grow.c b/Grow.c
-index 9a947204..aa72490b 100644
---- a/Grow.c
-+++ b/Grow.c
-@@ -1998,6 +1998,12 @@ int Grow_reshape(char *devname, int fd,
- 			goto release;
- 		}
- 
-+		if (array.level == 0) {
-+			pr_err("Component size change is not supported for RAID0\n");
-+			rv = 1;
-+			goto release;
-+		}
-+
- 		if (reshape_super(st, s->size, UnSet, UnSet, 0, 0, UnSet, NULL,
- 				  devname, APPLY_METADATA_CHANGES,
- 				  c->verbose > 0)) {
-diff --git a/mdadm.8.in b/mdadm.8.in
-index be902dba..e2a42425 100644
---- a/mdadm.8.in
-+++ b/mdadm.8.in
-@@ -459,7 +459,8 @@ number of spare devices.
- 
- .TP
- .BR \-z ", " \-\-size=
--Amount (in Kilobytes) of space to use from each drive in RAID levels 1/4/5/6.
-+Amount (in Kilobytes) of space to use from each drive in RAID levels 1/4/5/6/10
-+and for RAID 0 on external metadata.
- This must be a multiple of the chunk size, and must leave about 128Kb
- of space at the end of the drive for the RAID superblock.
- If this is not specified
-@@ -478,10 +479,19 @@ To guard against this it can be useful to set the initial size
- slightly smaller than the smaller device with the aim that it will
- still be larger than any replacement.
- 
-+This option can be used with
-+.B \-\-create
-+for determining initial size of an array. For external metadata,
-+it can be used on a volume, but not on a container itself.
-+Setting initial size of
-+.B RAID 0
-+array is only valid for external metadata.
-+
- This value can be set with
- .B \-\-grow
--for RAID level 1/4/5/6 though
-+for RAID level 1/4/5/6/10 though
- DDF arrays may not be able to support this.
-+RAID 0 array size cannot be changed.
- If the array was created with a size smaller than the currently
- active drives, the extra space can be accessed using
- .BR \-\-grow .
-@@ -501,11 +511,6 @@ problems the array can be made bigger again with no loss with another
- .B "\-\-grow \-\-size="
- command.
- 
--This value cannot be used when creating a
--.B CONTAINER
--such as with DDF and IMSM metadata, though it perfectly valid when
--creating an array inside a container.
--
- .TP
- .BR \-Z ", " \-\-array\-size=
- This is only meaningful with
--- 
-2.38.1
-

SOURCES/0004-udev-adapt-rules-to-systemd-v247.patch

@@ -1,67 +0,0 @@
-From cf9a109209aad285372b67306d54118af6fc522b Mon Sep 17 00:00:00 2001
-From: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
-Date: Fri, 14 Jan 2022 16:44:33 +0100
-Subject: [PATCH 04/83] udev: adapt rules to systemd v247
-
-New events have been added in kernel 4.14 ("bind" and "unbind").
-Systemd maintainer suggests to modify "add|change" branches.
-This patches implements their suggestions. There is no issue yet because
-new event types are not used in md.
-
-Please see systemd announcement for details[1].
-
-[1] https://lists.freedesktop.org/archives/systemd-devel/2020-November/045646.html
-
-Signed-off-by: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
-Signed-off-by: Jes Sorensen <jsorensen@fb.com>
----
- udev-md-raid-arrays.rules        | 2 +-
- udev-md-raid-assembly.rules      | 5 +++--
- udev-md-raid-safe-timeouts.rules | 2 +-
- 3 files changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/udev-md-raid-arrays.rules b/udev-md-raid-arrays.rules
-index 13c9076e..2967ace1 100644
---- a/udev-md-raid-arrays.rules
-+++ b/udev-md-raid-arrays.rules
-@@ -3,7 +3,7 @@
- SUBSYSTEM!="block", GOTO="md_end"
- 
- # handle md arrays
--ACTION!="add|change", GOTO="md_end"
-+ACTION=="remove", GOTO="md_end"
- KERNEL!="md*", GOTO="md_end"
- 
- # partitions have no md/{array_state,metadata_version}, but should not
-diff --git a/udev-md-raid-assembly.rules b/udev-md-raid-assembly.rules
-index d668cddd..39b4344b 100644
---- a/udev-md-raid-assembly.rules
-+++ b/udev-md-raid-assembly.rules
-@@ -30,8 +30,9 @@ LABEL="md_inc"
- 
- # remember you can limit what gets auto/incrementally assembled by
- # mdadm.conf(5)'s 'AUTO' and selectively whitelist using 'ARRAY'
--ACTION=="add|change", IMPORT{program}="BINDIR/mdadm --incremental --export $devnode --offroot $env{DEVLINKS}"
--ACTION=="add|change", ENV{MD_STARTED}=="*unsafe*", ENV{MD_FOREIGN}=="no", ENV{SYSTEMD_WANTS}+="mdadm-last-resort@$env{MD_DEVICE}.timer"
-+ACTION!="remove", IMPORT{program}="BINDIR/mdadm --incremental --export $devnode --offroot $env{DEVLINKS}"
-+ACTION!="remove", ENV{MD_STARTED}=="*unsafe*", ENV{MD_FOREIGN}=="no", ENV{SYSTEMD_WANTS}+="mdadm-last-resort@$env{MD_DEVICE}.timer"
-+
- ACTION=="remove", ENV{ID_PATH}=="?*", RUN+="BINDIR/mdadm -If $name --path $env{ID_PATH}"
- ACTION=="remove", ENV{ID_PATH}!="?*", RUN+="BINDIR/mdadm -If $name"
- 
-diff --git a/udev-md-raid-safe-timeouts.rules b/udev-md-raid-safe-timeouts.rules
-index 12bdcaa8..2e185cee 100644
---- a/udev-md-raid-safe-timeouts.rules
-+++ b/udev-md-raid-safe-timeouts.rules
-@@ -50,7 +50,7 @@ ENV{DEVTYPE}!="partition", GOTO="md_timeouts_end"
- 
- IMPORT{program}="/sbin/mdadm --examine --export $devnode"
- 
--ACTION=="add|change", \
-+ACTION!="remove", \
-   ENV{ID_FS_TYPE}=="linux_raid_member", \
-   ENV{MD_LEVEL}=="raid[1-9]*", \
-   TEST=="/sys/block/$parent/device/timeout", \
--- 
-2.38.1
-

SOURCES/0005-Replace-error-prone-signal-with-sigaction.patch

@@ -1,252 +0,0 @@
-From 83a379cfbd283b387919fe05d44eb4c49e155ad6 Mon Sep 17 00:00:00 2001
-From: Lukasz Florczak <lukasz.florczak@linux.intel.com>
-Date: Mon, 21 Feb 2022 13:05:20 +0100
-Subject: [PATCH 05/83] Replace error prone signal() with sigaction()
-
-Up to this date signal() was used which implementation could vary [1].
-Sigaction() call is preferred. This commit introduces replacement
-from signal() to sigaction() by the use of signal_s() wrapper.
-Also remove redundant signal.h header includes.
-
-[1] https://man7.org/linux/man-pages/man2/signal.2.html
-
-Signed-off-by: Lukasz Florczak <lukasz.florczak@linux.intel.com>
-Signed-off-by: Jes Sorensen <jsorensen@fb.com>
----
- Grow.c       |  4 ++--
- Monitor.c    |  5 +++--
- managemon.c  |  1 -
- mdadm.h      | 22 ++++++++++++++++++++++
- mdmon.c      |  1 -
- monitor.c    |  1 -
- probe_roms.c |  6 +++---
- raid6check.c | 25 +++++++++++++++----------
- util.c       |  1 -
- 9 files changed, 45 insertions(+), 21 deletions(-)
-
-diff --git a/Grow.c b/Grow.c
-index aa72490b..18c5719b 100644
---- a/Grow.c
-+++ b/Grow.c
-@@ -26,7 +26,6 @@
- #include	<sys/mman.h>
- #include	<stddef.h>
- #include	<stdint.h>
--#include	<signal.h>
- #include	<sys/wait.h>
- 
- #if ! defined(__BIG_ENDIAN) && ! defined(__LITTLE_ENDIAN)
-@@ -3566,7 +3565,8 @@ started:
- 		fd = -1;
- 	mlockall(MCL_FUTURE);
- 
--	signal(SIGTERM, catch_term);
-+	if (signal_s(SIGTERM, catch_term) == SIG_ERR)
-+		goto release;
- 
- 	if (st->ss->external) {
- 		/* metadata handler takes it from here */
-diff --git a/Monitor.c b/Monitor.c
-index 30c031a2..c0ab5412 100644
---- a/Monitor.c
-+++ b/Monitor.c
-@@ -26,7 +26,6 @@
- #include	"md_p.h"
- #include	"md_u.h"
- #include	<sys/wait.h>
--#include	<signal.h>
- #include	<limits.h>
- #include	<syslog.h>
- #ifndef NO_LIBUDEV
-@@ -435,8 +434,10 @@ static void alert(char *event, char *dev, char *disc, struct alert_info *info)
- 		if (mp) {
- 			FILE *mdstat;
- 			char hname[256];
-+
- 			gethostname(hname, sizeof(hname));
--			signal(SIGPIPE, SIG_IGN);
-+			signal_s(SIGPIPE, SIG_IGN);
-+
- 			if (info->mailfrom)
- 				fprintf(mp, "From: %s\n", info->mailfrom);
- 			else
-diff --git a/managemon.c b/managemon.c
-index bb7334cf..0e9bdf00 100644
---- a/managemon.c
-+++ b/managemon.c
-@@ -106,7 +106,6 @@
- #include	"mdmon.h"
- #include	<sys/syscall.h>
- #include	<sys/socket.h>
--#include	<signal.h>
- 
- static void close_aa(struct active_array *aa)
- {
-diff --git a/mdadm.h b/mdadm.h
-index c7268a71..26e7e5cd 100644
---- a/mdadm.h
-+++ b/mdadm.h
-@@ -46,6 +46,7 @@ extern __off64_t lseek64 __P ((int __fd, __off64_t __offset, int __whence));
- #include	<string.h>
- #include	<syslog.h>
- #include	<stdbool.h>
-+#include	<signal.h>
- /* Newer glibc requires sys/sysmacros.h directly for makedev() */
- #include	<sys/sysmacros.h>
- #ifdef __dietlibc__
-@@ -1729,6 +1730,27 @@ static inline char *to_subarray(struct mdstat_ent *ent, char *container)
- 	return &ent->metadata_version[10+strlen(container)+1];
- }
- 
-+/**
-+ * signal_s() - Wrapper for sigaction() with signal()-like interface.
-+ * @sig: The signal to set the signal handler to.
-+ * @handler: The signal handler.
-+ *
-+ * Return: previous handler or SIG_ERR on failure.
-+ */
-+static inline sighandler_t signal_s(int sig, sighandler_t handler)
-+{
-+	struct sigaction new_act;
-+	struct sigaction old_act;
-+
-+	new_act.sa_handler = handler;
-+	new_act.sa_flags = 0;
-+
-+	if (sigaction(sig, &new_act, &old_act) == 0)
-+		return old_act.sa_handler;
-+
-+	return SIG_ERR;
-+}
-+
- #ifdef DEBUG
- #define dprintf(fmt, arg...) \
- 	fprintf(stderr, "%s: %s: "fmt, Name, __func__, ##arg)
-diff --git a/mdmon.c b/mdmon.c
-index c71e62c6..5570574b 100644
---- a/mdmon.c
-+++ b/mdmon.c
-@@ -56,7 +56,6 @@
- #include	<errno.h>
- #include	<string.h>
- #include	<fcntl.h>
--#include	<signal.h>
- #include	<dirent.h>
- #ifdef USE_PTHREADS
- #include	<pthread.h>
-diff --git a/monitor.c b/monitor.c
-index e0d3be67..b877e595 100644
---- a/monitor.c
-+++ b/monitor.c
-@@ -22,7 +22,6 @@
- #include "mdmon.h"
- #include <sys/syscall.h>
- #include <sys/select.h>
--#include <signal.h>
- 
- static char *array_states[] = {
- 	"clear", "inactive", "suspended", "readonly", "read-auto",
-diff --git a/probe_roms.c b/probe_roms.c
-index 7ea04c7a..94c80c2c 100644
---- a/probe_roms.c
-+++ b/probe_roms.c
-@@ -22,7 +22,6 @@
- #include "probe_roms.h"
- #include "mdadm.h"
- #include <unistd.h>
--#include <signal.h>
- #include <fcntl.h>
- #include <sys/mman.h>
- #include <sys/stat.h>
-@@ -69,7 +68,8 @@ static int probe_address16(const __u16 *ptr, __u16 *val)
- 
- void probe_roms_exit(void)
- {
--	signal(SIGBUS, SIG_DFL);
-+	signal_s(SIGBUS, SIG_DFL);
-+
- 	if (rom_fd >= 0) {
- 		close(rom_fd);
- 		rom_fd = -1;
-@@ -98,7 +98,7 @@ int probe_roms_init(unsigned long align)
- 	if (roms_init())
- 		return -1;
- 
--	if (signal(SIGBUS, sigbus) == SIG_ERR)
-+	if (signal_s(SIGBUS, sigbus) == SIG_ERR)
- 		rc = -1;
- 	if (rc == 0) {
- 		fd = open("/dev/mem", O_RDONLY);
-diff --git a/raid6check.c b/raid6check.c
-index a8e6005b..99477761 100644
---- a/raid6check.c
-+++ b/raid6check.c
-@@ -24,7 +24,6 @@
- 
- #include "mdadm.h"
- #include <stdint.h>
--#include <signal.h>
- #include <sys/mman.h>
- 
- #define CHECK_PAGE_BITS (12)
-@@ -130,30 +129,36 @@ void raid6_stats(int *disk, int *results, int raid_disks, int chunk_size)
- }
- 
- int lock_stripe(struct mdinfo *info, unsigned long long start,
--		int chunk_size, int data_disks, sighandler_t *sig) {
-+		int chunk_size, int data_disks, sighandler_t *sig)
-+{
- 	int rv;
-+
-+	sig[0] = signal_s(SIGTERM, SIG_IGN);
-+	sig[1] = signal_s(SIGINT, SIG_IGN);
-+	sig[2] = signal_s(SIGQUIT, SIG_IGN);
-+
-+	if (sig[0] == SIG_ERR || sig[1] == SIG_ERR || sig[2] == SIG_ERR)
-+		return 1;
-+
- 	if(mlockall(MCL_CURRENT | MCL_FUTURE) != 0) {
- 		return 2;
- 	}
- 
--	sig[0] = signal(SIGTERM, SIG_IGN);
--	sig[1] = signal(SIGINT, SIG_IGN);
--	sig[2] = signal(SIGQUIT, SIG_IGN);
--
- 	rv = sysfs_set_num(info, NULL, "suspend_lo", start * chunk_size * data_disks);
- 	rv |= sysfs_set_num(info, NULL, "suspend_hi", (start + 1) * chunk_size * data_disks);
- 	return rv * 256;
- }
- 
--int unlock_all_stripes(struct mdinfo *info, sighandler_t *sig) {
-+int unlock_all_stripes(struct mdinfo *info, sighandler_t *sig)
-+{
- 	int rv;
- 	rv = sysfs_set_num(info, NULL, "suspend_lo", 0x7FFFFFFFFFFFFFFFULL);
- 	rv |= sysfs_set_num(info, NULL, "suspend_hi", 0);
- 	rv |= sysfs_set_num(info, NULL, "suspend_lo", 0);
- 
--	signal(SIGQUIT, sig[2]);
--	signal(SIGINT, sig[1]);
--	signal(SIGTERM, sig[0]);
-+	signal_s(SIGQUIT, sig[2]);
-+	signal_s(SIGINT, sig[1]);
-+	signal_s(SIGTERM, sig[0]);
- 
- 	if(munlockall() != 0)
- 		return 3;
-diff --git a/util.c b/util.c
-index 3d05d074..cc94f96e 100644
---- a/util.c
-+++ b/util.c
-@@ -35,7 +35,6 @@
- #include	<poll.h>
- #include	<ctype.h>
- #include	<dirent.h>
--#include	<signal.h>
- #include	<dlfcn.h>
- 
- 
--- 
-2.38.1
-

SOURCES/0007-mdadm-Update-ReadMe.patch

@@ -1,48 +0,0 @@
-From c23400377bb3d8e98e810cd92dba478dac1dff82 Mon Sep 17 00:00:00 2001
-From: Lukasz Florczak <lukasz.florczak@linux.intel.com>
-Date: Fri, 18 Mar 2022 09:26:05 +0100
-Subject: [PATCH 07/83] mdadm: Update ReadMe
-
-Instead of hardcoded config file path give reference to config manual.
-
-Add missing monitordelay and homecluster parameters.
-
-Signed-off-by: Lukasz Florczak <lukasz.florczak@linux.intel.com>
-Acked-by: Coly Li <colyli@suse.de>
-Signed-off-by: Jes Sorensen <jsorensen@fb.com>
----
- ReadMe.c | 11 ++++++-----
- 1 file changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/ReadMe.c b/ReadMe.c
-index 81399765..8f873c48 100644
---- a/ReadMe.c
-+++ b/ReadMe.c
-@@ -613,7 +613,6 @@ char Help_incr[] =
- ;
- 
- char Help_config[] =
--"The /etc/mdadm.conf config file:\n\n"
- " The config file contains, apart from blank lines and comment lines that\n"
- " start with a hash(#), array lines, device lines, and various\n"
- " configuration lines.\n"
-@@ -636,10 +635,12 @@ char Help_config[] =
- " than a device must match all of them to be considered.\n"
- "\n"
- " Other configuration lines include:\n"
--"  mailaddr, mailfrom, program     used for --monitor mode\n"
--"  create, auto                    used when creating device names in /dev\n"
--"  homehost, policy, part-policy   used to guide policy in various\n"
--"                                  situations\n"
-+"  mailaddr, mailfrom, program, monitordelay    used for --monitor mode\n"
-+"  create, auto                                 used when creating device names in /dev\n"
-+"  homehost, homecluster, policy, part-policy   used to guide policy in various\n"
-+"                                               situations\n"
-+"\n"
-+"For more details see mdadm.conf(5).\n"
- "\n"
- ;
- 
--- 
-2.38.1
-

SOURCES/0008-mdadm-Update-config-man-regarding-default-files-and-.patch

@@ -1,203 +0,0 @@
-From 24e075c659d0a8718aabefe5af4c97195a188af7 Mon Sep 17 00:00:00 2001
-From: Lukasz Florczak <lukasz.florczak@linux.intel.com>
-Date: Fri, 18 Mar 2022 09:26:06 +0100
-Subject: [PATCH 08/83] mdadm: Update config man regarding default files and
- multi-keyword behavior
-
-Simplify default and alternative config file and directory location references
-from mdadm(8) as references to mdadm.conf(5). Add FILE section in config man
-and explain order and conditions in which default and alternative config files
-and directories are used.
-
-Update config man behavior regarding parsing order when multiple keywords/config
-files are involved.
-
-Signed-off-by: Lukasz Florczak <lukasz.florczak@linux.intel.com>
-Acked-by: Coly Li <colyli@suse.de>
-Signed-off-by: Jes Sorensen <jsorensen@fb.com>
----
- mdadm.8.in      | 30 +++++++++--------------
- mdadm.conf.5.in | 65 ++++++++++++++++++++++++++++++++++++++++++++-----
- 2 files changed, 71 insertions(+), 24 deletions(-)
-
-diff --git a/mdadm.8.in b/mdadm.8.in
-index 8b21ffd4..0be02e4a 100644
---- a/mdadm.8.in
-+++ b/mdadm.8.in
-@@ -266,14 +266,11 @@ the exact meaning of this option in different contexts.
- 
- .TP
- .BR \-c ", " \-\-config=
--Specify the config file or directory.  Default is to use
--.B {CONFFILE}
--and
--.BR {CONFFILE}.d ,
--or if those are missing then
--.B {CONFFILE2}
--and
--.BR {CONFFILE2}.d .
-+Specify the config file or directory.  If not specified, default config file
-+and default conf.d directory will be used.  See
-+.BR mdadm.conf (5)
-+for more details.
-+
- If the config file given is
- .B "partitions"
- then nothing will be read, but
-@@ -2013,11 +2010,9 @@ The config file is only used if explicitly named with
- .B \-\-config
- or requested with (a possibly implicit)
- .BR \-\-scan .
--In the later case,
--.B {CONFFILE}
--or
--.B {CONFFILE2}
--is used.
-+In the later case, default config file is used.  See
-+.BR mdadm.conf (5)
-+for more details.
- 
- If
- .B \-\-scan
-@@ -3346,16 +3341,15 @@ on Monitor mode.
- 
- .SS {CONFFILE} (or {CONFFILE2})
- 
--The config file lists which devices may be scanned to see if
--they contain MD super block, and gives identifying information
--(e.g. UUID) about known MD arrays.  See
-+Default config file.  See
- .BR mdadm.conf (5)
- for more details.
- 
- .SS {CONFFILE}.d (or {CONFFILE2}.d)
- 
--A directory containing configuration files which are read in lexical
--order.
-+Default directory containing configuration files.  See
-+.BR mdadm.conf (5)
-+for more details.
- 
- .SS {MAP_PATH}
- When
-diff --git a/mdadm.conf.5.in b/mdadm.conf.5.in
-index 83edd008..dd331a6a 100644
---- a/mdadm.conf.5.in
-+++ b/mdadm.conf.5.in
-@@ -88,7 +88,8 @@ but only the major and minor device numbers.  It scans
- .I /dev
- to find the name that matches the numbers.
- 
--If no DEVICE line is present, then "DEVICE partitions containers" is assumed.
-+If no DEVICE line is present in any config file,
-+then "DEVICE partitions containers" is assumed.
- 
- For example:
- .IP
-@@ -272,6 +273,10 @@ catenated with spaces to form the address.
- Note that this value cannot be set via the
- .I mdadm
- commandline.  It is only settable via the config file.
-+There should only be one
-+.B MAILADDR
-+line and it should have only one address.  Any subsequent addresses
-+are silently ignored.
- 
- .TP
- .B PROGRAM
-@@ -286,7 +291,8 @@ device.
- 
- There should only be one
- .B program
--line and it should be give only one program.
-+line and it should be given only one program.  Any subsequent programs
-+are silently ignored.
- 
- 
- .TP
-@@ -295,7 +301,14 @@ The
- .B create
- line gives default values to be used when creating arrays, new members
- of arrays, and device entries for arrays.
--These include:
-+
-+There should only be one
-+.B create
-+line.  Any subsequent lines will override the previous settings.
-+
-+Keywords used in the
-+.I CREATE
-+line and supported values are:
- 
- .RS 4
- .TP
-@@ -475,8 +488,8 @@ The known metadata types are
- 
- .B AUTO
- should be given at most once.  Subsequent lines are silently ignored.
--Thus an earlier config file in a config directory will over-ride
--the setting in a later config file.
-+Thus a later config file in a config directory will not overwrite
-+the setting in an earlier config file.
- 
- .TP
- .B POLICY
-@@ -594,6 +607,7 @@ The
- line lists custom values of MD device's sysfs attributes which will be
- stored in sysfs after the array is assembled. Multiple lines are allowed and each
- line has to contain the uuid or the name of the device to which it relates.
-+Lines are applied in reverse order.
- .RS 4
- .TP
- .B uuid=
-@@ -621,7 +635,46 @@ is running in
- .B \-\-monitor
- mode.
- .B \-d/\-\-delay
--command line argument takes precedence over the config file
-+command line argument takes precedence over the config file.
-+
-+If multiple
-+.B MINITORDELAY
-+lines are provided, only first non-zero value is considered.
-+
-+.SH FILES
-+
-+.SS {CONFFILE}
-+
-+The default config file location, used when
-+.I mdadm
-+is running without --config option.
-+
-+.SS {CONFFILE}.d
-+
-+The default directory with config files. Used when
-+.I mdadm
-+is running without --config option, after successful reading of the
-+.B {CONFFILE}
-+default config file. Files in that directory
-+are read in lexical order.
-+
-+
-+.SS {CONFFILE2}
-+
-+Alternative config file that is read, when
-+.I mdadm
-+is running without --config option and the
-+.B {CONFFILE}
-+default config file was not opened successfully.
-+
-+.SS {CONFFILE2}.d
-+
-+The alternative directory with config files. Used when
-+.I mdadm
-+is runninng without --config option, after reading the
-+.B {CONFFILE2}
-+alternative config file whether it was successful or not. Files in
-+that directory are read in lexical order.
- 
- .SH EXAMPLE
- DEVICE /dev/sd[bcdjkl]1
--- 
-2.38.1
-

SOURCES/0009-mdadm-Update-config-manual.patch

@@ -1,45 +0,0 @@
-From c33bbda5b0e127bb161fd4ad44bcfaa2a5daf153 Mon Sep 17 00:00:00 2001
-From: Lukasz Florczak <lukasz.florczak@linux.intel.com>
-Date: Fri, 18 Mar 2022 09:26:07 +0100
-Subject: [PATCH 09/83] mdadm: Update config manual
-
-Add missing HOMECLUSTER keyword description.
-
-Signed-off-by: Lukasz Florczak <lukasz.florczak@linux.intel.com>
-Acked-by: Coly Li <colyli@suse.de>
-Signed-off-by: Jes Sorensen <jsorensen@fb.com>
----
- mdadm.conf.5.in | 17 +++++++++++++++++
- 1 file changed, 17 insertions(+)
-
-diff --git a/mdadm.conf.5.in b/mdadm.conf.5.in
-index dd331a6a..cd4e6a9d 100644
---- a/mdadm.conf.5.in
-+++ b/mdadm.conf.5.in
-@@ -439,6 +439,23 @@ from any possible local name. e.g.
- .B /dev/md/1_1
- or
- .BR /dev/md/home_0 .
-+
-+.TP
-+.B HOMECLUSTER
-+The
-+.B homcluster
-+line gives a default value for the
-+.B \-\-homecluster=
-+option to mdadm.  It specifies  the  cluster name for the md device.
-+The md device can be assembled only on the cluster which matches
-+the name specified. If
-+.B homcluster
-+is not provided, mdadm tries to detect the cluster name automatically.
-+
-+There should only be one
-+.B homecluster
-+line.  Any subsequent lines will be silently ignored.
-+
- .TP
- .B AUTO
- A list of names of metadata format can be given, each preceded by a
--- 
-2.38.1
-

SOURCES/0010-Create-Build-use-default_layout.patch

@@ -1,153 +0,0 @@
-From 913f07d1db4a0078acc26d6ccabe1c315cf9273c Mon Sep 17 00:00:00 2001
-From: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
-Date: Thu, 20 Jan 2022 13:18:32 +0100
-Subject: [PATCH 10/83] Create, Build: use default_layout()
-
-This code is duplicated for Build mode so make default_layout() extern
-and use it. Simplify the function structure.
-
-It introduced change for Build mode, now for raid0 RAID0_ORIG_LAYOUT
-will be returned same as for Create.
-
-Signed-off-by: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
-Signed-off-by: Jes Sorensen <jsorensen@fb.com>
----
- Build.c  | 23 +------------------
- Create.c | 67 ++++++++++++++++++++++++++++++++++----------------------
- mdadm.h  |  1 +
- 3 files changed, 43 insertions(+), 48 deletions(-)
-
-diff --git a/Build.c b/Build.c
-index 962c2e37..8d6f6f58 100644
---- a/Build.c
-+++ b/Build.c
-@@ -71,28 +71,7 @@ int Build(char *mddev, struct mddev_dev *devlist,
- 	}
- 
- 	if (s->layout == UnSet)
--		switch(s->level) {
--		default: /* no layout */
--			s->layout = 0;
--			break;
--		case 10:
--			s->layout = 0x102; /* near=2, far=1 */
--			if (c->verbose > 0)
--				pr_err("layout defaults to n1\n");
--			break;
--		case 5:
--		case 6:
--			s->layout = map_name(r5layout, "default");
--			if (c->verbose > 0)
--				pr_err("layout defaults to %s\n", map_num(r5layout, s->layout));
--			break;
--		case LEVEL_FAULTY:
--			s->layout = map_name(faultylayout, "default");
--
--			if (c->verbose > 0)
--				pr_err("layout defaults to %s\n", map_num(faultylayout, s->layout));
--			break;
--		}
-+		s->layout = default_layout(NULL, s->level, c->verbose);
- 
- 	/* We need to create the device.  It can have no name. */
- 	map_lock(&map);
-diff --git a/Create.c b/Create.c
-index 0ff1922d..9ea19de0 100644
---- a/Create.c
-+++ b/Create.c
-@@ -39,39 +39,54 @@ static int round_size_and_verify(unsigned long long *size, int chunk)
- 	return 0;
- }
- 
--static int default_layout(struct supertype *st, int level, int verbose)
-+/**
-+ * default_layout() - Get default layout for level.
-+ * @st: metadata requested, could be NULL.
-+ * @level: raid level requested.
-+ * @verbose: verbose level.
-+ *
-+ * Try to ask metadata handler first, otherwise use global defaults.
-+ *
-+ * Return: Layout or &UnSet, return value meaning depends of level used.
-+ */
-+int default_layout(struct supertype *st, int level, int verbose)
- {
- 	int layout = UnSet;
-+	mapping_t *layout_map = NULL;
-+	char *layout_name = NULL;
- 
- 	if (st && st->ss->default_geometry)
- 		st->ss->default_geometry(st, &level, &layout, NULL);
- 
--	if (layout == UnSet)
--		switch(level) {
--		default: /* no layout */
--			layout = 0;
--			break;
--		case 0:
--			layout = RAID0_ORIG_LAYOUT;
--			break;
--		case 10:
--			layout = 0x102; /* near=2, far=1 */
--			if (verbose > 0)
--				pr_err("layout defaults to n2\n");
--			break;
--		case 5:
--		case 6:
--			layout = map_name(r5layout, "default");
--			if (verbose > 0)
--				pr_err("layout defaults to %s\n", map_num(r5layout, layout));
--			break;
--		case LEVEL_FAULTY:
--			layout = map_name(faultylayout, "default");
-+	if (layout != UnSet)
-+		return layout;
- 
--			if (verbose > 0)
--				pr_err("layout defaults to %s\n", map_num(faultylayout, layout));
--			break;
--		}
-+	switch (level) {
-+	default: /* no layout */
-+		layout = 0;
-+		break;
-+	case 0:
-+		layout = RAID0_ORIG_LAYOUT;
-+		break;
-+	case 10:
-+		layout = 0x102; /* near=2, far=1 */
-+		layout_name = "n2";
-+		break;
-+	case 5:
-+	case 6:
-+		layout_map = r5layout;
-+		break;
-+	case LEVEL_FAULTY:
-+		layout_map = faultylayout;
-+		break;
-+	}
-+
-+	if (layout_map) {
-+		layout = map_name(layout_map, "default");
-+		layout_name = map_num(layout_map, layout);
-+	}
-+	if (layout_name && verbose > 0)
-+		pr_err("layout defaults to %s\n", layout_name);
- 
- 	return layout;
- }
-diff --git a/mdadm.h b/mdadm.h
-index 26e7e5cd..cd72e711 100644
---- a/mdadm.h
-+++ b/mdadm.h
-@@ -1512,6 +1512,7 @@ extern int get_linux_version(void);
- extern int mdadm_version(char *version);
- extern unsigned long long parse_size(char *size);
- extern int parse_uuid(char *str, int uuid[4]);
-+int default_layout(struct supertype *st, int level, int verbose);
- extern int is_near_layout_10(int layout);
- extern int parse_layout_10(char *layout);
- extern int parse_layout_faulty(char *layout);
--- 
-2.38.1
-

SOURCES/0011-mdadm-add-map_num_s.patch

@@ -1,382 +0,0 @@
-From 5f21d67472ad08c1e96b4385254adba79aa1c467 Mon Sep 17 00:00:00 2001
-From: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
-Date: Thu, 20 Jan 2022 13:18:33 +0100
-Subject: [PATCH 11/83] mdadm: add map_num_s()
-
-map_num() returns NULL if key is not defined. This patch adds
-alternative, non NULL version for cases where NULL is not expected.
-
-There are many printf() calls where map_num() is called on variable
-without NULL verification. It works, even if NULL is passed because
-gcc is able to ignore NULL argument quietly but the behavior is
-undefined. For safety reasons such usages will use map_num_s() now.
-It is a potential point of regression.
-
-Signed-off-by: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
-Signed-off-by: Jes Sorensen <jsorensen@fb.com>
----
- Assemble.c    |  6 ++----
- Create.c      |  2 +-
- Detail.c      |  4 ++--
- Grow.c        | 16 ++++++++--------
- Query.c       |  4 ++--
- maps.c        | 24 ++++++++++++++++++++++++
- mdadm.c       | 20 ++++++++++----------
- mdadm.h       |  2 +-
- super-ddf.c   |  6 +++---
- super-intel.c |  2 +-
- super0.c      |  2 +-
- super1.c      |  2 +-
- sysfs.c       |  9 +++++----
- 13 files changed, 61 insertions(+), 38 deletions(-)
-
-diff --git a/Assemble.c b/Assemble.c
-index 704b8293..9eac9ce0 100644
---- a/Assemble.c
-+++ b/Assemble.c
-@@ -63,7 +63,7 @@ static void set_array_assembly_status(struct context *c,
- 				   struct assembly_array_info *arr)
- {
- 	int raid_disks = arr->preexist_cnt + arr->new_cnt;
--	char *status_msg = map_num(assemble_statuses, status);
-+	char *status_msg = map_num_s(assemble_statuses, status);
- 
- 	if (c->export && result)
- 		*result |= status;
-@@ -77,9 +77,7 @@ static void set_array_assembly_status(struct context *c,
- 		fprintf(stderr, " (%d new)", arr->new_cnt);
- 	if (arr->exp_cnt)
- 		fprintf(stderr, " ( + %d for expansion)", arr->exp_cnt);
--	if (status_msg)
--		fprintf(stderr, " %s", status_msg);
--	fprintf(stderr, ".\n");
-+	fprintf(stderr, " %s.\n", status_msg);
- }
- 
- static int name_matches(char *found, char *required, char *homehost, int require_homehost)
-diff --git a/Create.c b/Create.c
-index 9ea19de0..c84c1ac8 100644
---- a/Create.c
-+++ b/Create.c
-@@ -83,7 +83,7 @@ int default_layout(struct supertype *st, int level, int verbose)
- 
- 	if (layout_map) {
- 		layout = map_name(layout_map, "default");
--		layout_name = map_num(layout_map, layout);
-+		layout_name = map_num_s(layout_map, layout);
- 	}
- 	if (layout_name && verbose > 0)
- 		pr_err("layout defaults to %s\n", layout_name);
-diff --git a/Detail.c b/Detail.c
-index 95d4cc70..ce7a8445 100644
---- a/Detail.c
-+++ b/Detail.c
-@@ -495,8 +495,8 @@ int Detail(char *dev, struct context *c)
- 			if (array.state & (1 << MD_SB_CLEAN)) {
- 				if ((array.level == 0) ||
- 				    (array.level == LEVEL_LINEAR))
--					arrayst = map_num(sysfs_array_states,
--							  sra->array_state);
-+					arrayst = map_num_s(sysfs_array_states,
-+							       sra->array_state);
- 				else
- 					arrayst = "clean";
- 			} else {
-diff --git a/Grow.c b/Grow.c
-index 18c5719b..8a242b0f 100644
---- a/Grow.c
-+++ b/Grow.c
-@@ -547,7 +547,7 @@ int Grow_consistency_policy(char *devname, int fd, struct context *c, struct sha
- 	if (s->consistency_policy != CONSISTENCY_POLICY_RESYNC &&
- 	    s->consistency_policy != CONSISTENCY_POLICY_PPL) {
- 		pr_err("Operation not supported for consistency policy %s\n",
--		       map_num(consistency_policies, s->consistency_policy));
-+		       map_num_s(consistency_policies, s->consistency_policy));
- 		return 1;
- 	}
- 
-@@ -578,14 +578,14 @@ int Grow_consistency_policy(char *devname, int fd, struct context *c, struct sha
- 
- 	if (sra->consistency_policy == (unsigned)s->consistency_policy) {
- 		pr_err("Consistency policy is already %s\n",
--		       map_num(consistency_policies, s->consistency_policy));
-+		       map_num_s(consistency_policies, s->consistency_policy));
- 		ret = 1;
- 		goto free_info;
- 	} else if (sra->consistency_policy != CONSISTENCY_POLICY_RESYNC &&
- 		   sra->consistency_policy != CONSISTENCY_POLICY_PPL) {
- 		pr_err("Current consistency policy is %s, cannot change to %s\n",
--		       map_num(consistency_policies, sra->consistency_policy),
--		       map_num(consistency_policies, s->consistency_policy));
-+		       map_num_s(consistency_policies, sra->consistency_policy),
-+		       map_num_s(consistency_policies, s->consistency_policy));
- 		ret = 1;
- 		goto free_info;
- 	}
-@@ -704,8 +704,8 @@ int Grow_consistency_policy(char *devname, int fd, struct context *c, struct sha
- 	}
- 
- 	ret = sysfs_set_str(sra, NULL, "consistency_policy",
--			    map_num(consistency_policies,
--				    s->consistency_policy));
-+			    map_num_s(consistency_policies,
-+					 s->consistency_policy));
- 	if (ret)
- 		pr_err("Failed to change array consistency policy\n");
- 
-@@ -2241,7 +2241,7 @@ size_change_error:
- 		info.new_layout = UnSet;
- 		if (info.array.level == 6 && info.new_level == UnSet) {
- 			char l[40], *h;
--			strcpy(l, map_num(r6layout, info.array.layout));
-+			strcpy(l, map_num_s(r6layout, info.array.layout));
- 			h = strrchr(l, '-');
- 			if (h && strcmp(h, "-6") == 0) {
- 				*h = 0;
-@@ -2266,7 +2266,7 @@ size_change_error:
- 			info.new_layout = info.array.layout;
- 		else if (info.array.level == 5 && info.new_level == 6) {
- 			char l[40];
--			strcpy(l, map_num(r5layout, info.array.layout));
-+			strcpy(l, map_num_s(r5layout, info.array.layout));
- 			strcat(l, "-6");
- 			info.new_layout = map_name(r6layout, l);
- 		} else {
-diff --git a/Query.c b/Query.c
-index 23fbf8aa..adcd231e 100644
---- a/Query.c
-+++ b/Query.c
-@@ -93,7 +93,7 @@ int Query(char *dev)
- 	else {
- 		printf("%s: %s %s %d devices, %d spare%s. Use mdadm --detail for more detail.\n",
- 		       dev, human_size_brief(larray_size,IEC),
--		       map_num(pers, level), raid_disks,
-+		       map_num_s(pers, level), raid_disks,
- 		       spare_disks, spare_disks == 1 ? "" : "s");
- 	}
- 	st = guess_super(fd);
-@@ -131,7 +131,7 @@ int Query(char *dev)
- 		       dev,
- 		       info.disk.number, info.array.raid_disks,
- 		       activity,
--		       map_num(pers, info.array.level),
-+		       map_num_s(pers, info.array.level),
- 		       mddev);
- 		if (st->ss == &super0)
- 			put_md_name(mddev);
-diff --git a/maps.c b/maps.c
-index a4fd2797..20fcf719 100644
---- a/maps.c
-+++ b/maps.c
-@@ -166,6 +166,30 @@ mapping_t sysfs_array_states[] = {
- 	{ NULL, ARRAY_UNKNOWN_STATE }
- };
- 
-+/**
-+ * map_num_s() - Safer alternative of map_num() function.
-+ * @map: map to search.
-+ * @num: key to match.
-+ *
-+ * Shall be used only if key existence is quaranted.
-+ *
-+ * Return: Pointer to name of the element.
-+ */
-+char *map_num_s(mapping_t *map, int num)
-+{
-+	char *ret = map_num(map, num);
-+
-+	assert(ret);
-+	return ret;
-+}
-+
-+/**
-+ * map_num() - get element name by key.
-+ * @map: map to search.
-+ * @num: key to match.
-+ *
-+ * Return: Pointer to name of the element or NULL.
-+ */
- char *map_num(mapping_t *map, int num)
- {
- 	while (map->name) {
-diff --git a/mdadm.c b/mdadm.c
-index 26299b2e..be40686c 100644
---- a/mdadm.c
-+++ b/mdadm.c
-@@ -280,8 +280,8 @@ int main(int argc, char *argv[])
- 			else
- 				fprintf(stderr, "-%c", opt);
- 			fprintf(stderr, " would set mdadm mode to \"%s\", but it is already set to \"%s\".\n",
--				map_num(modes, newmode),
--				map_num(modes, mode));
-+				map_num_s(modes, newmode),
-+				map_num_s(modes, mode));
- 			exit(2);
- 		} else if (!mode && newmode) {
- 			mode = newmode;
-@@ -544,7 +544,7 @@ int main(int argc, char *argv[])
- 			switch(s.level) {
- 			default:
- 				pr_err("layout not meaningful for %s arrays.\n",
--					map_num(pers, s.level));
-+					map_num_s(pers, s.level));
- 				exit(2);
- 			case UnSet:
- 				pr_err("raid level must be given before layout.\n");
-@@ -1248,10 +1248,10 @@ int main(int argc, char *argv[])
- 		if (option_index > 0)
- 			pr_err(":option --%s not valid in %s mode\n",
- 				long_options[option_index].name,
--				map_num(modes, mode));
-+				map_num_s(modes, mode));
- 		else
- 			pr_err("option -%c not valid in %s mode\n",
--				opt, map_num(modes, mode));
-+				opt, map_num_s(modes, mode));
- 		exit(2);
- 
- 	}
-@@ -1276,7 +1276,7 @@ int main(int argc, char *argv[])
- 		if (s.consistency_policy != CONSISTENCY_POLICY_UNKNOWN &&
- 		    s.consistency_policy != CONSISTENCY_POLICY_JOURNAL) {
- 			pr_err("--write-journal is not supported with consistency policy: %s\n",
--			       map_num(consistency_policies, s.consistency_policy));
-+			       map_num_s(consistency_policies, s.consistency_policy));
- 			exit(2);
- 		}
- 	}
-@@ -1285,12 +1285,12 @@ int main(int argc, char *argv[])
- 	    s.consistency_policy != CONSISTENCY_POLICY_UNKNOWN) {
- 		if (s.level <= 0) {
- 			pr_err("--consistency-policy not meaningful with level %s.\n",
--			       map_num(pers, s.level));
-+			       map_num_s(pers, s.level));
- 			exit(2);
- 		} else if (s.consistency_policy == CONSISTENCY_POLICY_JOURNAL &&
- 			   !s.journaldisks) {
- 			pr_err("--write-journal is required for consistency policy: %s\n",
--			       map_num(consistency_policies, s.consistency_policy));
-+			       map_num_s(consistency_policies, s.consistency_policy));
- 			exit(2);
- 		} else if (s.consistency_policy == CONSISTENCY_POLICY_PPL &&
- 			   s.level != 5) {
-@@ -1300,14 +1300,14 @@ int main(int argc, char *argv[])
- 			   (!s.bitmap_file ||
- 			    strcmp(s.bitmap_file, "none") == 0)) {
- 			pr_err("--bitmap is required for consistency policy: %s\n",
--			       map_num(consistency_policies, s.consistency_policy));
-+			       map_num_s(consistency_policies, s.consistency_policy));
- 			exit(2);
- 		} else if (s.bitmap_file &&
- 			   strcmp(s.bitmap_file, "none") != 0 &&
- 			   s.consistency_policy != CONSISTENCY_POLICY_BITMAP &&
- 			   s.consistency_policy != CONSISTENCY_POLICY_JOURNAL) {
- 			pr_err("--bitmap is not compatible with consistency policy: %s\n",
--			       map_num(consistency_policies, s.consistency_policy));
-+			       map_num_s(consistency_policies, s.consistency_policy));
- 			exit(2);
- 		}
- 	}
-diff --git a/mdadm.h b/mdadm.h
-index cd72e711..09915a00 100644
---- a/mdadm.h
-+++ b/mdadm.h
-@@ -770,7 +770,7 @@ extern int restore_stripes(int *dest, unsigned long long *offsets,
- #endif
- 
- #define SYSLOG_FACILITY LOG_DAEMON
--
-+extern char *map_num_s(mapping_t *map, int num);
- extern char *map_num(mapping_t *map, int num);
- extern int map_name(mapping_t *map, char *name);
- extern mapping_t r0layout[], r5layout[], r6layout[],
-diff --git a/super-ddf.c b/super-ddf.c
-index 3f304cdc..8cda23a7 100644
---- a/super-ddf.c
-+++ b/super-ddf.c
-@@ -1477,13 +1477,13 @@ static void examine_vds(struct ddf_super *sb)
- 		printf("\n");
- 		printf("         unit[%d] : %d\n", i, be16_to_cpu(ve->unit));
- 		printf("        state[%d] : %s, %s%s\n", i,
--		       map_num(ddf_state, ve->state & 7),
-+		       map_num_s(ddf_state, ve->state & 7),
- 		       (ve->state & DDF_state_morphing) ? "Morphing, ": "",
- 		       (ve->state & DDF_state_inconsistent)? "Not Consistent" : "Consistent");
- 		printf("   init state[%d] : %s\n", i,
--		       map_num(ddf_init_state, ve->init_state&DDF_initstate_mask));
-+		       map_num_s(ddf_init_state, ve->init_state & DDF_initstate_mask));
- 		printf("       access[%d] : %s\n", i,
--		       map_num(ddf_access, (ve->init_state & DDF_access_mask) >> 6));
-+		       map_num_s(ddf_access, (ve->init_state & DDF_access_mask) >> 6));
- 		printf("         Name[%d] : %.16s\n", i, ve->name);
- 		examine_vd(i, sb, ve->guid);
- 	}
-diff --git a/super-intel.c b/super-intel.c
-index 6ff336ee..ba3bd41f 100644
---- a/super-intel.c
-+++ b/super-intel.c
-@@ -5625,7 +5625,7 @@ static int init_super_imsm_volume(struct supertype *st, mdu_array_info_t *info,
- 		free(dev);
- 		free(dv);
- 		pr_err("imsm does not support consistency policy %s\n",
--		       map_num(consistency_policies, s->consistency_policy));
-+		       map_num_s(consistency_policies, s->consistency_policy));
- 		return 0;
- 	}
- 
-diff --git a/super0.c b/super0.c
-index b79b97a9..61c9ec1d 100644
---- a/super0.c
-+++ b/super0.c
-@@ -288,7 +288,7 @@ static void export_examine_super0(struct supertype *st)
- {
- 	mdp_super_t *sb = st->sb;
- 
--	printf("MD_LEVEL=%s\n", map_num(pers, sb->level));
-+	printf("MD_LEVEL=%s\n", map_num_s(pers, sb->level));
- 	printf("MD_DEVICES=%d\n", sb->raid_disks);
- 	if (sb->minor_version >= 90)
- 		printf("MD_UUID=%08x:%08x:%08x:%08x\n",
-diff --git a/super1.c b/super1.c
-index a12a5bc8..e3e2f954 100644
---- a/super1.c
-+++ b/super1.c
-@@ -671,7 +671,7 @@ static void export_examine_super1(struct supertype *st)
- 	int len = 32;
- 	int layout;
- 
--	printf("MD_LEVEL=%s\n", map_num(pers, __le32_to_cpu(sb->level)));
-+	printf("MD_LEVEL=%s\n", map_num_s(pers, __le32_to_cpu(sb->level)));
- 	printf("MD_DEVICES=%d\n", __le32_to_cpu(sb->raid_disks));
- 	for (i = 0; i < 32; i++)
- 		if (sb->set_name[i] == '\n' || sb->set_name[i] == '\0') {
-diff --git a/sysfs.c b/sysfs.c
-index 2995713d..0d98a65f 100644
---- a/sysfs.c
-+++ b/sysfs.c
-@@ -689,7 +689,7 @@ int sysfs_set_array(struct mdinfo *info, int vers)
- 	if (info->array.level < 0)
- 		return 0; /* FIXME */
- 	rv |= sysfs_set_str(info, NULL, "level",
--			    map_num(pers, info->array.level));
-+			    map_num_s(pers, info->array.level));
- 	if (info->reshape_active && info->delta_disks != UnSet)
- 		raid_disks -= info->delta_disks;
- 	rv |= sysfs_set_num(info, NULL, "raid_disks", raid_disks);
-@@ -724,9 +724,10 @@ int sysfs_set_array(struct mdinfo *info, int vers)
- 	}
- 
- 	if (info->consistency_policy == CONSISTENCY_POLICY_PPL) {
--		if (sysfs_set_str(info, NULL, "consistency_policy",
--				  map_num(consistency_policies,
--					  info->consistency_policy))) {
-+		char *policy = map_num_s(consistency_policies,
-+					    info->consistency_policy);
-+
-+		if (sysfs_set_str(info, NULL, "consistency_policy", policy)) {
- 			pr_err("This kernel does not support PPL. Falling back to consistency-policy=resync.\n");
- 			info->consistency_policy = CONSISTENCY_POLICY_RESYNC;
- 		}
--- 
-2.38.1
-

SOURCES/0012-mdadm-systemd-remove-KillMode-none-from-service-file.patch

@@ -1,69 +0,0 @@
-From 52c67fcdd6dadc4138ecad73e65599551804d445 Mon Sep 17 00:00:00 2001
-From: Coly Li <colyli@suse.de>
-Date: Tue, 15 Feb 2022 21:34:15 +0800
-Subject: [PATCH 012/125] mdadm/systemd: remove KillMode=none from service file
-
-For mdadm's systemd configuration, current systemd KillMode is "none" in
-following service files,
-- mdadm-grow-continue@.service
-- mdmon@.service
-
-This "none" mode is strongly againsted by systemd developers (see man 5
-systemd.kill for "KillMode=" section), and is considering to remove in
-future systemd version.
-
-As systemd developer explained in disuccsion, the systemd kill process
-is,
-1. send the signal specified by KillSignal= to the list of processes (if
-   any), TERM is the default
-2. wait until either the target of process(es) exit or a timeout expires
-3. if the timeout expires send the signal specified by FinalKillSignal=,
-   KILL is the default
-
-For "control-group", all remaining processes will receive the SIGTERM
-signal (by default) and if there are still processes after a period f
-time, they will get the SIGKILL signal.
-
-For "mixed", only the main process will receive the SIGTERM signal, and
-if there are still processes after a period of time, all remaining
-processes (including the main one) will receive the SIGKILL signal.
-
-From the above comment, currently KillMode=control-group is a proper
-kill mode. Since control-gropu is the default kill mode, the fix can be
-simply removing KillMode=none line from the service file, then the
-default mode will take effect.
-
-Signed-off-by: Coly Li <colyli@suse.de>
-Cc: Benjamin Brunner <bbrunner@suse.com>
-Cc: Franck Bui <fbui@suse.de>
-Cc: Jes Sorensen <jes@trained-monkey.org>
-Cc: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
-Cc: Neil Brown <neilb@suse.de>
-Cc: Xiao Ni <xni@redhat.com>
-Signed-off-by: Jes Sorensen <jsorensen@fb.com>
----
- systemd/mdadm-grow-continue@.service | 1 -
- systemd/mdmon@.service               | 1 -
- 2 files changed, 2 deletions(-)
-
-diff --git a/systemd/mdadm-grow-continue@.service b/systemd/mdadm-grow-continue@.service
-index 5c667d2a..9fdc8ec7 100644
---- a/systemd/mdadm-grow-continue@.service
-+++ b/systemd/mdadm-grow-continue@.service
-@@ -14,4 +14,3 @@ ExecStart=BINDIR/mdadm --grow --continue /dev/%I
- StandardInput=null
- StandardOutput=null
- StandardError=null
--KillMode=none
-diff --git a/systemd/mdmon@.service b/systemd/mdmon@.service
-index 85a3a7c5..77533958 100644
---- a/systemd/mdmon@.service
-+++ b/systemd/mdmon@.service
-@@ -25,4 +25,3 @@ Type=forking
- # it out) and systemd will remove it when transitioning from
- # initramfs to rootfs.
- #PIDFile=/run/mdadm/%I.pid
--KillMode=none
--- 
-2.38.1
-

SOURCES/0013-mdmon-Stop-parsing-duplicate-options.patch

@@ -1,122 +0,0 @@
-From 1066ab83dbe9a4cc20f7db44a40aa2cbb9d5eed6 Mon Sep 17 00:00:00 2001
-From: Lukasz Florczak <lukasz.florczak@linux.intel.com>
-Date: Fri, 13 May 2022 09:19:42 +0200
-Subject: [PATCH 13/83] mdmon: Stop parsing duplicate options
-
-Introduce new function is_duplicate_opt() to check if given option
-was already used and prevent setting it again along with an error
-message.
-
-Move parsing above in_initrd() check to be able to detect --offroot
-option duplicates.
-
-Now help option is executed after parsing to prevent executing commands
-like: 'mdmon --help --ndlksnlksajndfjksndafasj'.
-
-Signed-off-by: Lukasz Florczak <lukasz.florczak@linux.intel.com>
-Signed-off-by: Jes Sorensen <jsorensen@fb.com>
----
- mdmon.c | 44 +++++++++++++++++++++++++++++++++++---------
- 1 file changed, 35 insertions(+), 9 deletions(-)
-
-diff --git a/mdmon.c b/mdmon.c
-index 5570574b..c057da63 100644
---- a/mdmon.c
-+++ b/mdmon.c
-@@ -288,6 +288,15 @@ void usage(void)
- 	exit(2);
- }
- 
-+static bool is_duplicate_opt(const int opt, const int set_val, const char *long_name)
-+{
-+	if (opt == set_val) {
-+		pr_err("--%s option duplicated!\n", long_name);
-+		return true;
-+	}
-+	return false;
-+}
-+
- static int mdmon(char *devnm, int must_fork, int takeover);
- 
- int main(int argc, char *argv[])
-@@ -299,6 +308,7 @@ int main(int argc, char *argv[])
- 	int all = 0;
- 	int takeover = 0;
- 	int dofork = 1;
-+	bool help = false;
- 	static struct option options[] = {
- 		{"all", 0, NULL, 'a'},
- 		{"takeover", 0, NULL, 't'},
-@@ -308,37 +318,50 @@ int main(int argc, char *argv[])
- 		{NULL, 0, NULL, 0}
- 	};
- 
--	if (in_initrd()) {
--		/*
--		 * set first char of argv[0] to @. This is used by
--		 * systemd to signal that the task was launched from
--		 * initrd/initramfs and should be preserved during shutdown
--		 */
--		argv[0][0] = '@';
--	}
--
- 	while ((opt = getopt_long(argc, argv, "thaF", options, NULL)) != -1) {
- 		switch (opt) {
- 		case 'a':
-+			if (is_duplicate_opt(all, 1, "all"))
-+				exit(1);
- 			container_name = argv[optind-1];
- 			all = 1;
- 			break;
- 		case 't':
-+			if (is_duplicate_opt(takeover, 1, "takeover"))
-+				exit(1);
- 			takeover = 1;
- 			break;
- 		case 'F':
-+			if (is_duplicate_opt(dofork, 0, "foreground"))
-+				exit(1);
- 			dofork = 0;
- 			break;
- 		case OffRootOpt:
-+			if (is_duplicate_opt(argv[0][0], '@', "offroot"))
-+				exit(1);
- 			argv[0][0] = '@';
- 			break;
- 		case 'h':
-+			if (is_duplicate_opt(help, true, "help"))
-+				exit(1);
-+			help = true;
-+			break;
- 		default:
- 			usage();
- 			break;
- 		}
- 	}
- 
-+
-+	if (in_initrd()) {
-+		/*
-+		 * set first char of argv[0] to @. This is used by
-+		 * systemd to signal that the task was launched from
-+		 * initrd/initramfs and should be preserved during shutdown
-+		 */
-+		argv[0][0] = '@';
-+	}
-+
- 	if (all == 0 && container_name == NULL) {
- 		if (argv[optind])
- 			container_name = argv[optind];
-@@ -353,6 +376,9 @@ int main(int argc, char *argv[])
- 	if (strcmp(container_name, "/proc/mdstat") == 0)
- 		all = 1;
- 
-+	if (help)
-+		usage();
-+
- 	if (all) {
- 		struct mdstat_ent *mdstat, *e;
- 		int container_len = strlen(container_name);
--- 
-2.38.1
-

SOURCES/0014-Grow-block-n-on-external-volumes.patch

@@ -1,41 +0,0 @@
-From 20e114e334ed6ed3280c37a9a08fb95578393d1a Mon Sep 17 00:00:00 2001
-From: Mateusz Kusiak <mateusz.kusiak@intel.com>
-Date: Thu, 19 May 2022 09:16:08 +0200
-Subject: [PATCH 14/83] Grow: block -n on external volumes.
-
-Performing --raid-devices on external metadata volume should be blocked
-as it causes unwanted behaviour.
-
-Eg. Performing
-mdadm -G /dev/md/volume -l10 -n4
-on r0_d2 inside 4 disk container, returns
-mdadm: Need 2 spares to avoid degraded array, only have 0.
-
-Signed-off-by: Mateusz Kusiak <mateusz.kusiak@intel.com>
-Signed-off-by: Jes Sorensen <jsorensen@fb.com>
----
- Grow.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/Grow.c b/Grow.c
-index 8a242b0f..f6efbc48 100644
---- a/Grow.c
-+++ b/Grow.c
-@@ -1892,6 +1892,14 @@ int Grow_reshape(char *devname, int fd,
- 
- 		if (retval) {
- 			pr_err("Cannot read superblock for %s\n", devname);
-+			close(cfd);
-+			free(subarray);
-+			return 1;
-+		}
-+
-+		if (s->raiddisks && subarray) {
-+			pr_err("--raid-devices operation can be performed on a container only\n");
-+			close(cfd);
- 			free(subarray);
- 			return 1;
- 		}
--- 
-2.38.1
-

SOURCES/0015-Incremental-Fix-possible-memory-and-resource-leaks.patch

@@ -1,90 +0,0 @@
-From de064c93e3819d72720e4fba6575265ba10e1553 Mon Sep 17 00:00:00 2001
-From: Mateusz Grzonka <mateusz.grzonka@intel.com>
-Date: Mon, 13 Jun 2022 12:11:25 +0200
-Subject: [PATCH 15/83] Incremental: Fix possible memory and resource leaks
-
-map allocated through map_by_uuid() is not freed if mdfd is invalid.
-In addition mdfd is not closed, and mdinfo list is not freed too.
-
-Signed-off-by: Mateusz Grzonka <mateusz.grzonka@intel.com>
-Change-Id: I25e726f0e2502cf7e8ce80c2bd7944b3b1e2b9dc
-Signed-off-by: Jes Sorensen <jsorensen@fb.com>
----
- Incremental.c | 32 +++++++++++++++++++++++---------
- 1 file changed, 23 insertions(+), 9 deletions(-)
-
-diff --git a/Incremental.c b/Incremental.c
-index a57fc323..4d0cd9d6 100644
---- a/Incremental.c
-+++ b/Incremental.c
-@@ -1499,7 +1499,7 @@ static int Incremental_container(struct supertype *st, char *devname,
- 		return 0;
- 	}
- 	for (ra = list ; ra ; ra = ra->next) {
--		int mdfd;
-+		int mdfd = -1;
- 		char chosen_name[1024];
- 		struct map_ent *mp;
- 		struct mddev_ident *match = NULL;
-@@ -1514,6 +1514,12 @@ static int Incremental_container(struct supertype *st, char *devname,
- 
- 		if (mp) {
- 			mdfd = open_dev(mp->devnm);
-+			if (!is_fd_valid(mdfd)) {
-+				pr_err("failed to open %s: %s.\n",
-+				       mp->devnm, strerror(errno));
-+				rv = 2;
-+				goto release;
-+			}
- 			if (mp->path)
- 				strcpy(chosen_name, mp->path);
- 			else
-@@ -1573,21 +1579,25 @@ static int Incremental_container(struct supertype *st, char *devname,
- 					    c->autof,
- 					    trustworthy,
- 					    chosen_name, 0);
-+
-+			if (!is_fd_valid(mdfd)) {
-+				pr_err("create_mddev failed with chosen name %s: %s.\n",
-+				       chosen_name, strerror(errno));
-+				rv = 2;
-+				goto release;
-+			}
- 		}
--		if (only && (!mp || strcmp(mp->devnm, only) != 0))
--			continue;
- 
--		if (mdfd < 0) {
--			pr_err("failed to open %s: %s.\n",
--				chosen_name, strerror(errno));
--			return 2;
-+		if (only && (!mp || strcmp(mp->devnm, only) != 0)) {
-+			close_fd(&mdfd);
-+			continue;
- 		}
- 
- 		assemble_container_content(st, mdfd, ra, c,
- 					   chosen_name, &result);
- 		map_free(map);
- 		map = NULL;
--		close(mdfd);
-+		close_fd(&mdfd);
- 	}
- 	if (c->export && result) {
- 		char sep = '=';
-@@ -1610,7 +1620,11 @@ static int Incremental_container(struct supertype *st, char *devname,
- 		}
- 		printf("\n");
- 	}
--	return 0;
-+
-+release:
-+	map_free(map);
-+	sysfs_free(list);
-+	return rv;
- }
- 
- static void run_udisks(char *arg1, char *arg2)
--- 
-2.38.1
-

SOURCES/0016-Mdmonitor-Fix-segfault.patch

@@ -1,98 +0,0 @@
-From e702f392959d1c2ad2089e595b52235ed97b4e18 Mon Sep 17 00:00:00 2001
-From: Kinga Tanska <kinga.tanska@intel.com>
-Date: Mon, 6 Jun 2022 12:32:12 +0200
-Subject: [PATCH 16/83] Mdmonitor: Fix segfault
-
-Mdadm with "--monitor" parameter requires md device
-as an argument to be monitored. If given argument is
-not a md device, error shall be returned. Previously
-it was not checked and invalid argument caused
-segmentation fault. This commit adds checking
-that devices passed to mdmonitor are md devices.
-
-Signed-off-by: Kinga Tanska <kinga.tanska@intel.com>
-Signed-off-by: Jes Sorensen <jsorensen@fb.com>
----
- Monitor.c | 10 +++++++++-
- mdadm.h   |  1 +
- mdopen.c  | 17 +++++++++++++++++
- 3 files changed, 27 insertions(+), 1 deletion(-)
-
-diff --git a/Monitor.c b/Monitor.c
-index c0ab5412..4e5802b5 100644
---- a/Monitor.c
-+++ b/Monitor.c
-@@ -182,6 +182,7 @@ int Monitor(struct mddev_dev *devlist,
- 				continue;
- 			if (strcasecmp(mdlist->devname, "<ignore>") == 0)
- 				continue;
-+
- 			st = xcalloc(1, sizeof *st);
- 			if (mdlist->devname[0] == '/')
- 				st->devname = xstrdup(mdlist->devname);
-@@ -190,6 +191,8 @@ int Monitor(struct mddev_dev *devlist,
- 				strcpy(strcpy(st->devname, "/dev/md/"),
- 				       mdlist->devname);
- 			}
-+			if (!is_mddev(mdlist->devname))
-+				return 1;
- 			st->next = statelist;
- 			st->devnm[0] = 0;
- 			st->percent = RESYNC_UNKNOWN;
-@@ -203,7 +206,12 @@ int Monitor(struct mddev_dev *devlist,
- 		struct mddev_dev *dv;
- 
- 		for (dv = devlist; dv; dv = dv->next) {
--			struct state *st = xcalloc(1, sizeof *st);
-+			struct state *st;
-+
-+			if (!is_mddev(dv->devname))
-+				return 1;
-+
-+			st = xcalloc(1, sizeof *st);
- 			mdlist = conf_get_ident(dv->devname);
- 			st->devname = xstrdup(dv->devname);
- 			st->next = statelist;
-diff --git a/mdadm.h b/mdadm.h
-index 09915a00..d53df169 100644
---- a/mdadm.h
-+++ b/mdadm.h
-@@ -1636,6 +1636,7 @@ extern int create_mddev(char *dev, char *name, int autof, int trustworthy,
- #define	FOREIGN	2
- #define	METADATA 3
- extern int open_mddev(char *dev, int report_errors);
-+extern int is_mddev(char *dev);
- extern int open_container(int fd);
- extern int metadata_container_matches(char *metadata, char *devnm);
- extern int metadata_subdev_matches(char *metadata, char *devnm);
-diff --git a/mdopen.c b/mdopen.c
-index 245be537..d18c9319 100644
---- a/mdopen.c
-+++ b/mdopen.c
-@@ -475,6 +475,23 @@ int open_mddev(char *dev, int report_errors)
- 	return mdfd;
- }
- 
-+/**
-+ * is_mddev() - check that file name passed is an md device.
-+ * @dev: file name that has to be checked.
-+ * Return: 1 if file passed is an md device, 0 if not.
-+ */
-+int is_mddev(char *dev)
-+{
-+	int fd = open_mddev(dev, 1);
-+
-+	if (fd >= 0) {
-+		close(fd);
-+		return 1;
-+	}
-+
-+	return 0;
-+}
-+
- char *find_free_devnm(int use_partitions)
- {
- 	static char devnm[32];
--- 
-2.38.1
-

SOURCES/0017-Mdmonitor-Improve-logging-method.patch

@@ -1,61 +0,0 @@
-From f5ff2988761625b43eb15555993f2797af29f166 Mon Sep 17 00:00:00 2001
-From: Kinga Tanska <kinga.tanska@intel.com>
-Date: Mon, 6 Jun 2022 12:32:13 +0200
-Subject: [PATCH 17/83] Mdmonitor: Improve logging method
-
-Change logging, and as a result, mdmonitor in verbose
-mode will report its configuration.
-
-Signed-off-by: Kinga Tanska <kinga.tanska@intel.com>
-Signed-off-by: Oleksandr Shchirskyi <oleksandr.shchirskyi@intel.com>
-Signed-off-by: Jes Sorensen <jsorensen@fb.com>
----
- Monitor.c | 25 ++++++++++++++-----------
- 1 file changed, 14 insertions(+), 11 deletions(-)
-
-diff --git a/Monitor.c b/Monitor.c
-index 4e5802b5..6ca1ebe5 100644
---- a/Monitor.c
-+++ b/Monitor.c
-@@ -136,24 +136,27 @@ int Monitor(struct mddev_dev *devlist,
- 	struct mddev_ident *mdlist;
- 	int delay_for_event = c->delay;
- 
--	if (!mailaddr) {
-+	if (!mailaddr)
- 		mailaddr = conf_get_mailaddr();
--		if (mailaddr && ! c->scan)
--			pr_err("Monitor using email address \"%s\" from config file\n",
--			       mailaddr);
--	}
--	mailfrom = conf_get_mailfrom();
- 
--	if (!alert_cmd) {
-+	if (!alert_cmd)
- 		alert_cmd = conf_get_program();
--		if (alert_cmd && !c->scan)
--			pr_err("Monitor using program \"%s\" from config file\n",
--			       alert_cmd);
--	}
-+
-+	mailfrom = conf_get_mailfrom();
-+
- 	if (c->scan && !mailaddr && !alert_cmd && !dosyslog) {
- 		pr_err("No mail address or alert command - not monitoring.\n");
- 		return 1;
- 	}
-+
-+	if (c->verbose) {
-+		pr_err("Monitor is started with delay %ds\n", c->delay);
-+		if (mailaddr)
-+			pr_err("Monitor using email address %s\n", mailaddr);
-+		if (alert_cmd)
-+			pr_err("Monitor using program %s\n", alert_cmd);
-+	}
-+
- 	info.alert_cmd = alert_cmd;
- 	info.mailaddr = mailaddr;
- 	info.mailfrom = mailfrom;
--- 
-2.38.1
-

SOURCES/0018-Fix-possible-NULL-ptr-dereferences-and-memory-leaks.patch

@@ -1,73 +0,0 @@
-From 626bc45396c4959f2c4685c2faa7c4f553f4efdf Mon Sep 17 00:00:00 2001
-From: Mateusz Grzonka <mateusz.grzonka@intel.com>
-Date: Mon, 13 Jun 2022 11:59:34 +0200
-Subject: [PATCH 18/83] Fix possible NULL ptr dereferences and memory leaks
-
-In Assemble there was a NULL check for sra variable,
-which effectively didn't stop the execution in every case.
-That might have resulted in a NULL pointer dereference.
-
-Also in super-ddf, mu variable was set to NULL for some condition,
-and then immidiately dereferenced.
-Additionally some memory wasn't freed as well.
-
-Signed-off-by: Mateusz Grzonka <mateusz.grzonka@intel.com>
-Signed-off-by: Jes Sorensen <jsorensen@fb.com>
----
- Assemble.c  | 7 ++++++-
- super-ddf.c | 9 +++++++--
- 2 files changed, 13 insertions(+), 3 deletions(-)
-
-diff --git a/Assemble.c b/Assemble.c
-index 9eac9ce0..4b213560 100644
---- a/Assemble.c
-+++ b/Assemble.c
-@@ -1982,7 +1982,12 @@ int assemble_container_content(struct supertype *st, int mdfd,
- 	}
- 
- 	sra = sysfs_read(mdfd, NULL, GET_VERSION|GET_DEVS);
--	if (sra == NULL || strcmp(sra->text_version, content->text_version) != 0) {
-+	if (sra == NULL) {
-+		pr_err("Failed to read sysfs parameters\n");
-+		return 1;
-+	}
-+
-+	if (strcmp(sra->text_version, content->text_version) != 0) {
- 		if (content->array.major_version == -1 &&
- 		    content->array.minor_version == -2 &&
- 		    c->readonly &&
-diff --git a/super-ddf.c b/super-ddf.c
-index 8cda23a7..abbc8b09 100644
---- a/super-ddf.c
-+++ b/super-ddf.c
-@@ -5125,13 +5125,16 @@ static struct mdinfo *ddf_activate_spare(struct active_array *a,
- 	 */
- 	vc = find_vdcr(ddf, a->info.container_member, rv->disk.raid_disk,
- 		       &n_bvd, &vcl);
--	if (vc == NULL)
-+	if (vc == NULL) {
-+		free(rv);
- 		return NULL;
-+	}
- 
- 	mu = xmalloc(sizeof(*mu));
- 	if (posix_memalign(&mu->space, 512, sizeof(struct vcl)) != 0) {
- 		free(mu);
--		mu = NULL;
-+		free(rv);
-+		return NULL;
- 	}
- 
- 	mu->len = ddf->conf_rec_len * 512 * vcl->conf.sec_elmnt_count;
-@@ -5161,6 +5164,8 @@ static struct mdinfo *ddf_activate_spare(struct active_array *a,
- 			pr_err("BUG: can't find disk %d (%d/%d)\n",
- 			       di->disk.raid_disk,
- 			       di->disk.major, di->disk.minor);
-+			free(mu);
-+			free(rv);
- 			return NULL;
- 		}
- 		vc->phys_refnum[i_prim] = ddf->phys->entries[dl->pdnum].refnum;
--- 
-2.38.1
-

SOURCES/0019-imsm-Remove-possibility-for-get_imsm_dev-to-return-N.patch

@@ -1,301 +0,0 @@
-From 756a15f32338fdf0c562678694bc8991ad6afb90 Mon Sep 17 00:00:00 2001
-From: Mateusz Grzonka <mateusz.grzonka@intel.com>
-Date: Mon, 13 Jun 2022 12:00:09 +0200
-Subject: [PATCH 19/83] imsm: Remove possibility for get_imsm_dev to return
- NULL
-
-Returning NULL from get_imsm_dev or __get_imsm_dev will cause segfault.
-Guarantee that it never happens.
-
-Signed-off-by: Mateusz Grzonka <mateusz.grzonka@intel.com>
-Signed-off-by: Jes Sorensen <jsorensen@fb.com>
----
- super-intel.c | 153 +++++++++++++++++++++++++-------------------------
- 1 file changed, 78 insertions(+), 75 deletions(-)
-
-diff --git a/super-intel.c b/super-intel.c
-index ba3bd41f..3788feb9 100644
---- a/super-intel.c
-+++ b/super-intel.c
-@@ -851,6 +851,21 @@ static struct disk_info *get_disk_info(struct imsm_update_create_array *update)
- 	return inf;
- }
- 
-+/**
-+ * __get_imsm_dev() - Get device with index from imsm_super.
-+ * @mpb: &imsm_super pointer, not NULL.
-+ * @index: Device index.
-+ *
-+ * Function works as non-NULL, aborting in such a case,
-+ * when NULL would be returned.
-+ *
-+ * Device index should be in range 0 up to num_raid_devs.
-+ * Function assumes the index was already verified.
-+ * Index must be valid, otherwise abort() is called.
-+ *
-+ * Return: Pointer to corresponding imsm_dev.
-+ *
-+ */
- static struct imsm_dev *__get_imsm_dev(struct imsm_super *mpb, __u8 index)
- {
- 	int offset;
-@@ -858,30 +873,47 @@ static struct imsm_dev *__get_imsm_dev(struct imsm_super *mpb, __u8 index)
- 	void *_mpb = mpb;
- 
- 	if (index >= mpb->num_raid_devs)
--		return NULL;
-+		goto error;
- 
- 	/* devices start after all disks */
- 	offset = ((void *) &mpb->disk[mpb->num_disks]) - _mpb;
- 
--	for (i = 0; i <= index; i++)
-+	for (i = 0; i <= index; i++, offset += sizeof_imsm_dev(_mpb + offset, 0))
- 		if (i == index)
- 			return _mpb + offset;
--		else
--			offset += sizeof_imsm_dev(_mpb + offset, 0);
--
--	return NULL;
-+error:
-+	pr_err("cannot find imsm_dev with index %u in imsm_super\n", index);
-+	abort();
- }
- 
-+/**
-+ * get_imsm_dev() - Get device with index from intel_super.
-+ * @super: &intel_super pointer, not NULL.
-+ * @index: Device index.
-+ *
-+ * Function works as non-NULL, aborting in such a case,
-+ * when NULL would be returned.
-+ *
-+ * Device index should be in range 0 up to num_raid_devs.
-+ * Function assumes the index was already verified.
-+ * Index must be valid, otherwise abort() is called.
-+ *
-+ * Return: Pointer to corresponding imsm_dev.
-+ *
-+ */
- static struct imsm_dev *get_imsm_dev(struct intel_super *super, __u8 index)
- {
- 	struct intel_dev *dv;
- 
- 	if (index >= super->anchor->num_raid_devs)
--		return NULL;
-+		goto error;
-+
- 	for (dv = super->devlist; dv; dv = dv->next)
- 		if (dv->index == index)
- 			return dv->dev;
--	return NULL;
-+error:
-+	pr_err("cannot find imsm_dev with index %u in intel_super\n", index);
-+	abort();
- }
- 
- static inline unsigned long long __le48_to_cpu(const struct bbm_log_block_addr
-@@ -4364,8 +4396,7 @@ int check_mpb_migr_compatibility(struct intel_super *super)
- 	for (i = 0; i < super->anchor->num_raid_devs; i++) {
- 		struct imsm_dev *dev_iter = __get_imsm_dev(super->anchor, i);
- 
--		if (dev_iter &&
--		    dev_iter->vol.migr_state == 1 &&
-+		if (dev_iter->vol.migr_state == 1 &&
- 		    dev_iter->vol.migr_type == MIGR_GEN_MIGR) {
- 			/* This device is migrating */
- 			map0 = get_imsm_map(dev_iter, MAP_0);
-@@ -4514,8 +4545,6 @@ static void clear_hi(struct intel_super *super)
- 	}
- 	for (i = 0; i < mpb->num_raid_devs; ++i) {
- 		struct imsm_dev *dev = get_imsm_dev(super, i);
--		if (!dev)
--			return;
- 		for (n = 0; n < 2; ++n) {
- 			struct imsm_map *map = get_imsm_map(dev, n);
- 			if (!map)
-@@ -5836,7 +5865,7 @@ static int add_to_super_imsm_volume(struct supertype *st, mdu_disk_info_t *dk,
- 		struct imsm_dev *_dev = __get_imsm_dev(mpb, 0);
- 
- 		_disk = __get_imsm_disk(mpb, dl->index);
--		if (!_dev || !_disk) {
-+		if (!_disk) {
- 			pr_err("BUG mpb setup error\n");
- 			return 1;
- 		}
-@@ -6171,10 +6200,10 @@ static int write_super_imsm(struct supertype *st, int doclose)
- 	for (i = 0; i < mpb->num_raid_devs; i++) {
- 		struct imsm_dev *dev = __get_imsm_dev(mpb, i);
- 		struct imsm_dev *dev2 = get_imsm_dev(super, i);
--		if (dev && dev2) {
--			imsm_copy_dev(dev, dev2);
--			mpb_size += sizeof_imsm_dev(dev, 0);
--		}
-+
-+		imsm_copy_dev(dev, dev2);
-+		mpb_size += sizeof_imsm_dev(dev, 0);
-+
- 		if (is_gen_migration(dev2))
- 			clear_migration_record = 0;
- 	}
-@@ -9033,29 +9062,26 @@ static int imsm_rebuild_allowed(struct supertype *cont, int dev_idx, int failed)
- 	__u8 state;
- 
- 	dev2 = get_imsm_dev(cont->sb, dev_idx);
--	if (dev2) {
--		state = imsm_check_degraded(cont->sb, dev2, failed, MAP_0);
--		if (state == IMSM_T_STATE_FAILED) {
--			map = get_imsm_map(dev2, MAP_0);
--			if (!map)
--				return 1;
--			for (slot = 0; slot < map->num_members; slot++) {
--				/*
--				 * Check if failed disks are deleted from intel
--				 * disk list or are marked to be deleted
--				 */
--				idx = get_imsm_disk_idx(dev2, slot, MAP_X);
--				idisk = get_imsm_dl_disk(cont->sb, idx);
--				/*
--				 * Do not rebuild the array if failed disks
--				 * from failed sub-array are not removed from
--				 * container.
--				 */
--				if (idisk &&
--				    is_failed(&idisk->disk) &&
--				    (idisk->action != DISK_REMOVE))
--					return 0;
--			}
-+
-+	state = imsm_check_degraded(cont->sb, dev2, failed, MAP_0);
-+	if (state == IMSM_T_STATE_FAILED) {
-+		map = get_imsm_map(dev2, MAP_0);
-+		for (slot = 0; slot < map->num_members; slot++) {
-+			/*
-+			 * Check if failed disks are deleted from intel
-+			 * disk list or are marked to be deleted
-+			 */
-+			idx = get_imsm_disk_idx(dev2, slot, MAP_X);
-+			idisk = get_imsm_dl_disk(cont->sb, idx);
-+			/*
-+			 * Do not rebuild the array if failed disks
-+			 * from failed sub-array are not removed from
-+			 * container.
-+			 */
-+			if (idisk &&
-+			    is_failed(&idisk->disk) &&
-+			    (idisk->action != DISK_REMOVE))
-+				return 0;
- 		}
- 	}
- 	return 1;
-@@ -10089,7 +10115,6 @@ static void imsm_process_update(struct supertype *st,
- 		int victim = u->dev_idx;
- 		struct active_array *a;
- 		struct intel_dev **dp;
--		struct imsm_dev *dev;
- 
- 		/* sanity check that we are not affecting the uuid of
- 		 * active arrays, or deleting an active array
-@@ -10105,8 +10130,7 @@ static void imsm_process_update(struct supertype *st,
- 		 * is active in the container, so checking
- 		 * mpb->num_raid_devs is just extra paranoia
- 		 */
--		dev = get_imsm_dev(super, victim);
--		if (a || !dev || mpb->num_raid_devs == 1) {
-+		if (a || mpb->num_raid_devs == 1 || victim >= super->anchor->num_raid_devs) {
- 			dprintf("failed to delete subarray-%d\n", victim);
- 			break;
- 		}
-@@ -10140,7 +10164,7 @@ static void imsm_process_update(struct supertype *st,
- 			if (a->info.container_member == target)
- 				break;
- 		dev = get_imsm_dev(super, u->dev_idx);
--		if (a || !dev || !check_name(super, name, 1)) {
-+		if (a || !check_name(super, name, 1)) {
- 			dprintf("failed to rename subarray-%d\n", target);
- 			break;
- 		}
-@@ -10169,10 +10193,6 @@ static void imsm_process_update(struct supertype *st,
- 		struct imsm_update_rwh_policy *u = (void *)update->buf;
- 		int target = u->dev_idx;
- 		struct imsm_dev *dev = get_imsm_dev(super, target);
--		if (!dev) {
--			dprintf("could not find subarray-%d\n", target);
--			break;
--		}
- 
- 		if (dev->rwh_policy != u->new_policy) {
- 			dev->rwh_policy = u->new_policy;
-@@ -11397,8 +11417,10 @@ static int imsm_create_metadata_update_for_migration(
- {
- 	struct intel_super *super = st->sb;
- 	int update_memory_size;
-+	int current_chunk_size;
- 	struct imsm_update_reshape_migration *u;
--	struct imsm_dev *dev;
-+	struct imsm_dev *dev = get_imsm_dev(super, super->current_vol);
-+	struct imsm_map *map = get_imsm_map(dev, MAP_0);
- 	int previous_level = -1;
- 
- 	dprintf("(enter) New Level = %i\n", geo->level);
-@@ -11415,23 +11437,15 @@ static int imsm_create_metadata_update_for_migration(
- 	u->new_disks[0] = -1;
- 	u->new_chunksize = -1;
- 
--	dev = get_imsm_dev(super, u->subdev);
--	if (dev) {
--		struct imsm_map *map;
-+	current_chunk_size = __le16_to_cpu(map->blocks_per_strip) / 2;
- 
--		map = get_imsm_map(dev, MAP_0);
--		if (map) {
--			int current_chunk_size =
--				__le16_to_cpu(map->blocks_per_strip) / 2;
--
--			if (geo->chunksize != current_chunk_size) {
--				u->new_chunksize = geo->chunksize / 1024;
--				dprintf("imsm: chunk size change from %i to %i\n",
--					current_chunk_size, u->new_chunksize);
--			}
--			previous_level = map->raid_level;
--		}
-+	if (geo->chunksize != current_chunk_size) {
-+		u->new_chunksize = geo->chunksize / 1024;
-+		dprintf("imsm: chunk size change from %i to %i\n",
-+			current_chunk_size, u->new_chunksize);
- 	}
-+	previous_level = map->raid_level;
-+
- 	if (geo->level == 5 && previous_level == 0) {
- 		struct mdinfo *spares = NULL;
- 
-@@ -12519,9 +12533,6 @@ static int validate_internal_bitmap_imsm(struct supertype *st)
- 	unsigned long long offset;
- 	struct dl *d;
- 
--	if (!dev)
--		return -1;
--
- 	if (dev->rwh_policy != RWH_BITMAP)
- 		return 0;
- 
-@@ -12567,16 +12578,8 @@ static int add_internal_bitmap_imsm(struct supertype *st, int *chunkp,
- 		return -1;
- 
- 	dev = get_imsm_dev(super, vol_idx);
--
--	if (!dev) {
--		dprintf("cannot find the device for volume index %d\n",
--			vol_idx);
--		return -1;
--	}
- 	dev->rwh_policy = RWH_BITMAP;
--
- 	*chunkp = calculate_bitmap_chunksize(st, dev);
--
- 	return 0;
- }
- 
--- 
-2.38.1
-

SOURCES/0020-Revert-mdadm-fix-coredump-of-mdadm-monitor-r.patch

@@ -1,85 +0,0 @@
-From 190dc029b141c423e724566cbed5d5afbb10b05a Mon Sep 17 00:00:00 2001
-From: Nigel Croxon <ncroxon@redhat.com>
-Date: Mon, 18 Apr 2022 13:44:23 -0400
-Subject: [PATCH 20/83] Revert "mdadm: fix coredump of mdadm --monitor -r"
-
-This reverts commit 546047688e1c64638f462147c755b58119cabdc8.
-
-The change from commit mdadm: fix coredump of mdadm
---monitor -r broke the printing of the return message when
-passing -r to mdadm --manage, the removal of a device from
-an array.
-
-If the current code reverts this commit, both issues are
-still fixed.
-
-The original problem reported that the fix tried to address
-was:  The --monitor -r option requires a parameter,
-otherwise a null pointer will be manipulated when
-converting to integer data, and a core dump will appear.
-
-The original problem was really fixed with:
-60815698c0a Refactor parse_num and use it to parse optarg.
-Which added a check for NULL in 'optarg' before moving it
-to the 'increments' variable.
-
-New issue: When trying to remove a device using the short
-argument -r, instead of the long argument --remove, the
-output is empty. The problem started when commit
-546047688e1c was added.
-
-Steps to Reproduce:
-1. create/assemble /dev/md0 device
-2. mdadm --manage /dev/md0 -r /dev/vdxx
-
-Actual results:
-Nothing, empty output, nothing happens, the device is still
-connected to the array.
-
-The output should have stated "mdadm: hot remove failed
-for /dev/vdxx: Device or resource busy", if the device was
-still active. Or it should remove the device and print
-a message:
-
-mdadm: set /dev/vdd faulty in /dev/md0
-mdadm: hot removed /dev/vdd from /dev/md0
-
-The following commit should be reverted as it breaks
-mdadm --manage -r.
-
-commit 546047688e1c64638f462147c755b58119cabdc8
-Author: Wu Guanghao <wuguanghao3@huawei.com>
-Date:   Mon Aug 16 15:24:51 2021 +0800
-mdadm: fix coredump of mdadm --monitor -r
-
--Nigel
-
-Signed-off-by: Nigel Croxon <ncroxon@redhat.com>
-Acked-by: Coly Li <colyli@suse.de>
-Signed-off-by: Jes Sorensen <jsorensen@fb.com>
----
- ReadMe.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/ReadMe.c b/ReadMe.c
-index 8f873c48..bec1be9a 100644
---- a/ReadMe.c
-+++ b/ReadMe.c
-@@ -81,11 +81,11 @@ char Version[] = "mdadm - v" VERSION " - " VERS_DATE EXTRAVERSION "\n";
-  *     found, it is started.
-  */
- 
--char short_options[]="-ABCDEFGIQhVXYWZ:vqbc:i:l:p:m:r:n:x:u:c:d:z:U:N:safRSow1tye:k";
-+char short_options[]="-ABCDEFGIQhVXYWZ:vqbc:i:l:p:m:n:x:u:c:d:z:U:N:sarfRSow1tye:k:";
- char short_bitmap_options[]=
--		"-ABCDEFGIQhVXYWZ:vqb:c:i:l:p:m:r:n:x:u:c:d:z:U:N:sarfRSow1tye:k:";
-+		"-ABCDEFGIQhVXYWZ:vqb:c:i:l:p:m:n:x:u:c:d:z:U:N:sarfRSow1tye:k:";
- char short_bitmap_auto_options[]=
--		"-ABCDEFGIQhVXYWZ:vqb:c:i:l:p:m:r:n:x:u:c:d:z:U:N:sa:rfRSow1tye:k:";
-+		"-ABCDEFGIQhVXYWZ:vqb:c:i:l:p:m:n:x:u:c:d:z:U:N:sa:rfRSow1tye:k:";
- 
- struct option long_options[] = {
-     {"manage",    0, 0, ManageOpt},
--- 
-2.38.1
-

SOURCES/0021-util-replace-ioctl-use-with-function.patch

@@ -1,31 +0,0 @@
-From 953cc7e5a485a91ddec7312c7a5d7779749fad5f Mon Sep 17 00:00:00 2001
-From: Kinga Tanska <kinga.tanska@intel.com>
-Date: Tue, 21 Jun 2022 00:10:39 +0800
-Subject: [PATCH 21/83] util: replace ioctl use with function
-
-Replace using of ioctl calling to get md array info with
-special function prepared to it.
-
-Signed-off-by: Kinga Tanska <kinga.tanska@intel.com>
-Acked-by: Coly Li <colyli@suse.de>
-Signed-off-by: Jes Sorensen <jsorensen@fb.com>
----
- util.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/util.c b/util.c
-index cc94f96e..38f0420e 100644
---- a/util.c
-+++ b/util.c
-@@ -267,7 +267,7 @@ int md_array_active(int fd)
- 		 * GET_ARRAY_INFO doesn't provide access to the proper state
- 		 * information, so fallback to a basic check for raid_disks != 0
- 		 */
--		ret = ioctl(fd, GET_ARRAY_INFO, &array);
-+		ret = md_get_array_info(fd, &array);
- 	}
- 
- 	return !ret;
--- 
-2.38.1
-

SOURCES/0022-mdadm-super1-restore-commit-45a87c2f31335-to-fix-clu.patch

@@ -1,110 +0,0 @@
-From 63902857b98c37c8ac4b837bb01d006b327a4532 Mon Sep 17 00:00:00 2001
-From: Heming Zhao <heming.zhao@suse.com>
-Date: Tue, 21 Jun 2022 00:10:40 +0800
-Subject: [PATCH 22/83] mdadm/super1: restore commit 45a87c2f31335 to fix
- clustered slot issue
-
-Commit 9d67f6496c71 ("mdadm:check the nodes when operate clustered
-array") modified assignment logic for st->nodes in write_bitmap1(),
-which introduced bitmap slot issue:
-
-load_super1 didn't set up supertype.nodes, which made spare disk only
-have one slot info. Then it triggered kernel md_bitmap_load_sb to get
-wrong bitmap slot data.
-
-For fixing this issue, there are two methods:
-
-1> revert the related code of commit 9d67f6496c71. and restore the code
-   from former commit 45a87c2f31335 ("super1: add more checks for
-   NodeNumUpdate option").
-   st->nodes value would be 0 & 1 under current code logic. i.e.
-   When adding a spare disk, there is no place to init st->nodes, and
-   the value is ZERO.
-
-2> keep 9d67f6496c71, add additional ->nodes handling in load_super1(),
-   let load_super1 to set st->nodes when bitmap is BITMAP_MAJOR_CLUSTERED.
-   Under current mdadm code logic, load_super1 will be called many
-   times, any new code in load_super1 will cost mdadm running more time.
-   And more reason is I prefer as much as possible to limit clustered
-   code spreading in every corner.
-
-So I used method <1> to fix this issue.
-
-How to trigger:
-
-dd if=/dev/zero bs=1M count=1 oflag=direct of=/dev/sda
-dd if=/dev/zero bs=1M count=1 oflag=direct of=/dev/sdb
-dd if=/dev/zero bs=1M count=1 oflag=direct of=/dev/sdc
-mdadm -C /dev/md0 -b clustered -e 1.2 -n 2 -l mirror /dev/sda /dev/sdb
-mdadm -a /dev/md0 /dev/sdc
-mdadm /dev/md0 --fail /dev/sda
-mdadm /dev/md0 --remove /dev/sda
-mdadm -Ss
-mdadm -A /dev/md0 /dev/sdb /dev/sdc
-
-the output of current "mdadm -X /dev/sdc":
-(there should be (by default) 4 slot info for correct output)
-```
-        Filename : /dev/sdc
-           Magic : 6d746962
-         Version : 5
-            UUID : a74642f8:a6b1fba8:58e1f8db:cfe7b082
-          Events : 29
-  Events Cleared : 0
-           State : OK
-       Chunksize : 64 MB
-          Daemon : 5s flush period
-      Write Mode : Normal
-       Sync Size : 306176 (299.00 MiB 313.52 MB)
-          Bitmap : 5 bits (chunks), 5 dirty (100.0%)
-```
-
-And mdadm later operations will trigger kernel output error message:
-(triggered by "mdadm -A /dev/md0 /dev/sdb /dev/sdc")
-```
-kernel: md0: invalid bitmap file superblock: bad magic
-kernel: md_bitmap_copy_from_slot can't get bitmap from slot 1
-kernel: md-cluster: Could not gather bitmaps from slot 1
-kernel: md0: invalid bitmap file superblock: bad magic
-kernel: md_bitmap_copy_from_slot can't get bitmap from slot 2
-kernel: md-cluster: Could not gather bitmaps from slot 2
-kernel: md0: invalid bitmap file superblock: bad magic
-kernel: md_bitmap_copy_from_slot can't get bitmap from slot 3
-kernel: md-cluster: Could not gather bitmaps from slot 3
-kernel: md-cluster: failed to gather all resyn infos
-kernel: md0: detected capacity change from 0 to 612352
-```
-
-Acked-by: Coly Li <colyli@suse.de>
-Signed-off-by: Heming Zhao <heming.zhao@suse.com>
-Signed-off-by: Jes Sorensen <jsorensen@fb.com>
----
- super1.c | 12 +++++++++++-
- 1 file changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/super1.c b/super1.c
-index e3e2f954..3a0c69fd 100644
---- a/super1.c
-+++ b/super1.c
-@@ -2674,7 +2674,17 @@ static int write_bitmap1(struct supertype *st, int fd, enum bitmap_update update
- 		}
- 
- 		if (bms->version == BITMAP_MAJOR_CLUSTERED) {
--			if (__cpu_to_le32(st->nodes) < bms->nodes) {
-+			if (st->nodes == 1) {
-+				/* the parameter for nodes is not valid */
-+				pr_err("Warning: cluster-md at least needs two nodes\n");
-+				return -EINVAL;
-+			} else if (st->nodes == 0) {
-+				/*
-+				 * parameter "--nodes" is not specified, (eg, add a disk to
-+				 * clustered raid)
-+				 */
-+				break;
-+			} else if (__cpu_to_le32(st->nodes) < bms->nodes) {
- 				/*
- 				 * Since the nodes num is not increased, no
- 				 * need to check the space enough or not,
--- 
-2.38.1
-

SOURCES/0023-imsm-introduce-get_disk_slot_in_dev.patch

@@ -1,122 +0,0 @@
-From 76c152ca9851e9fcdf52e8f6e7e6c09b936bdd14 Mon Sep 17 00:00:00 2001
-From: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
-Date: Tue, 21 Jun 2022 00:10:41 +0800
-Subject: [PATCH 23/83] imsm: introduce get_disk_slot_in_dev()
-
-The routine was added to remove unnecessary get_imsm_dev() and
-get_imsm_map() calls, used only to determine disk slot.
-
-Additionally, enum for IMSM return statues was added for further usage.
-
-Signed-off-by: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
-Acked-by: Coly Li <colyli@suse.de>
-Signed-off-by: Jes Sorensen <jsorensen@fb.com>
----
- super-intel.c | 47 ++++++++++++++++++++++++++++++++++++-----------
- 1 file changed, 36 insertions(+), 11 deletions(-)
-
-diff --git a/super-intel.c b/super-intel.c
-index 3788feb9..cd1f1e3d 100644
---- a/super-intel.c
-+++ b/super-intel.c
-@@ -366,6 +366,18 @@ struct migr_record {
- };
- ASSERT_SIZE(migr_record, 128)
- 
-+/**
-+ * enum imsm_status - internal IMSM return values representation.
-+ * @STATUS_OK: function succeeded.
-+ * @STATUS_ERROR: General error ocurred (not specified).
-+ *
-+ * Typedefed to imsm_status_t.
-+ */
-+typedef enum imsm_status {
-+	IMSM_STATUS_ERROR = -1,
-+	IMSM_STATUS_OK = 0,
-+} imsm_status_t;
-+
- struct md_list {
- 	/* usage marker:
- 	 *  1: load metadata
-@@ -1183,7 +1195,7 @@ static void set_imsm_ord_tbl_ent(struct imsm_map *map, int slot, __u32 ord)
- 	map->disk_ord_tbl[slot] = __cpu_to_le32(ord);
- }
- 
--static int get_imsm_disk_slot(struct imsm_map *map, unsigned idx)
-+static int get_imsm_disk_slot(struct imsm_map *map, const unsigned int idx)
- {
- 	int slot;
- 	__u32 ord;
-@@ -1194,7 +1206,7 @@ static int get_imsm_disk_slot(struct imsm_map *map, unsigned idx)
- 			return slot;
- 	}
- 
--	return -1;
-+	return IMSM_STATUS_ERROR;
- }
- 
- static int get_imsm_raid_level(struct imsm_map *map)
-@@ -1209,6 +1221,23 @@ static int get_imsm_raid_level(struct imsm_map *map)
- 	return map->raid_level;
- }
- 
-+/**
-+ * get_disk_slot_in_dev() - retrieve disk slot from &imsm_dev.
-+ * @super: &intel_super pointer, not NULL.
-+ * @dev_idx: imsm device index.
-+ * @idx: disk index.
-+ *
-+ * Return: Slot on success, IMSM_STATUS_ERROR otherwise.
-+ */
-+static int get_disk_slot_in_dev(struct intel_super *super, const __u8 dev_idx,
-+				const unsigned int idx)
-+{
-+	struct imsm_dev *dev = get_imsm_dev(super, dev_idx);
-+	struct imsm_map *map = get_imsm_map(dev, MAP_0);
-+
-+	return get_imsm_disk_slot(map, idx);
-+}
-+
- static int cmp_extent(const void *av, const void *bv)
- {
- 	const struct extent *a = av;
-@@ -1225,13 +1254,9 @@ static int count_memberships(struct dl *dl, struct intel_super *super)
- 	int memberships = 0;
- 	int i;
- 
--	for (i = 0; i < super->anchor->num_raid_devs; i++) {
--		struct imsm_dev *dev = get_imsm_dev(super, i);
--		struct imsm_map *map = get_imsm_map(dev, MAP_0);
--
--		if (get_imsm_disk_slot(map, dl->index) >= 0)
-+	for (i = 0; i < super->anchor->num_raid_devs; i++)
-+		if (get_disk_slot_in_dev(super, i, dl->index) >= 0)
- 			memberships++;
--	}
- 
- 	return memberships;
- }
-@@ -1941,6 +1966,7 @@ void examine_migr_rec_imsm(struct intel_super *super)
- 
- 		/* first map under migration */
- 		map = get_imsm_map(dev, MAP_0);
-+
- 		if (map)
- 			slot = get_imsm_disk_slot(map, super->disks->index);
- 		if (map == NULL || slot > 1 || slot < 0) {
-@@ -9655,10 +9681,9 @@ static int apply_update_activate_spare(struct imsm_update_activate_spare *u,
- 		/* count arrays using the victim in the metadata */
- 		found = 0;
- 		for (a = active_array; a ; a = a->next) {
--			dev = get_imsm_dev(super, a->info.container_member);
--			map = get_imsm_map(dev, MAP_0);
-+			int dev_idx = a->info.container_member;
- 
--			if (get_imsm_disk_slot(map, victim) >= 0)
-+			if (get_disk_slot_in_dev(super, dev_idx, victim) >= 0)
- 				found++;
- 		}
- 
--- 
-2.38.1
-

SOURCES/0024-imsm-use-same-slot-across-container.patch

@@ -1,252 +0,0 @@
-From 6d4d9ab295de165e57b5c30e044028dbffb8f297 Mon Sep 17 00:00:00 2001
-From: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
-Date: Tue, 21 Jun 2022 00:10:42 +0800
-Subject: [PATCH 24/83] imsm: use same slot across container
-
-Autolayout relies on drives order on super->disks list, but
-it is not quaranted by readdir() in sysfs_read(). As a result
-drive could be put in different slot in second volume.
-
-Make it consistent by reffering to first volume, if exists.
-
-Use enum imsm_status to unify error handling.
-
-Signed-off-by: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
-Acked-by: Coly Li <colyli@suse.de>
-Signed-off-by: Jes Sorensen <jsorensen@fb.com>
----
- super-intel.c | 169 ++++++++++++++++++++++++++++++++------------------
- 1 file changed, 108 insertions(+), 61 deletions(-)
-
-diff --git a/super-intel.c b/super-intel.c
-index cd1f1e3d..deef7c87 100644
---- a/super-intel.c
-+++ b/super-intel.c
-@@ -7522,11 +7522,27 @@ static int validate_geometry_imsm_volume(struct supertype *st, int level,
- 	return 1;
- }
- 
--static int imsm_get_free_size(struct supertype *st, int raiddisks,
--			 unsigned long long size, int chunk,
--			 unsigned long long *freesize)
-+/**
-+ * imsm_get_free_size() - get the biggest, common free space from members.
-+ * @super: &intel_super pointer, not NULL.
-+ * @raiddisks: number of raid disks.
-+ * @size: requested size, could be 0 (means max size).
-+ * @chunk: requested chunk.
-+ * @freesize: pointer for returned size value.
-+ *
-+ * Return: &IMSM_STATUS_OK or &IMSM_STATUS_ERROR.
-+ *
-+ * @freesize is set to meaningful value, this can be @size, or calculated
-+ * max free size.
-+ * super->create_offset value is modified and set appropriately in
-+ * merge_extends() for further creation.
-+ */
-+static imsm_status_t imsm_get_free_size(struct intel_super *super,
-+					const int raiddisks,
-+					unsigned long long size,
-+					const int chunk,
-+					unsigned long long *freesize)
- {
--	struct intel_super *super = st->sb;
- 	struct imsm_super *mpb = super->anchor;
- 	struct dl *dl;
- 	int i;
-@@ -7570,12 +7586,10 @@ static int imsm_get_free_size(struct supertype *st, int raiddisks,
- 		/* chunk is in K */
- 		minsize = chunk * 2;
- 
--	if (cnt < raiddisks ||
--	    (super->orom && used && used != raiddisks) ||
--	    maxsize < minsize ||
--	    maxsize == 0) {
-+	if (cnt < raiddisks || (super->orom && used && used != raiddisks) ||
-+	    maxsize < minsize || maxsize == 0) {
- 		pr_err("not enough devices with space to create array.\n");
--		return 0; /* No enough free spaces large enough */
-+		return IMSM_STATUS_ERROR;
- 	}
- 
- 	if (size == 0) {
-@@ -7588,37 +7602,69 @@ static int imsm_get_free_size(struct supertype *st, int raiddisks,
- 	}
- 	if (mpb->num_raid_devs > 0 && size && size != maxsize)
- 		pr_err("attempting to create a second volume with size less then remaining space.\n");
--	cnt = 0;
--	for (dl = super->disks; dl; dl = dl->next)
--		if (dl->e)
--			dl->raiddisk = cnt++;
--
- 	*freesize = size;
- 
- 	dprintf("imsm: imsm_get_free_size() returns : %llu\n", size);
- 
--	return 1;
-+	return IMSM_STATUS_OK;
- }
- 
--static int reserve_space(struct supertype *st, int raiddisks,
--			 unsigned long long size, int chunk,
--			 unsigned long long *freesize)
-+/**
-+ * autolayout_imsm() - automatically layout a new volume.
-+ * @super: &intel_super pointer, not NULL.
-+ * @raiddisks: number of raid disks.
-+ * @size: requested size, could be 0 (means max size).
-+ * @chunk: requested chunk.
-+ * @freesize: pointer for returned size value.
-+ *
-+ * We are being asked to automatically layout a new volume based on the current
-+ * contents of the container. If the parameters can be satisfied autolayout_imsm
-+ * will record the disks, start offset, and will return size of the volume to
-+ * be created. See imsm_get_free_size() for details.
-+ * add_to_super() and getinfo_super() detect when autolayout is in progress.
-+ * If first volume exists, slots are set consistently to it.
-+ *
-+ * Return: &IMSM_STATUS_OK on success, &IMSM_STATUS_ERROR otherwise.
-+ *
-+ * Disks are marked for creation via dl->raiddisk.
-+ */
-+static imsm_status_t autolayout_imsm(struct intel_super *super,
-+				     const int raiddisks,
-+				     unsigned long long size, const int chunk,
-+				     unsigned long long *freesize)
- {
--	struct intel_super *super = st->sb;
--	struct dl *dl;
--	int cnt;
--	int rv = 0;
-+	int curr_slot = 0;
-+	struct dl *disk;
-+	int vol_cnt = super->anchor->num_raid_devs;
-+	imsm_status_t rv;
- 
--	rv = imsm_get_free_size(st, raiddisks, size, chunk, freesize);
--	if (rv) {
--		cnt = 0;
--		for (dl = super->disks; dl; dl = dl->next)
--			if (dl->e)
--				dl->raiddisk = cnt++;
--		rv = 1;
-+	rv = imsm_get_free_size(super, raiddisks, size, chunk, freesize);
-+	if (rv != IMSM_STATUS_OK)
-+		return IMSM_STATUS_ERROR;
-+
-+	for (disk = super->disks; disk; disk = disk->next) {
-+		if (!disk->e)
-+			continue;
-+
-+		if (curr_slot == raiddisks)
-+			break;
-+
-+		if (vol_cnt == 0) {
-+			disk->raiddisk = curr_slot;
-+		} else {
-+			int _slot = get_disk_slot_in_dev(super, 0, disk->index);
-+
-+			if (_slot == -1) {
-+				pr_err("Disk %s is not used in first volume, aborting\n",
-+				       disk->devname);
-+				return IMSM_STATUS_ERROR;
-+			}
-+			disk->raiddisk = _slot;
-+		}
-+		curr_slot++;
- 	}
- 
--	return rv;
-+	return IMSM_STATUS_OK;
- }
- 
- static int validate_geometry_imsm(struct supertype *st, int level, int layout,
-@@ -7654,35 +7700,35 @@ static int validate_geometry_imsm(struct supertype *st, int level, int layout,
- 	}
- 
- 	if (!dev) {
--		if (st->sb) {
--			struct intel_super *super = st->sb;
--			if (!validate_geometry_imsm_orom(st->sb, level, layout,
--							 raiddisks, chunk, size,
--							 verbose))
-+		struct intel_super *super = st->sb;
-+
-+		/*
-+		 * Autolayout mode, st->sb and freesize must be set.
-+		 */
-+		if (!super || !freesize) {
-+			pr_vrb("freesize and superblock must be set for autolayout, aborting\n");
-+			return 1;
-+		}
-+
-+		if (!validate_geometry_imsm_orom(st->sb, level, layout,
-+						 raiddisks, chunk, size,
-+						 verbose))
-+			return 0;
-+
-+		if (super->orom) {
-+			imsm_status_t rv;
-+			int count = count_volumes(super->hba, super->orom->dpa,
-+					      verbose);
-+			if (super->orom->vphba <= count) {
-+				pr_vrb("platform does not support more than %d raid volumes.\n",
-+				       super->orom->vphba);
- 				return 0;
--			/* we are being asked to automatically layout a
--			 * new volume based on the current contents of
--			 * the container.  If the the parameters can be
--			 * satisfied reserve_space will record the disks,
--			 * start offset, and size of the volume to be
--			 * created.  add_to_super and getinfo_super
--			 * detect when autolayout is in progress.
--			 */
--			/* assuming that freesize is always given when array is
--			   created */
--			if (super->orom && freesize) {
--				int count;
--				count = count_volumes(super->hba,
--						      super->orom->dpa, verbose);
--				if (super->orom->vphba <= count) {
--					pr_vrb("platform does not support more than %d raid volumes.\n",
--					       super->orom->vphba);
--					return 0;
--				}
- 			}
--			if (freesize)
--				return reserve_space(st, raiddisks, size,
--						     *chunk, freesize);
-+
-+			rv = autolayout_imsm(super, raiddisks, size, *chunk,
-+					     freesize);
-+			if (rv != IMSM_STATUS_OK)
-+				return 0;
- 		}
- 		return 1;
- 	}
-@@ -11538,7 +11584,7 @@ enum imsm_reshape_type imsm_analyze_change(struct supertype *st,
- 	unsigned long long current_size;
- 	unsigned long long free_size;
- 	unsigned long long max_size;
--	int rv;
-+	imsm_status_t rv;
- 
- 	getinfo_super_imsm_volume(st, &info, NULL);
- 	if (geo->level != info.array.level && geo->level >= 0 &&
-@@ -11657,9 +11703,10 @@ enum imsm_reshape_type imsm_analyze_change(struct supertype *st,
- 		}
- 		/* check the maximum available size
- 		 */
--		rv =  imsm_get_free_size(st, dev->vol.map->num_members,
--					 0, chunk, &free_size);
--		if (rv == 0)
-+		rv = imsm_get_free_size(super, dev->vol.map->num_members,
-+					0, chunk, &free_size);
-+
-+		if (rv != IMSM_STATUS_OK)
- 			/* Cannot find maximum available space
- 			 */
- 			max_size = 0;
--- 
-2.38.1
-

SOURCES/0025-imsm-block-changing-slots-during-creation.patch

@@ -1,122 +0,0 @@
-From 9a7df595bbe360132cb37c8b39aa1fd9ac24b43f Mon Sep 17 00:00:00 2001
-From: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
-Date: Tue, 21 Jun 2022 00:10:43 +0800
-Subject: [PATCH 25/83] imsm: block changing slots during creation
-
-If user specifies drives for array creation, then slot order across
-volumes is not preserved.
-Ideally, it should be checked in validate_geometry() but it is not
-possible in current implementation (order is determined later).
-Add verification in add_to_super_imsm_volume() and throw error if
-mismatch is detected.
-IMSM allows to use only same members within container.
-This is not hardware dependency but metadata limitation.
-Therefore, 09-imsm-overlap test is removed. Testing it is pointless.
-After this patch, creation in this scenario is blocked. Offset
-verification is covered in other tests.
-
-Signed-off-by: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
-Acked-by: Coly Li <colyli@suse.de>
-Signed-off-by: Jes Sorensen <jsorensen@fb.com>
----
- super-intel.c        | 33 ++++++++++++++++++++++-----------
- tests/09imsm-overlap | 28 ----------------------------
- 2 files changed, 22 insertions(+), 39 deletions(-)
- delete mode 100644 tests/09imsm-overlap
-
-diff --git a/super-intel.c b/super-intel.c
-index deef7c87..8ffe485c 100644
---- a/super-intel.c
-+++ b/super-intel.c
-@@ -5789,6 +5789,10 @@ static int add_to_super_imsm_volume(struct supertype *st, mdu_disk_info_t *dk,
- 	struct imsm_map *map;
- 	struct dl *dl, *df;
- 	int slot;
-+	int autolayout = 0;
-+
-+	if (!is_fd_valid(fd))
-+		autolayout = 1;
- 
- 	dev = get_imsm_dev(super, super->current_vol);
- 	map = get_imsm_map(dev, MAP_0);
-@@ -5799,25 +5803,32 @@ static int add_to_super_imsm_volume(struct supertype *st, mdu_disk_info_t *dk,
- 		return 1;
- 	}
- 
--	if (!is_fd_valid(fd)) {
--		/* we're doing autolayout so grab the pre-marked (in
--		 * validate_geometry) raid_disk
--		 */
--		for (dl = super->disks; dl; dl = dl->next)
-+	for (dl = super->disks; dl ; dl = dl->next) {
-+		if (autolayout) {
- 			if (dl->raiddisk == dk->raid_disk)
- 				break;
--	} else {
--		for (dl = super->disks; dl ; dl = dl->next)
--			if (dl->major == dk->major &&
--			    dl->minor == dk->minor)
--				break;
-+		} else if (dl->major == dk->major && dl->minor == dk->minor)
-+			break;
- 	}
- 
- 	if (!dl) {
--		pr_err("%s is not a member of the same container\n", devname);
-+		if (!autolayout)
-+			pr_err("%s is not a member of the same container.\n",
-+			       devname);
- 		return 1;
- 	}
- 
-+	if (!autolayout && super->current_vol > 0) {
-+		int _slot = get_disk_slot_in_dev(super, 0, dl->index);
-+
-+		if (_slot != dk->raid_disk) {
-+			pr_err("Member %s is in %d slot for the first volume, but is in %d slot for a new volume.\n",
-+			       dl->devname, _slot, dk->raid_disk);
-+			pr_err("Raid members are in different order than for the first volume, aborting.\n");
-+			return 1;
-+		}
-+	}
-+
- 	if (mpb->num_disks == 0)
- 		if (!get_dev_sector_size(dl->fd, dl->devname,
- 					 &super->sector_size))
-diff --git a/tests/09imsm-overlap b/tests/09imsm-overlap
-deleted file mode 100644
-index ff5d2093..00000000
---- a/tests/09imsm-overlap
-+++ /dev/null
-@@ -1,28 +0,0 @@
--
--. tests/env-imsm-template
--
--# create raid arrays with varying degress of overlap
--mdadm -CR $container -e imsm -n 6 $dev0 $dev1 $dev2 $dev3 $dev4 $dev5
--imsm_check container 6
--
--size=1024
--level=1
--num_disks=2
--mdadm -CR $member0 $dev0 $dev1 -n $num_disks -l $level -z $size
--mdadm -CR $member1 $dev1 $dev2 -n $num_disks -l $level -z $size
--mdadm -CR $member2 $dev2 $dev3 -n $num_disks -l $level -z $size
--mdadm -CR $member3 $dev3 $dev4 -n $num_disks -l $level -z $size
--mdadm -CR $member4 $dev4 $dev5 -n $num_disks -l $level -z $size
--
--udevadm settle
--
--offset=0
--imsm_check member $member0 $num_disks $level $size 1024 $offset
--offset=$((offset+size+4096))
--imsm_check member $member1 $num_disks $level $size 1024 $offset
--offset=$((offset+size+4096))
--imsm_check member $member2 $num_disks $level $size 1024 $offset
--offset=$((offset+size+4096))
--imsm_check member $member3 $num_disks $level $size 1024 $offset
--offset=$((offset+size+4096))
--imsm_check member $member4 $num_disks $level $size 1024 $offset
--- 
-2.38.1
-

SOURCES/0026-mdadm-block-update-ppl-for-non-raid456-levels.patch

@@ -1,177 +0,0 @@
-From 70f1ff4291b0388adca1f4c91918ce1175e8b360 Mon Sep 17 00:00:00 2001
-From: Lukasz Florczak <lukasz.florczak@linux.intel.com>
-Date: Wed, 15 Jun 2022 14:28:39 +0200
-Subject: [PATCH 26/83] mdadm: block update=ppl for non raid456 levels
-
-Option ppl should be used only for raid levels 4, 5 and 6. Cancel update
-for other levels.
-
-Applied globally for imsm and ddf format.
-
-Additionally introduce is_level456() helper function.
-
-Signed-off-by: Lukasz Florczak <lukasz.florczak@linux.intel.com>
-Signed-off-by: Jes Sorensen <jsorensen@fb.com>
----
- Assemble.c | 11 +++++------
- Grow.c     |  2 +-
- Manage.c   | 14 ++++++++++++--
- mdadm.h    | 11 +++++++++++
- super0.c   |  2 +-
- super1.c   |  3 +--
- 6 files changed, 31 insertions(+), 12 deletions(-)
-
-diff --git a/Assemble.c b/Assemble.c
-index 4b213560..6df6bfbc 100644
---- a/Assemble.c
-+++ b/Assemble.c
-@@ -906,8 +906,7 @@ static int force_array(struct mdinfo *content,
- 				 * devices in RAID4 or last devices in RAID4/5/6.
- 				 */
- 				delta = devices[j].i.delta_disks;
--				if (devices[j].i.array.level >= 4 &&
--				    devices[j].i.array.level <= 6 &&
-+				if (is_level456(devices[j].i.array.level) &&
- 				    i/2 >= content->array.raid_disks - delta)
- 					/* OK */;
- 				else if (devices[j].i.array.level == 4 &&
-@@ -1226,8 +1225,7 @@ static int start_array(int mdfd,
- 				fprintf(stderr, ".\n");
- 			}
- 			if (content->reshape_active &&
--			    content->array.level >= 4 &&
--			    content->array.level <= 6) {
-+			    is_level456(content->array.level)) {
- 				/* might need to increase the size
- 				 * of the stripe cache - default is 256
- 				 */
-@@ -1974,7 +1972,8 @@ int assemble_container_content(struct supertype *st, int mdfd,
- 	int start_reshape;
- 	char *avail;
- 	int err;
--	int is_raid456, is_clean, all_disks;
-+	int is_clean, all_disks;
-+	bool is_raid456;
- 
- 	if (sysfs_init(content, mdfd, NULL)) {
- 		pr_err("Unable to initialize sysfs\n");
-@@ -2107,7 +2106,7 @@ int assemble_container_content(struct supertype *st, int mdfd,
- 		content->array.state |= 1;
- 	}
- 
--	is_raid456 = (content->array.level >= 4 && content->array.level <= 6);
-+	is_raid456 = is_level456(content->array.level);
- 	is_clean = content->array.state & 1;
- 
- 	if (enough(content->array.level, content->array.raid_disks,
-diff --git a/Grow.c b/Grow.c
-index f6efbc48..8c520d42 100644
---- a/Grow.c
-+++ b/Grow.c
-@@ -2944,7 +2944,7 @@ static int impose_level(int fd, int level, char *devname, int verbose)
- 	}
- 
- 	md_get_array_info(fd, &array);
--	if (level == 0 && (array.level >= 4 && array.level <= 6)) {
-+	if (level == 0 && is_level456(array.level)) {
- 		/* To convert to RAID0 we need to fail and
- 		 * remove any non-data devices. */
- 		int found = 0;
-diff --git a/Manage.c b/Manage.c
-index f789e0c1..e5e6abe4 100644
---- a/Manage.c
-+++ b/Manage.c
-@@ -307,7 +307,7 @@ int Manage_stop(char *devname, int fd, int verbose, int will_retry)
- 	 *  - unfreeze reshape
- 	 *  - wait on 'sync_completed' for that point to be reached.
- 	 */
--	if (mdi && (mdi->array.level >= 4 && mdi->array.level <= 6) &&
-+	if (mdi && is_level456(mdi->array.level) &&
- 	    sysfs_attribute_available(mdi, NULL, "sync_action") &&
- 	    sysfs_attribute_available(mdi, NULL, "reshape_direction") &&
- 	    sysfs_get_str(mdi, NULL, "sync_action", buf, 20) > 0 &&
-@@ -1679,6 +1679,7 @@ int Update_subarray(char *dev, char *subarray, char *update, struct mddev_ident
- {
- 	struct supertype supertype, *st = &supertype;
- 	int fd, rv = 2;
-+	struct mdinfo *info = NULL;
- 
- 	memset(st, 0, sizeof(*st));
- 
-@@ -1696,6 +1697,13 @@ int Update_subarray(char *dev, char *subarray, char *update, struct mddev_ident
- 	if (mdmon_running(st->devnm))
- 		st->update_tail = &st->updates;
- 
-+	info = st->ss->container_content(st, subarray);
-+
-+	if (strncmp(update, "ppl", 3) == 0 && !is_level456(info->array.level)) {
-+		pr_err("RWH policy ppl is supported only for raid4, raid5 and raid6.\n");
-+		goto free_super;
-+	}
-+
- 	rv = st->ss->update_subarray(st, subarray, update, ident);
- 
- 	if (rv) {
-@@ -1711,7 +1719,9 @@ int Update_subarray(char *dev, char *subarray, char *update, struct mddev_ident
- 		pr_err("Updated subarray-%s name from %s, UUIDs may have changed\n",
- 		       subarray, dev);
- 
-- free_super:
-+free_super:
-+	if (info)
-+		free(info);
- 	st->ss->free_super(st);
- 	close(fd);
- 
-diff --git a/mdadm.h b/mdadm.h
-index d53df169..974415b9 100644
---- a/mdadm.h
-+++ b/mdadm.h
-@@ -796,6 +796,17 @@ static inline int is_fd_valid(int fd)
- 	return (fd > -1);
- }
- 
-+/**
-+ * is_level456() - check whether given level is between inclusive 4 and 6.
-+ * @level: level to check.
-+ *
-+ * Return: true if condition is met, false otherwise
-+ */
-+static inline bool is_level456(int level)
-+{
-+	return (level >= 4 && level <= 6);
-+}
-+
- /**
-  * close_fd() - verify, close and unset file descriptor.
-  * @fd: pointer to file descriptor.
-diff --git a/super0.c b/super0.c
-index 61c9ec1d..37f595ed 100644
---- a/super0.c
-+++ b/super0.c
-@@ -683,7 +683,7 @@ static int update_super0(struct supertype *st, struct mdinfo *info,
- 			int parity = sb->level == 6 ? 2 : 1;
- 			rv = 0;
- 
--			if (sb->level >= 4 && sb->level <= 6 &&
-+			if (is_level456(sb->level) &&
- 			    sb->reshape_position % (
- 				    sb->new_chunk/512 *
- 				    (sb->raid_disks - sb->delta_disks - parity))) {
-diff --git a/super1.c b/super1.c
-index 3a0c69fd..71af860c 100644
---- a/super1.c
-+++ b/super1.c
-@@ -1530,8 +1530,7 @@ static int update_super1(struct supertype *st, struct mdinfo *info,
- 			 * So we reject a revert-reshape unless the
- 			 * alignment is good.
- 			 */
--			if (__le32_to_cpu(sb->level) >= 4 &&
--			    __le32_to_cpu(sb->level) <= 6) {
-+			if (is_level456(__le32_to_cpu(sb->level))) {
- 				reshape_sectors =
- 					__le64_to_cpu(sb->reshape_position);
- 				reshape_chunk = __le32_to_cpu(sb->new_chunk);
--- 
-2.38.1
-

SOURCES/0027-mdadm-Fix-array-size-mismatch-after-grow.patch

@@ -1,30 +0,0 @@
-From 42e02e613fb0b4a2c0c0d984b9e6e2933875bb44 Mon Sep 17 00:00:00 2001
-From: Lukasz Florczak <lukasz.florczak@linux.intel.com>
-Date: Fri, 22 Jul 2022 08:43:47 +0200
-Subject: [PATCH 27/83] mdadm: Fix array size mismatch after grow
-
-imsm_fix_size_mismatch() is invoked to fix the problem, but it couldn't
-proceed due to migration check. This patch allows for intended behavior.
-
-Signed-off-by: Lukasz Florczak <lukasz.florczak@linux.intel.com>
-Signed-off-by: Jes Sorensen <jsorensen@fb.com>
----
- super-intel.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/super-intel.c b/super-intel.c
-index 8ffe485c..76b947f5 100644
---- a/super-intel.c
-+++ b/super-intel.c
-@@ -11854,7 +11854,7 @@ static int imsm_fix_size_mismatch(struct supertype *st, int subarray_index)
- 		unsigned long long d_size = imsm_dev_size(dev);
- 		int u_size;
- 
--		if (calc_size == d_size || dev->vol.migr_type == MIGR_GEN_MIGR)
-+		if (calc_size == d_size)
- 			continue;
- 
- 		/* There is a difference, confirm that imsm_dev_size is
--- 
-2.38.1
-

SOURCES/0028-mdadm-Remove-dead-code-in-imsm_fix_size_mismatch.patch

@@ -1,34 +0,0 @@
-From 751757620afb25a4c02746bf8368a7b5f22352ec Mon Sep 17 00:00:00 2001
-From: Lukasz Florczak <lukasz.florczak@linux.intel.com>
-Date: Fri, 22 Jul 2022 08:43:48 +0200
-Subject: [PATCH 28/83] mdadm: Remove dead code in imsm_fix_size_mismatch
-
-imsm_create_metadata_update_for_size_change() that returns u_size value
-could return 0 in the past. As its behavior changed, and returned value
-is always the size of imsm_update_size_change structure, check for
-u_size is no longer needed.
-
-Signed-off-by: Lukasz Florczak <lukasz.florczak@linux.intel.com>
-Signed-off-by: Jes Sorensen <jsorensen@fb.com>
----
- super-intel.c | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/super-intel.c b/super-intel.c
-index 76b947f5..4ddfcf94 100644
---- a/super-intel.c
-+++ b/super-intel.c
-@@ -11869,10 +11869,6 @@ static int imsm_fix_size_mismatch(struct supertype *st, int subarray_index)
- 		geo.size = d_size;
- 		u_size = imsm_create_metadata_update_for_size_change(st, &geo,
- 								     &update);
--		if (u_size < 1) {
--			dprintf("imsm: Cannot prepare size change update\n");
--			goto exit;
--		}
- 		imsm_update_metadata_locally(st, update, u_size);
- 		if (st->update_tail) {
- 			append_metadata_update(st, update, u_size);
--- 
-2.38.1
-

SOURCES/0029-Monitor-use-devname-as-char-array-instead-of-pointer.patch

@@ -1,40 +0,0 @@
-From c8d1c398505b62d9129a4e711f17e4469f4327ff Mon Sep 17 00:00:00 2001
-From: Kinga Tanska <kinga.tanska@intel.com>
-Date: Thu, 14 Jul 2022 09:02:10 +0200
-Subject: [PATCH 29/83] Monitor: use devname as char array instead of pointer
-
-Device name wasn't filled properly due to incorrect use of strcpy.
-Strcpy was used twice. Firstly to fill devname with "/dev/md/"
-and then to add chosen name. First strcpy result was overwritten by
-second one (as a result <device_name> instead of "/dev/md/<device_name>"
-was assigned). This commit changes this implementation to use snprintf
-and devname with fixed size.
-
-Signed-off-by: Kinga Tanska <kinga.tanska@intel.com>
-Signed-off-by: Jes Sorensen <jsorensen@fb.com>
----
- Monitor.c | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/Monitor.c b/Monitor.c
-index 6ca1ebe5..a5b11ae2 100644
---- a/Monitor.c
-+++ b/Monitor.c
-@@ -190,9 +190,11 @@ int Monitor(struct mddev_dev *devlist,
- 			if (mdlist->devname[0] == '/')
- 				st->devname = xstrdup(mdlist->devname);
- 			else {
--				st->devname = xmalloc(8+strlen(mdlist->devname)+1);
--				strcpy(strcpy(st->devname, "/dev/md/"),
--				       mdlist->devname);
-+				/* length of "/dev/md/" + device name + terminating byte */
-+				size_t _len = sizeof("/dev/md/") + strnlen(mdlist->devname, PATH_MAX);
-+
-+				st->devname = xcalloc(_len, sizeof(char));
-+				snprintf(st->devname, _len, "/dev/md/%s", mdlist->devname);
- 			}
- 			if (!is_mddev(mdlist->devname))
- 				return 1;
--- 
-2.38.1
-

SOURCES/0030-Monitor-use-snprintf-to-fill-device-name.patch

@@ -1,133 +0,0 @@
-From 84d969be8f6d8a345b75f558fad26e4f62a558f6 Mon Sep 17 00:00:00 2001
-From: Kinga Tanska <kinga.tanska@intel.com>
-Date: Thu, 14 Jul 2022 09:02:11 +0200
-Subject: [PATCH 30/83] Monitor: use snprintf to fill device name
-
-Safe string functions are propagated in Monitor.c.
-
-Signed-off-by: Kinga Tanska <kinga.tanska@intel.com>
-Signed-off-by: Jes Sorensen <jsorensen@fb.com>
----
- Monitor.c | 37 ++++++++++++++-----------------------
- 1 file changed, 14 insertions(+), 23 deletions(-)
-
-diff --git a/Monitor.c b/Monitor.c
-index a5b11ae2..93f36ac0 100644
---- a/Monitor.c
-+++ b/Monitor.c
-@@ -33,8 +33,8 @@
- #endif
- 
- struct state {
--	char *devname;
--	char devnm[32];	/* to sync with mdstat info */
-+	char devname[MD_NAME_MAX + sizeof("/dev/md/")];	/* length of "/dev/md/" + device name + terminating byte*/
-+	char devnm[MD_NAME_MAX];	/* to sync with mdstat info */
- 	unsigned int utime;
- 	int err;
- 	char *spare_group;
-@@ -45,9 +45,9 @@ struct state {
- 	int devstate[MAX_DISKS];
- 	dev_t devid[MAX_DISKS];
- 	int percent;
--	char parent_devnm[32]; /* For subarray, devnm of parent.
--				* For others, ""
--				*/
-+	char parent_devnm[MD_NAME_MAX]; /* For subarray, devnm of parent.
-+					* For others, ""
-+					*/
- 	struct supertype *metadata;
- 	struct state *subarray;/* for a container it is a link to first subarray
- 				* for a subarray it is a link to next subarray
-@@ -187,15 +187,8 @@ int Monitor(struct mddev_dev *devlist,
- 				continue;
- 
- 			st = xcalloc(1, sizeof *st);
--			if (mdlist->devname[0] == '/')
--				st->devname = xstrdup(mdlist->devname);
--			else {
--				/* length of "/dev/md/" + device name + terminating byte */
--				size_t _len = sizeof("/dev/md/") + strnlen(mdlist->devname, PATH_MAX);
--
--				st->devname = xcalloc(_len, sizeof(char));
--				snprintf(st->devname, _len, "/dev/md/%s", mdlist->devname);
--			}
-+			snprintf(st->devname, MD_NAME_MAX + sizeof("/dev/md/"),
-+				 "/dev/md/%s", basename(mdlist->devname));
- 			if (!is_mddev(mdlist->devname))
- 				return 1;
- 			st->next = statelist;
-@@ -218,7 +211,7 @@ int Monitor(struct mddev_dev *devlist,
- 
- 			st = xcalloc(1, sizeof *st);
- 			mdlist = conf_get_ident(dv->devname);
--			st->devname = xstrdup(dv->devname);
-+			snprintf(st->devname, MD_NAME_MAX + sizeof("/dev/md/"), "%s", dv->devname);
- 			st->next = statelist;
- 			st->devnm[0] = 0;
- 			st->percent = RESYNC_UNKNOWN;
-@@ -301,7 +294,6 @@ int Monitor(struct mddev_dev *devlist,
- 		for (stp = &statelist; (st = *stp) != NULL; ) {
- 			if (st->from_auto && st->err > 5) {
- 				*stp = st->next;
--				free(st->devname);
- 				free(st->spare_group);
- 				free(st);
- 			} else
-@@ -554,7 +546,7 @@ static int check_array(struct state *st, struct mdstat_ent *mdstat,
- 		goto disappeared;
- 
- 	if (st->devnm[0] == 0)
--		strcpy(st->devnm, fd2devnm(fd));
-+		snprintf(st->devnm, MD_NAME_MAX, "%s", fd2devnm(fd));
- 
- 	for (mse2 = mdstat; mse2; mse2 = mse2->next)
- 		if (strcmp(mse2->devnm, st->devnm) == 0) {
-@@ -684,7 +676,7 @@ static int check_array(struct state *st, struct mdstat_ent *mdstat,
- 	    strncmp(mse->metadata_version, "external:", 9) == 0 &&
- 	    is_subarray(mse->metadata_version+9)) {
- 		char *sl;
--		strcpy(st->parent_devnm, mse->metadata_version + 10);
-+		snprintf(st->parent_devnm, MD_NAME_MAX, "%s", mse->metadata_version + 10);
- 		sl = strchr(st->parent_devnm, '/');
- 		if (sl)
- 			*sl = 0;
-@@ -772,14 +764,13 @@ static int add_new_arrays(struct mdstat_ent *mdstat, struct state **statelist,
- 				continue;
- 			}
- 
--			st->devname = xstrdup(name);
-+			snprintf(st->devname, MD_NAME_MAX + sizeof("/dev/md/"), "%s", name);
- 			if ((fd = open(st->devname, O_RDONLY)) < 0 ||
- 			    md_get_array_info(fd, &array) < 0) {
- 				/* no such array */
- 				if (fd >= 0)
- 					close(fd);
- 				put_md_name(st->devname);
--				free(st->devname);
- 				if (st->metadata) {
- 					st->metadata->ss->free_super(st->metadata);
- 					free(st->metadata);
-@@ -791,7 +782,7 @@ static int add_new_arrays(struct mdstat_ent *mdstat, struct state **statelist,
- 			st->next = *statelist;
- 			st->err = 1;
- 			st->from_auto = 1;
--			strcpy(st->devnm, mse->devnm);
-+			snprintf(st->devnm, MD_NAME_MAX, "%s", mse->devnm);
- 			st->percent = RESYNC_UNKNOWN;
- 			st->expected_spares = -1;
- 			if (mse->metadata_version &&
-@@ -799,8 +790,8 @@ static int add_new_arrays(struct mdstat_ent *mdstat, struct state **statelist,
- 				    "external:", 9) == 0 &&
- 			    is_subarray(mse->metadata_version+9)) {
- 				char *sl;
--				strcpy(st->parent_devnm,
--					mse->metadata_version+10);
-+				snprintf(st->parent_devnm, MD_NAME_MAX,
-+					 "%s", mse->metadata_version + 10);
- 				sl = strchr(st->parent_devnm, '/');
- 				*sl = 0;
- 			} else
--- 
-2.38.1
-

SOURCES/0031-Makefile-Don-t-build-static-build-with-everything-an.patch

@@ -1,42 +0,0 @@
-From 14ae4c37bce9a53da08d59d6c2d7e0946e9c9f47 Mon Sep 17 00:00:00 2001
-From: Logan Gunthorpe <logang@deltatee.com>
-Date: Wed, 22 Jun 2022 14:25:06 -0600
-Subject: [PATCH 31/83] Makefile: Don't build static build with everything and
- everything-test
-
-Running the test suite requires building everything, but it seems to be
-difficult to build the static version of mdadm now seeing there
-is no readily available static udev library.
-
-The test suite doesn't need the static binary so just don't build it
-with the everything or everything-test targets.
-
-Leave the mdadm.static and install-static targets in place in case
-someone still has a use case for the static binary.
-
-Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
-Acked-by: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
-Signed-off-by: Jes Sorensen <jes@trained-monkey.org>
----
- Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index bf126033..ec1f99ed 100644
---- a/Makefile
-+++ b/Makefile
-@@ -182,9 +182,9 @@ check_rundir:
- 		echo "***** or set CHECK_RUN_DIR=0"; exit 1; \
- 	fi
- 
--everything: all mdadm.static swap_super test_stripe raid6check \
-+everything: all swap_super test_stripe raid6check \
- 	mdadm.Os mdadm.O2 man
--everything-test: all mdadm.static swap_super test_stripe \
-+everything-test: all swap_super test_stripe \
- 	mdadm.Os mdadm.O2 man
- # mdadm.uclibc doesn't work on x86-64
- # mdadm.tcc doesn't work..
--- 
-2.38.1
-

SOURCES/0032-DDF-Cleanup-validate_geometry_ddf_container.patch

@@ -1,141 +0,0 @@
-From 679bd9508a30b2a0a1baecc9a21dd6c7d8d8d7dc Mon Sep 17 00:00:00 2001
-From: Logan Gunthorpe <logang@deltatee.com>
-Date: Wed, 22 Jun 2022 14:25:07 -0600
-Subject: [PATCH 32/83] DDF: Cleanup validate_geometry_ddf_container()
-
-Move the function up so that the function declaration is not necessary
-and remove the unused arguments to the function.
-
-No functional changes are intended but will help with a bug fix in the
-next patch.
-
-Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
-Acked-by: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
-Signed-off-by: Jes Sorensen <jes@trained-monkey.org>
----
- super-ddf.c | 88 ++++++++++++++++++++++++-----------------------------
- 1 file changed, 39 insertions(+), 49 deletions(-)
-
-diff --git a/super-ddf.c b/super-ddf.c
-index abbc8b09..9d867f69 100644
---- a/super-ddf.c
-+++ b/super-ddf.c
-@@ -503,13 +503,6 @@ struct ddf_super {
- static int load_super_ddf_all(struct supertype *st, int fd,
- 			      void **sbp, char *devname);
- static int get_svd_state(const struct ddf_super *, const struct vcl *);
--static int
--validate_geometry_ddf_container(struct supertype *st,
--				int level, int layout, int raiddisks,
--				int chunk, unsigned long long size,
--				unsigned long long data_offset,
--				char *dev, unsigned long long *freesize,
--				int verbose);
- 
- static int validate_geometry_ddf_bvd(struct supertype *st,
- 				     int level, int layout, int raiddisks,
-@@ -3322,6 +3315,42 @@ static int reserve_space(struct supertype *st, int raiddisks,
- 	return 1;
- }
- 
-+static int
-+validate_geometry_ddf_container(struct supertype *st,
-+				int level, int raiddisks,
-+				unsigned long long data_offset,
-+				char *dev, unsigned long long *freesize,
-+				int verbose)
-+{
-+	int fd;
-+	unsigned long long ldsize;
-+
-+	if (level != LEVEL_CONTAINER)
-+		return 0;
-+	if (!dev)
-+		return 1;
-+
-+	fd = dev_open(dev, O_RDONLY|O_EXCL);
-+	if (fd < 0) {
-+		if (verbose)
-+			pr_err("ddf: Cannot open %s: %s\n",
-+			       dev, strerror(errno));
-+		return 0;
-+	}
-+	if (!get_dev_size(fd, dev, &ldsize)) {
-+		close(fd);
-+		return 0;
-+	}
-+	close(fd);
-+	if (freesize) {
-+		*freesize = avail_size_ddf(st, ldsize >> 9, INVALID_SECTORS);
-+		if (*freesize == 0)
-+			return 0;
-+	}
-+
-+	return 1;
-+}
-+
- static int validate_geometry_ddf(struct supertype *st,
- 				 int level, int layout, int raiddisks,
- 				 int *chunk, unsigned long long size,
-@@ -3347,11 +3376,9 @@ static int validate_geometry_ddf(struct supertype *st,
- 		level = LEVEL_CONTAINER;
- 	if (level == LEVEL_CONTAINER) {
- 		/* Must be a fresh device to add to a container */
--		return validate_geometry_ddf_container(st, level, layout,
--						       raiddisks, *chunk,
--						       size, data_offset, dev,
--						       freesize,
--						       verbose);
-+		return validate_geometry_ddf_container(st, level, raiddisks,
-+						       data_offset, dev,
-+						       freesize, verbose);
- 	}
- 
- 	if (!dev) {
-@@ -3449,43 +3476,6 @@ static int validate_geometry_ddf(struct supertype *st,
- 	return 1;
- }
- 
--static int
--validate_geometry_ddf_container(struct supertype *st,
--				int level, int layout, int raiddisks,
--				int chunk, unsigned long long size,
--				unsigned long long data_offset,
--				char *dev, unsigned long long *freesize,
--				int verbose)
--{
--	int fd;
--	unsigned long long ldsize;
--
--	if (level != LEVEL_CONTAINER)
--		return 0;
--	if (!dev)
--		return 1;
--
--	fd = dev_open(dev, O_RDONLY|O_EXCL);
--	if (fd < 0) {
--		if (verbose)
--			pr_err("ddf: Cannot open %s: %s\n",
--			       dev, strerror(errno));
--		return 0;
--	}
--	if (!get_dev_size(fd, dev, &ldsize)) {
--		close(fd);
--		return 0;
--	}
--	close(fd);
--	if (freesize) {
--		*freesize = avail_size_ddf(st, ldsize >> 9, INVALID_SECTORS);
--		if (*freesize == 0)
--			return 0;
--	}
--
--	return 1;
--}
--
- static int validate_geometry_ddf_bvd(struct supertype *st,
- 				     int level, int layout, int raiddisks,
- 				     int *chunk, unsigned long long size,
--- 
-2.38.1
-

SOURCES/0033-DDF-Fix-NULL-pointer-dereference-in-validate_geometr.patch

@@ -1,49 +0,0 @@
-From 2b93288a5650bb811932836f67f30d63c5ddcfbd Mon Sep 17 00:00:00 2001
-From: Logan Gunthorpe <logang@deltatee.com>
-Date: Wed, 22 Jun 2022 14:25:08 -0600
-Subject: [PATCH 33/83] DDF: Fix NULL pointer dereference in
- validate_geometry_ddf()
-
-A relatively recent patch added a call to validate_geometry() in
-Manage_add() that has level=LEVEL_CONTAINER and chunk=NULL.
-
-This causes some ddf tests to segfault which aborts the test suite.
-
-To fix this, avoid dereferencing chunk when the level is
-LEVEL_CONTAINER or LEVEL_NONE.
-
-Fixes: 1f5d54a06df0 ("Manage: Call validate_geometry when adding drive to external container")
-Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
-Acked-by: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
-Signed-off-by: Jes Sorensen <jes@trained-monkey.org>
----
- super-ddf.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/super-ddf.c b/super-ddf.c
-index 9d867f69..949e7d15 100644
---- a/super-ddf.c
-+++ b/super-ddf.c
-@@ -3369,9 +3369,6 @@ static int validate_geometry_ddf(struct supertype *st,
- 	 * If given BVDs, we make an SVD, changing all the GUIDs in the process.
- 	 */
- 
--	if (*chunk == UnSet)
--		*chunk = DEFAULT_CHUNK;
--
- 	if (level == LEVEL_NONE)
- 		level = LEVEL_CONTAINER;
- 	if (level == LEVEL_CONTAINER) {
-@@ -3381,6 +3378,9 @@ static int validate_geometry_ddf(struct supertype *st,
- 						       freesize, verbose);
- 	}
- 
-+	if (*chunk == UnSet)
-+		*chunk = DEFAULT_CHUNK;
-+
- 	if (!dev) {
- 		mdu_array_info_t array = {
- 			.level = level,
--- 
-2.38.1
-

SOURCES/0034-mdadm-Grow-Fix-use-after-close-bug-by-closing-after-.patch

@@ -1,85 +0,0 @@
-From 548e9b916f86c06e2cdb50d8f49633f9bec66c7e Mon Sep 17 00:00:00 2001
-From: Logan Gunthorpe <logang@deltatee.com>
-Date: Wed, 22 Jun 2022 14:25:09 -0600
-Subject: [PATCH 34/83] mdadm/Grow: Fix use after close bug by closing after
- fork
-
-The test 07reshape-grow fails most of the time. But it succeeds around
-1 in 5 times. When it does succeed, it causes the tests to die because
-mdadm has segfaulted.
-
-The segfault was caused by mdadm attempting to repoen a file
-descriptor that was already closed. The backtrace of the segfault
-was:
-
-  #0  __strncmp_avx2 () at ../sysdeps/x86_64/multiarch/strcmp-avx2.S:101
-  #1  0x000056146e31d44b in devnm2devid (devnm=0x0) at util.c:956
-  #2  0x000056146e31dab4 in open_dev_flags (devnm=0x0, flags=0)
-                         at util.c:1072
-  #3  0x000056146e31db22 in open_dev (devnm=0x0) at util.c:1079
-  #4  0x000056146e3202e8 in reopen_mddev (mdfd=4) at util.c:2244
-  #5  0x000056146e329f36 in start_array (mdfd=4,
-              mddev=0x7ffc55342450 "/dev/md0", content=0x7ffc55342860,
-              st=0x56146fc78660, ident=0x7ffc55342f70, best=0x56146fc6f5d0,
-              bestcnt=10, chosen_drive=0, devices=0x56146fc706b0, okcnt=5,
-	      sparecnt=0,  rebuilding_cnt=0, journalcnt=0, c=0x7ffc55342e90,
-	      clean=1,  avail=0x56146fc78720 "\001\001\001\001\001",
-	      start_partial_ok=0, err_ok=0, was_forced=0)
-	                  at Assemble.c:1206
-  #6  0x000056146e32c36e in Assemble (st=0x56146fc78660,
-               mddev=0x7ffc55342450 "/dev/md0", ident=0x7ffc55342f70,
-	       devlist=0x56146fc6e2d0, c=0x7ffc55342e90)
-	                 at Assemble.c:1914
-  #7  0x000056146e312ac9 in main (argc=11, argv=0x7ffc55343238)
-                         at mdadm.c:1510
-
-The file descriptor was closed early in Grow_continue(). The noted commit
-moved the close() call to close the fd above the fork which caused the
-parent process to return with a closed fd.
-
-This meant reshape_array() and Grow_continue() would return in the parent
-with the fd forked. The fd would eventually be passed to reopen_mddev()
-which returned an unhandled NULL from fd2devnm() which would then be
-dereferenced in devnm2devid.
-
-Fix this by moving the close() call below the fork. This appears to
-fix the 07revert-grow test. While we're at it, switch to using
-close_fd() to invalidate the file descriptor.
-
-Fixes: 77b72fa82813 ("mdadm/Grow: prevent md's fd from being occupied during delayed time")
-Cc: Alex Wu <alexwu@synology.com>
-Cc: BingJing Chang <bingjingc@synology.com>
-Cc: Danny Shih <dannyshih@synology.com>
-Cc: ChangSyun Peng <allenpeng@synology.com>
-Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
-Acked-by: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
-Signed-off-by: Jes Sorensen <jes@trained-monkey.org>
----
- Grow.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/Grow.c b/Grow.c
-index 8c520d42..97f22c75 100644
---- a/Grow.c
-+++ b/Grow.c
-@@ -3514,7 +3514,6 @@ started:
- 			return 0;
- 		}
- 
--	close(fd);
- 	/* Now we just need to kick off the reshape and watch, while
- 	 * handling backups of the data...
- 	 * This is all done by a forked background process.
-@@ -3535,6 +3534,9 @@ started:
- 		break;
- 	}
- 
-+	/* Close unused file descriptor in the forked process */
-+	close_fd(&fd);
-+
- 	/* If another array on the same devices is busy, the
- 	 * reshape will wait for them.  This would mean that
- 	 * the first section that we suspend will stay suspended
--- 
-2.38.1
-

SOURCES/0035-monitor-Avoid-segfault-when-calling-NULL-get_bad_blo.patch

@@ -1,36 +0,0 @@
-From 9ae62977b51dab0f4bb46b1c8ea5ebd1705b2f4d Mon Sep 17 00:00:00 2001
-From: Logan Gunthorpe <logang@deltatee.com>
-Date: Wed, 22 Jun 2022 14:25:10 -0600
-Subject: [PATCH 35/83] monitor: Avoid segfault when calling NULL
- get_bad_blocks
-
-Not all struct superswitch implement a get_bad_blocks() function,
-yet mdmon seems to call it without checking for NULL and thus
-occasionally segfaults in the test 10ddf-geometry.
-
-Fix this by checking for NULL before calling it.
-
-Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
-Acked-by: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
-Signed-off-by: Jes Sorensen <jes@trained-monkey.org>
----
- monitor.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/monitor.c b/monitor.c
-index b877e595..820a93d0 100644
---- a/monitor.c
-+++ b/monitor.c
-@@ -311,6 +311,9 @@ static int check_for_cleared_bb(struct active_array *a, struct mdinfo *mdi)
- 	struct md_bb *bb;
- 	int i;
- 
-+	if (!ss->get_bad_blocks)
-+		return -1;
-+
- 	/*
- 	 * Get a list of bad blocks for an array, then read list of
- 	 * acknowledged bad blocks from kernel and compare it against metadata
--- 
-2.38.1
-

SOURCES/0036-mdadm-Fix-mdadm-r-remove-option-regression.patch

@@ -1,78 +0,0 @@
-From 6c9d9260633f2c8491985b0782cf0fbd7e51651b Mon Sep 17 00:00:00 2001
-From: Logan Gunthorpe <logang@deltatee.com>
-Date: Wed, 22 Jun 2022 14:25:11 -0600
-Subject: [PATCH 36/83] mdadm: Fix mdadm -r remove option regression
-
-The commit noted below globally adds a parameter to the -r option but missed
-the fact that -r is used for another purpose: --remove.
-
-After that commit, a command such as:
-
-  mdadm /dev/md0 -r /dev/loop0
-
-will do nothing seeing the device parameter will be consumed as a
-argument to the -r option; thus, there will only be one device
-seen one the command line, devs_found will only be 1 and nothing will
-happen.
-
-This caused the 01r5integ and 01raid6integ tests to hang indefinitely
-as mdadm did not remove the failed device. With the device not removed,
-it would not be readded. Then the loop waiting for the array status to
-change would loop forever.
-
-This commit was recently reverted, but the legitimate fix for the
-monitor operations was still not fixed. So add specific monitor
-short ops to re-fix the --monitor -r option.
-
-Fixes: 546047688e1c ("mdadm: fix coredump of mdadm --monitor -r")
-Fixes: 190dc029b141 ("Revert "mdadm: fix coredump of mdadm --monitor -r"")
-Cc: Wu Guanghao <wuguanghao3@huawei.com>
-Cc: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
-Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
-Acked-by: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
-Signed-off-by: Jes Sorensen <jes@trained-monkey.org>
----
- ReadMe.c | 1 +
- mdadm.c  | 1 +
- mdadm.h  | 1 +
- 3 files changed, 3 insertions(+)
-
-diff --git a/ReadMe.c b/ReadMe.c
-index bec1be9a..7518a32a 100644
---- a/ReadMe.c
-+++ b/ReadMe.c
-@@ -82,6 +82,7 @@ char Version[] = "mdadm - v" VERSION " - " VERS_DATE EXTRAVERSION "\n";
-  */
- 
- char short_options[]="-ABCDEFGIQhVXYWZ:vqbc:i:l:p:m:n:x:u:c:d:z:U:N:sarfRSow1tye:k:";
-+char short_monitor_options[]="-ABCDEFGIQhVXYWZ:vqbc:i:l:p:m:r:n:x:u:c:d:z:U:N:safRSow1tye:k:";
- char short_bitmap_options[]=
- 		"-ABCDEFGIQhVXYWZ:vqb:c:i:l:p:m:n:x:u:c:d:z:U:N:sarfRSow1tye:k:";
- char short_bitmap_auto_options[]=
-diff --git a/mdadm.c b/mdadm.c
-index be40686c..d0c5e6de 100644
---- a/mdadm.c
-+++ b/mdadm.c
-@@ -227,6 +227,7 @@ int main(int argc, char *argv[])
- 			shortopt = short_bitmap_auto_options;
- 			break;
- 		case 'F': newmode = MONITOR;
-+			shortopt = short_monitor_options;
- 			break;
- 		case 'G': newmode = GROW;
- 			shortopt = short_bitmap_options;
-diff --git a/mdadm.h b/mdadm.h
-index 974415b9..163f4a49 100644
---- a/mdadm.h
-+++ b/mdadm.h
-@@ -419,6 +419,7 @@ enum mode {
- };
- 
- extern char short_options[];
-+extern char short_monitor_options[];
- extern char short_bitmap_options[];
- extern char short_bitmap_auto_options[];
- extern struct option long_options[];
--- 
-2.38.1
-

SOURCES/0037-mdadm-Fix-optional-write-behind-parameter.patch

@@ -1,42 +0,0 @@
-From 41edf6f45895193f4a523cb0a08d639c9ff9ccc9 Mon Sep 17 00:00:00 2001
-From: Logan Gunthorpe <logang@deltatee.com>
-Date: Wed, 22 Jun 2022 14:25:12 -0600
-Subject: [PATCH 37/83] mdadm: Fix optional --write-behind parameter
-
-The commit noted below changed the behaviour of --write-behind to
-require an argument. This broke the 06wrmostly test with the error:
-
-  mdadm: Invalid value for maximum outstanding write-behind writes: (null).
-         Must be between 0 and 16383.
-
-To fix this, check if optarg is NULL before parising it, as the origial
-code did.
-
-Fixes: 60815698c0ac ("Refactor parse_num and use it to parse optarg.")
-Cc: Mateusz Grzonka <mateusz.grzonka@intel.com>
-Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
-Acked-by: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
-Signed-off-by: Jes Sorensen <jes@trained-monkey.org>
----
- mdadm.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/mdadm.c b/mdadm.c
-index d0c5e6de..56722ed9 100644
---- a/mdadm.c
-+++ b/mdadm.c
-@@ -1201,8 +1201,9 @@ int main(int argc, char *argv[])
- 		case O(BUILD, WriteBehind):
- 		case O(CREATE, WriteBehind):
- 			s.write_behind = DEFAULT_MAX_WRITE_BEHIND;
--			if (parse_num(&s.write_behind, optarg) != 0 ||
--			s.write_behind < 0 || s.write_behind > 16383) {
-+			if (optarg &&
-+			    (parse_num(&s.write_behind, optarg) != 0 ||
-+			     s.write_behind < 0 || s.write_behind > 16383)) {
- 				pr_err("Invalid value for maximum outstanding write-behind writes: %s.\n\tMust be between 0 and 16383.\n",
- 						optarg);
- 				exit(2);
--- 
-2.38.1
-

SOURCES/0038-tests-00raid0-add-a-test-that-validates-raid0-with-l.patch

@@ -1,38 +0,0 @@
-From 7539254342bc591717b0051734cc6c09c1b88640 Mon Sep 17 00:00:00 2001
-From: Sudhakar Panneerselvam <sudhakar.panneerselvam@oracle.com>
-Date: Wed, 22 Jun 2022 14:25:13 -0600
-Subject: [PATCH 38/83] tests/00raid0: add a test that validates raid0 with
- layout fails for 0.9
-
-329dfc28debb disallows the creation of raid0 with layouts for 0.9
-metadata. This test confirms the new behavior.
-
-Signed-off-by: Sudhakar Panneerselvam <sudhakar.panneerselvam@oracle.com>
-Signed-off-by: Himanshu Madhani <himanshu.madhani@oracle.com>
-Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
-Signed-off-by: Jes Sorensen <jes@trained-monkey.org>
----
- tests/00raid0 | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/tests/00raid0 b/tests/00raid0
-index 8bc18985..e6b21cc4 100644
---- a/tests/00raid0
-+++ b/tests/00raid0
-@@ -6,11 +6,9 @@ check raid0
- testdev $md0 3 $mdsize2_l 512
- mdadm -S $md0
- 
--# now with version-0.90 superblock
-+# verify raid0 with layouts fail for 0.90
- mdadm -CR $md0 -e0.90 -l0 -n4 $dev0 $dev1 $dev2 $dev3
--check raid0
--testdev $md0 4 $mdsize0 512
--mdadm -S $md0
-+check opposite_result
- 
- # now with no superblock
- mdadm -B $md0 -l0 -n5 $dev0 $dev1 $dev2 $dev3 $dev4
--- 
-2.38.1
-

SOURCES/0039-tests-fix-raid0-tests-for-0.90-metadata.patch

@@ -1,99 +0,0 @@
-From 14c2161edb77d7294199e8aa7daa9f9d1d0ad5d7 Mon Sep 17 00:00:00 2001
-From: Sudhakar Panneerselvam <sudhakar.panneerselvam@oracle.com>
-Date: Wed, 22 Jun 2022 14:25:14 -0600
-Subject: [PATCH 39/83] tests: fix raid0 tests for 0.90 metadata
-
-Some of the test cases fail because raid0 creation fails with the error,
-"0.90 metadata does not support layouts for RAID0" added by commit,
-329dfc28debb. Fix some of the test cases by switching from raid0 to
-linear level for 0.9 metadata where possible.
-
-Signed-off-by: Sudhakar Panneerselvam <sudhakar.panneerselvam@oracle.com>
-Signed-off-by: Himanshu Madhani <himanshu.madhani@oracle.com>
-Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
-Signed-off-by: Jes Sorensen <jes@trained-monkey.org>
----
- tests/00raid0           | 4 ++--
- tests/00readonly        | 4 ++++
- tests/03r0assem         | 6 +++---
- tests/04r0update        | 4 ++--
- tests/04update-metadata | 2 +-
- 5 files changed, 12 insertions(+), 8 deletions(-)
-
-diff --git a/tests/00raid0 b/tests/00raid0
-index e6b21cc4..9b8896cb 100644
---- a/tests/00raid0
-+++ b/tests/00raid0
-@@ -20,8 +20,8 @@ mdadm -S $md0
- # now same again with different chunk size
- for chunk in 4 32 256
- do
--  mdadm -CR $md0 -e0.90 -l raid0 --chunk $chunk -n3 $dev0 $dev1 $dev2
--  check raid0
-+  mdadm -CR $md0 -e0.90 -l linear --chunk $chunk -n3 $dev0 $dev1 $dev2
-+  check linear
-   testdev $md0 3 $mdsize0 $chunk
-   mdadm -S $md0
- 
-diff --git a/tests/00readonly b/tests/00readonly
-index 28b0fa13..39202487 100644
---- a/tests/00readonly
-+++ b/tests/00readonly
-@@ -4,6 +4,10 @@ for metadata in 0.9 1.0 1.1 1.2
- do
- 	for level in linear raid0 raid1 raid4 raid5 raid6 raid10
- 	do
-+		if [[ $metadata == "0.9" && $level == "raid0" ]];
-+		then
-+			continue
-+		fi
- 		mdadm -CR $md0 -l $level -n 4 --metadata=$metadata \
- 			$dev1 $dev2 $dev3 $dev4 --assume-clean
- 		check nosync
-diff --git a/tests/03r0assem b/tests/03r0assem
-index 6744e322..44df0645 100644
---- a/tests/03r0assem
-+++ b/tests/03r0assem
-@@ -68,9 +68,9 @@ mdadm -S $md2
- ### Now for version 0...
- 
- mdadm --zero-superblock $dev0 $dev1 $dev2
--mdadm -CR $md2 -l0 --metadata=0.90 -n3 $dev0 $dev1 $dev2
--check raid0
--tst="testdev $md2 3 $mdsize0 512"
-+mdadm -CR $md2 -llinear --metadata=0.90 -n3 $dev0 $dev1 $dev2
-+check linear
-+tst="testdev $md2 3 $mdsize0 1"
- $tst
- 
- uuid=`mdadm -Db $md2 | sed 's/.*UUID=//'`
-diff --git a/tests/04r0update b/tests/04r0update
-index 73ee3b9f..b95efb06 100644
---- a/tests/04r0update
-+++ b/tests/04r0update
-@@ -1,7 +1,7 @@
- 
- # create a raid0, re-assemble with a different super-minor
--mdadm -CR -e 0.90 $md0 -l0 -n3 $dev0 $dev1 $dev2
--testdev $md0 3 $mdsize0 512
-+mdadm -CR -e 0.90 $md0 -llinear -n3 $dev0 $dev1 $dev2
-+testdev $md0 3 $mdsize0 1
- minor1=`mdadm -E $dev0 | sed -n -e 's/.*Preferred Minor : //p'`
- mdadm -S /dev/md0
- 
-diff --git a/tests/04update-metadata b/tests/04update-metadata
-index 232fc1ff..08c14af7 100644
---- a/tests/04update-metadata
-+++ b/tests/04update-metadata
-@@ -8,7 +8,7 @@ set -xe
- 
- dlist="$dev0 $dev1 $dev2 $dev3"
- 
--for ls in raid0/4 linear/4 raid1/1 raid5/3 raid6/2
-+for ls in linear/4 raid1/1 raid5/3 raid6/2
- do
-   s=${ls#*/} l=${ls%/*}
-   mdadm -CR --assume-clean -e 0.90 $md0 --level $l -n 4 -c 64 $dlist
--- 
-2.38.1
-

SOURCES/0040-tests-04update-metadata-avoid-passing-chunk-size-to-.patch

@@ -1,39 +0,0 @@
-From de045db607b1ac4b70fc2a8878463e029c2ab1dc Mon Sep 17 00:00:00 2001
-From: Sudhakar Panneerselvam <sudhakar.panneerselvam@oracle.com>
-Date: Wed, 22 Jun 2022 14:25:15 -0600
-Subject: [PATCH 40/83] tests/04update-metadata: avoid passing chunk size to
- raid1
-
-'04update-metadata' test fails with error, "specifying chunk size is
-forbidden for this level" added by commit, 5b30a34aa4b5e. Hence,
-correcting the test to ignore passing chunk size to raid1.
-
-Signed-off-by: Sudhakar Panneerselvam <sudhakar.panneerselvam@oracle.com>
-Signed-off-by: Himanshu Madhani <himanshu.madhani@oracle.com>
-[logang@deltatee.com: fix if/then style and dropped unrelated hunk]
-Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
-Signed-off-by: Jes Sorensen <jes@trained-monkey.org>
----
- tests/04update-metadata | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/tests/04update-metadata b/tests/04update-metadata
-index 08c14af7..2b72a303 100644
---- a/tests/04update-metadata
-+++ b/tests/04update-metadata
-@@ -11,7 +11,11 @@ dlist="$dev0 $dev1 $dev2 $dev3"
- for ls in linear/4 raid1/1 raid5/3 raid6/2
- do
-   s=${ls#*/} l=${ls%/*}
--  mdadm -CR --assume-clean -e 0.90 $md0 --level $l -n 4 -c 64 $dlist
-+  if [[ $l == 'raid1' ]]; then
-+	mdadm -CR --assume-clean -e 0.90 $md0 --level $l -n 4 $dlist
-+  else
-+	mdadm -CR --assume-clean -e 0.90 $md0 --level $l -n 4 -c 64 $dlist
-+  fi
-   testdev $md0 $s 19904 64
-   mdadm -S $md0
-   mdadm -A $md0 --update=metadata $dlist
--- 
-2.38.1
-

SOURCES/0041-tests-02lineargrow-clear-the-superblock-at-every-ite.patch

@@ -1,31 +0,0 @@
-From a2c832465fc75202e244327b2081231dfa974617 Mon Sep 17 00:00:00 2001
-From: Sudhakar Panneerselvam <sudhakar.panneerselvam@oracle.com>
-Date: Wed, 22 Jun 2022 14:25:16 -0600
-Subject: [PATCH 41/83] tests/02lineargrow: clear the superblock at every
- iteration
-
-This fixes 02lineargrow test as prior metadata causes --add operation
-to misbehave.
-
-Signed-off-by: Sudhakar Panneerselvam <sudhakar.panneerselvam@oracle.com>
-Signed-off-by: Himanshu Madhani <himanshu.madhani@oracle.com>
-Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
-Signed-off-by: Jes Sorensen <jes@trained-monkey.org>
----
- tests/02lineargrow | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/tests/02lineargrow b/tests/02lineargrow
-index e05c219d..595bf9f2 100644
---- a/tests/02lineargrow
-+++ b/tests/02lineargrow
-@@ -20,4 +20,6 @@ do
-   testdev $md0 3 $sz 1
- 
-   mdadm -S $md0
-+  mdadm --zero /dev/loop2
-+  mdadm --zero /dev/loop3
- done
--- 
-2.38.1
-

SOURCES/0042-mdadm-test-Add-a-mode-to-repeat-specified-tests.patch

@@ -1,88 +0,0 @@
-From a7bfcc716e235664dfb3b6c5a9590273e611ac72 Mon Sep 17 00:00:00 2001
-From: Logan Gunthorpe <logang@deltatee.com>
-Date: Wed, 22 Jun 2022 14:25:17 -0600
-Subject: [PATCH 42/83] mdadm/test: Add a mode to repeat specified tests
-
-Many tests fail infrequently or rarely. To help find these, add
-an option to run the tests multiple times by specifying --loop=N.
-
-If --loop=0 is specified, the test will be looped forever.
-
-Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
-Signed-off-by: Jes Sorensen <jes@trained-monkey.org>
----
- test | 36 ++++++++++++++++++++++++------------
- 1 file changed, 24 insertions(+), 12 deletions(-)
-
-diff --git a/test b/test
-index 711a3c7a..da6db5e0 100755
---- a/test
-+++ b/test
-@@ -10,6 +10,7 @@ devlist=
- 
- savelogs=0
- exitonerror=1
-+loop=1
- prefix='[0-9][0-9]'
- 
- # use loop devices by default if doesn't specify --dev
-@@ -117,6 +118,7 @@ do_help() {
- 		--logdir=directory          Directory to save all logfiles in
- 		--save-logs                 Usually use with --logdir together
- 		--keep-going | --no-error   Don't stop on error, ie. run all tests
-+		--loop=N                    Run tests N times (0 to run forever)
- 		--dev=loop|lvm|ram|disk     Use loop devices (default), LVM, RAM or disk
- 		--disks=                    Provide a bunch of physical devices for test
- 		--volgroup=name             LVM volume group for LVM test
-@@ -211,6 +213,9 @@ parse_args() {
- 		--keep-going | --no-error )
- 			exitonerror=0
- 			;;
-+		--loop=* )
-+			loop="${i##*=}"
-+			;;
- 		--disable-multipath )
- 			unset MULTIPATH
- 			;;
-@@ -263,19 +268,26 @@ main() {
- 	echo "Testing on linux-$(uname -r) kernel"
- 	[ "$savelogs" == "1" ] &&
- 		echo "Saving logs to $logdir"
--	if [ "x$TESTLIST" != "x" ]
--	then
--		for script in ${TESTLIST[@]}
--		do
--			do_test $testdir/$script
--		done
--	else
--		for script in $testdir/$prefix $testdir/$prefix*[^~]
--		do
--			do_test $script
--		done
--	fi
- 
-+	while true; do
-+		if [ "x$TESTLIST" != "x" ]
-+		then
-+			for script in ${TESTLIST[@]}
-+			do
-+				do_test $testdir/$script
-+			done
-+		else
-+			for script in $testdir/$prefix $testdir/$prefix*[^~]
-+			do
-+				do_test $script
-+			done
-+		fi
-+
-+		let loop=$loop-1
-+		if [ "$loop" == "0" ]; then
-+			break
-+		fi
-+	done
- 	exit 0
- }
- 
--- 
-2.38.1
-

SOURCES/0043-mdadm-test-Mark-and-ignore-broken-test-failures.patch

@@ -1,120 +0,0 @@
-From 28520bf114b3b0515a48ff44fff4ecbe9ed6dfad Mon Sep 17 00:00:00 2001
-From: Logan Gunthorpe <logang@deltatee.com>
-Date: Wed, 22 Jun 2022 14:25:18 -0600
-Subject: [PATCH 43/83] mdadm/test: Mark and ignore broken test failures
-
-Add functionality to continue if a test marked as broken fails.
-
-To mark a test as broken, a file with the same name but with the suffix
-'.broken' should exist. The first line in the file will be printed with
-a KNOWN BROKEN message; the rest of the file can describe the how the
-test is broken.
-
-Also adds --skip-broken and --skip-always-broken to skip all the tests
-that have a .broken file or to skip all tests whose .broken file's first
-line contains the keyword always.
-
-Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
-Signed-off-by: Jes Sorensen <jes@trained-monkey.org>
----
- test | 37 +++++++++++++++++++++++++++++++++++--
- 1 file changed, 35 insertions(+), 2 deletions(-)
-
-diff --git a/test b/test
-index da6db5e0..61d9ee83 100755
---- a/test
-+++ b/test
-@@ -10,6 +10,8 @@ devlist=
- 
- savelogs=0
- exitonerror=1
-+ctrl_c_error=0
-+skipbroken=0
- loop=1
- prefix='[0-9][0-9]'
- 
-@@ -36,6 +38,7 @@ die() {
- 
- ctrl_c() {
- 	exitonerror=1
-+	ctrl_c_error=1
- }
- 
- # mdadm always adds --quiet, and we want to see any unexpected messages
-@@ -80,8 +83,21 @@ mdadm() {
- do_test() {
- 	_script=$1
- 	_basename=`basename $_script`
-+	_broken=0
-+
- 	if [ -f "$_script" ]
- 	then
-+		if [ -f "${_script}.broken" ]; then
-+			_broken=1
-+			_broken_msg=$(head -n1 "${_script}.broken" | tr -d '\n')
-+			if [ "$skipbroken" == "all" ]; then
-+				return
-+			elif [ "$skipbroken" == "always" ] &&
-+			     [[ "$_broken_msg" == *always* ]]; then
-+				return
-+			fi
-+		fi
-+
- 		rm -f $targetdir/stderr
- 		# this might have been reset: restore the default.
- 		echo 2000 > /proc/sys/dev/raid/speed_limit_max
-@@ -98,10 +114,15 @@ do_test() {
- 		else
- 			save_log fail
- 			_fail=1
-+			if [ "$_broken" == "1" ]; then
-+				echo "  (KNOWN BROKEN TEST: $_broken_msg)"
-+			fi
- 		fi
- 		[ "$savelogs" == "1" ] &&
- 			mv -f $targetdir/log $logdir/$_basename.log
--		[ "$_fail" == "1" -a "$exitonerror" == "1" ] && exit 1
-+		[ "$ctrl_c_error" == "1" ] && exit 1
-+		[ "$_fail" == "1" -a "$exitonerror" == "1" \
-+		  -a "$_broken" == "0" ] && exit 1
- 	fi
- }
- 
-@@ -119,6 +140,8 @@ do_help() {
- 		--save-logs                 Usually use with --logdir together
- 		--keep-going | --no-error   Don't stop on error, ie. run all tests
- 		--loop=N                    Run tests N times (0 to run forever)
-+		--skip-broken               Skip tests that are known to be broken
-+		--skip-always-broken        Skip tests that are known to always fail
- 		--dev=loop|lvm|ram|disk     Use loop devices (default), LVM, RAM or disk
- 		--disks=                    Provide a bunch of physical devices for test
- 		--volgroup=name             LVM volume group for LVM test
-@@ -216,6 +239,12 @@ parse_args() {
- 		--loop=* )
- 			loop="${i##*=}"
- 			;;
-+		--skip-broken )
-+			skipbroken=all
-+			;;
-+		--skip-always-broken )
-+			skipbroken=always
-+			;;
- 		--disable-multipath )
- 			unset MULTIPATH
- 			;;
-@@ -279,7 +308,11 @@ main() {
- 		else
- 			for script in $testdir/$prefix $testdir/$prefix*[^~]
- 			do
--				do_test $script
-+				case $script in
-+				 *.broken) ;;
-+				 *)
-+				     do_test $script
-+				 esac
- 			done
- 		fi
- 
--- 
-2.38.1
-

SOURCES/0044-tests-Add-broken-files-for-all-broken-tests.patch

@@ -1,447 +0,0 @@
-From daa86d6634761796ada1f535c13e47fdd3cc95eb Mon Sep 17 00:00:00 2001
-From: Logan Gunthorpe <logang@deltatee.com>
-Date: Wed, 22 Jun 2022 14:25:19 -0600
-Subject: [PATCH 44/83] tests: Add broken files for all broken tests
-
-Each broken file contains the rough frequency of brokeness as well
-as a brief explanation of what happens when it breaks. Estimates
-of failure rates are not statistically significant and can vary
-run to run.
-
-This is really just a view from my window. Tests were done on a
-small VM with the default loop devices, not real hardware. We've
-seen different kernel configurations can cause bugs to appear as well
-(ie. different block schedulers). It may also be that different race
-conditions will be seen on machines with different performance
-characteristics.
-
-These annotations were done with the kernel currently in md/md-next:
-
- facef3b96c5b ("md: Notify sysfs sync_completed in md_reap_sync_thread()")
-
-Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
-Signed-off-by: Jes Sorensen <jes@trained-monkey.org>
----
- tests/01r5integ.broken                     |  7 ++++
- tests/01raid6integ.broken                  |  7 ++++
- tests/04r5swap.broken                      |  7 ++++
- tests/07autoassemble.broken                |  8 ++++
- tests/07autodetect.broken                  |  5 +++
- tests/07changelevelintr.broken             |  9 +++++
- tests/07changelevels.broken                |  9 +++++
- tests/07reshape5intr.broken                | 45 ++++++++++++++++++++++
- tests/07revert-grow.broken                 | 31 +++++++++++++++
- tests/07revert-shrink.broken               |  9 +++++
- tests/07testreshape5.broken                | 12 ++++++
- tests/09imsm-assemble.broken               |  6 +++
- tests/09imsm-create-fail-rebuild.broken    |  5 +++
- tests/09imsm-overlap.broken                |  7 ++++
- tests/10ddf-assemble-missing.broken        |  6 +++
- tests/10ddf-fail-create-race.broken        |  7 ++++
- tests/10ddf-fail-two-spares.broken         |  5 +++
- tests/10ddf-incremental-wrong-order.broken |  9 +++++
- tests/14imsm-r1_2d-grow-r1_3d.broken       |  5 +++
- tests/14imsm-r1_2d-takeover-r0_2d.broken   |  6 +++
- tests/18imsm-r10_4d-takeover-r0_2d.broken  |  5 +++
- tests/18imsm-r1_2d-takeover-r0_1d.broken   |  6 +++
- tests/19raid6auto-repair.broken            |  5 +++
- tests/19raid6repair.broken                 |  5 +++
- 24 files changed, 226 insertions(+)
- create mode 100644 tests/01r5integ.broken
- create mode 100644 tests/01raid6integ.broken
- create mode 100644 tests/04r5swap.broken
- create mode 100644 tests/07autoassemble.broken
- create mode 100644 tests/07autodetect.broken
- create mode 100644 tests/07changelevelintr.broken
- create mode 100644 tests/07changelevels.broken
- create mode 100644 tests/07reshape5intr.broken
- create mode 100644 tests/07revert-grow.broken
- create mode 100644 tests/07revert-shrink.broken
- create mode 100644 tests/07testreshape5.broken
- create mode 100644 tests/09imsm-assemble.broken
- create mode 100644 tests/09imsm-create-fail-rebuild.broken
- create mode 100644 tests/09imsm-overlap.broken
- create mode 100644 tests/10ddf-assemble-missing.broken
- create mode 100644 tests/10ddf-fail-create-race.broken
- create mode 100644 tests/10ddf-fail-two-spares.broken
- create mode 100644 tests/10ddf-incremental-wrong-order.broken
- create mode 100644 tests/14imsm-r1_2d-grow-r1_3d.broken
- create mode 100644 tests/14imsm-r1_2d-takeover-r0_2d.broken
- create mode 100644 tests/18imsm-r10_4d-takeover-r0_2d.broken
- create mode 100644 tests/18imsm-r1_2d-takeover-r0_1d.broken
- create mode 100644 tests/19raid6auto-repair.broken
- create mode 100644 tests/19raid6repair.broken
-
-diff --git a/tests/01r5integ.broken b/tests/01r5integ.broken
-new file mode 100644
-index 00000000..20737637
---- /dev/null
-+++ b/tests/01r5integ.broken
-@@ -0,0 +1,7 @@
-+fails rarely
-+
-+Fails about 1 in every 30 runs with a sha mismatch error:
-+
-+    c49ab26e1b01def7874af9b8a6d6d0c29fdfafe6 /dev/md0 does not match
-+    15dc2f73262f811ada53c65e505ceec9cf025cb9 /dev/md0 with /dev/loop3
-+    missing
-diff --git a/tests/01raid6integ.broken b/tests/01raid6integ.broken
-new file mode 100644
-index 00000000..1df735f0
---- /dev/null
-+++ b/tests/01raid6integ.broken
-@@ -0,0 +1,7 @@
-+fails infrequently
-+
-+Fails about 1 in 5 with a sha mismatch:
-+
-+    8286c2bc045ae2cfe9f8b7ae3a898fa25db6926f /dev/md0 does not match
-+    a083a0738b58caab37fd568b91b177035ded37df /dev/md0 with /dev/loop2 and
-+    /dev/loop3 missing
-diff --git a/tests/04r5swap.broken b/tests/04r5swap.broken
-new file mode 100644
-index 00000000..e38987db
---- /dev/null
-+++ b/tests/04r5swap.broken
-@@ -0,0 +1,7 @@
-+always fails
-+
-+Fails with errors:
-+
-+  mdadm: /dev/loop0 has no superblock - assembly aborted
-+
-+   ERROR: no recovery happening
-diff --git a/tests/07autoassemble.broken b/tests/07autoassemble.broken
-new file mode 100644
-index 00000000..8be09407
---- /dev/null
-+++ b/tests/07autoassemble.broken
-@@ -0,0 +1,8 @@
-+always fails
-+
-+Prints lots of messages, but the array doesn't assemble. Error
-+possibly related to:
-+
-+  mdadm: /dev/md/1 is busy - skipping
-+  mdadm: no recogniseable superblock on /dev/md/testing:0
-+  mdadm: /dev/md/2 is busy - skipping
-diff --git a/tests/07autodetect.broken b/tests/07autodetect.broken
-new file mode 100644
-index 00000000..294954a1
---- /dev/null
-+++ b/tests/07autodetect.broken
-@@ -0,0 +1,5 @@
-+always fails
-+
-+Fails with error:
-+
-+    ERROR: no resync happening
-diff --git a/tests/07changelevelintr.broken b/tests/07changelevelintr.broken
-new file mode 100644
-index 00000000..284b4906
---- /dev/null
-+++ b/tests/07changelevelintr.broken
-@@ -0,0 +1,9 @@
-+always fails
-+
-+Fails with errors:
-+
-+  mdadm: this change will reduce the size of the array.
-+         use --grow --array-size first to truncate array.
-+         e.g. mdadm --grow /dev/md0 --array-size 56832
-+
-+  ERROR: no reshape happening
-diff --git a/tests/07changelevels.broken b/tests/07changelevels.broken
-new file mode 100644
-index 00000000..9b930d93
---- /dev/null
-+++ b/tests/07changelevels.broken
-@@ -0,0 +1,9 @@
-+always fails
-+
-+Fails with errors:
-+
-+    mdadm: /dev/loop0 is smaller than given size. 18976K < 19968K + metadata
-+    mdadm: /dev/loop1 is smaller than given size. 18976K < 19968K + metadata
-+    mdadm: /dev/loop2 is smaller than given size. 18976K < 19968K + metadata
-+
-+    ERROR: /dev/md0 isn't a block device.
-diff --git a/tests/07reshape5intr.broken b/tests/07reshape5intr.broken
-new file mode 100644
-index 00000000..efe52a66
---- /dev/null
-+++ b/tests/07reshape5intr.broken
-@@ -0,0 +1,45 @@
-+always fails
-+
-+This patch, recently added to md-next causes the test to always fail:
-+
-+7e6ba434cc60 ("md: don't unregister sync_thread with reconfig_mutex
-+held")
-+
-+The new error is simply:
-+
-+   ERROR: no reshape happening
-+
-+Before the patch, the error seen is below.
-+
-+--
-+
-+fails infrequently
-+
-+Fails roughly 1 in 4 runs with errors:
-+
-+    mdadm: Merging with already-assembled /dev/md/0
-+    mdadm: cannot re-read metadata from /dev/loop6 - aborting
-+
-+    ERROR: no reshape happening
-+
-+Also have seen a random deadlock:
-+
-+     INFO: task mdadm:109702 blocked for more than 30 seconds.
-+           Not tainted 5.18.0-rc3-eid-vmlocalyes-dbg-00095-g3c2b5427979d #2040
-+     "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message.
-+     task:mdadm           state:D stack:    0 pid:109702 ppid:     1 flags:0x00004000
-+     Call Trace:
-+      <TASK>
-+      __schedule+0x67e/0x13b0
-+      schedule+0x82/0x110
-+      mddev_suspend+0x2e1/0x330
-+      suspend_lo_store+0xbd/0x140
-+      md_attr_store+0xcb/0x130
-+      sysfs_kf_write+0x89/0xb0
-+      kernfs_fop_write_iter+0x202/0x2c0
-+      new_sync_write+0x222/0x330
-+      vfs_write+0x3bc/0x4d0
-+      ksys_write+0xd9/0x180
-+      __x64_sys_write+0x43/0x50
-+      do_syscall_64+0x3b/0x90
-+      entry_SYSCALL_64_after_hwframe+0x44/0xae
-diff --git a/tests/07revert-grow.broken b/tests/07revert-grow.broken
-new file mode 100644
-index 00000000..9b6db86f
---- /dev/null
-+++ b/tests/07revert-grow.broken
-@@ -0,0 +1,31 @@
-+always fails
-+
-+This patch, recently added to md-next causes the test to always fail:
-+
-+7e6ba434cc60 ("md: don't unregister sync_thread with reconfig_mutex held")
-+
-+The errors are:
-+
-+    mdadm: No active reshape to revert on /dev/loop0
-+    ERROR: active raid5 not found
-+
-+Before the patch, the error seen is below.
-+
-+--
-+
-+fails rarely
-+
-+Fails about 1 in every 30 runs with errors:
-+
-+    mdadm: Merging with already-assembled /dev/md/0
-+    mdadm: backup file /tmp/md-backup inaccessible: No such file or directory
-+    mdadm: failed to add /dev/loop1 to /dev/md/0: Invalid argument
-+    mdadm: failed to add /dev/loop2 to /dev/md/0: Invalid argument
-+    mdadm: failed to add /dev/loop3 to /dev/md/0: Invalid argument
-+    mdadm: failed to add /dev/loop0 to /dev/md/0: Invalid argument
-+    mdadm: /dev/md/0 assembled from 1 drive - need all 5 to start it
-+            (use --run to insist).
-+
-+    grep: /sys/block/md*/md/sync_action: No such file or directory
-+
-+    ERROR: active raid5 not found
-diff --git a/tests/07revert-shrink.broken b/tests/07revert-shrink.broken
-new file mode 100644
-index 00000000..c33c39ec
---- /dev/null
-+++ b/tests/07revert-shrink.broken
-@@ -0,0 +1,9 @@
-+always fails
-+
-+Fails with errors:
-+
-+    mdadm: this change will reduce the size of the array.
-+           use --grow --array-size first to truncate array.
-+           e.g. mdadm --grow /dev/md0 --array-size 53760
-+
-+    ERROR: active raid5 not found
-diff --git a/tests/07testreshape5.broken b/tests/07testreshape5.broken
-new file mode 100644
-index 00000000..a8ce03e4
---- /dev/null
-+++ b/tests/07testreshape5.broken
-@@ -0,0 +1,12 @@
-+always fails
-+
-+Test seems to run 'test_stripe' at $dir directory, but $dir is never
-+set. If $dir is adjusted to $PWD, the test still fails with:
-+
-+    mdadm: /dev/loop2 is not suitable for this array.
-+    mdadm: create aborted
-+    ++ return 1
-+    ++ cmp -s -n 8192 /dev/md0 /tmp/RandFile
-+    ++ echo cmp failed
-+    cmp failed
-+    ++ exit 2
-diff --git a/tests/09imsm-assemble.broken b/tests/09imsm-assemble.broken
-new file mode 100644
-index 00000000..a6d4d5cf
---- /dev/null
-+++ b/tests/09imsm-assemble.broken
-@@ -0,0 +1,6 @@
-+fails infrequently
-+
-+Fails roughly 1 in 10 runs with errors:
-+
-+    mdadm: /dev/loop2 is still in use, cannot remove.
-+    /dev/loop2 removal from /dev/md/container should have succeeded
-diff --git a/tests/09imsm-create-fail-rebuild.broken b/tests/09imsm-create-fail-rebuild.broken
-new file mode 100644
-index 00000000..40c4b294
---- /dev/null
-+++ b/tests/09imsm-create-fail-rebuild.broken
-@@ -0,0 +1,5 @@
-+always fails
-+
-+Fails with error:
-+
-+    **Error**: Array size mismatch - expected 3072, actual 16384
-diff --git a/tests/09imsm-overlap.broken b/tests/09imsm-overlap.broken
-new file mode 100644
-index 00000000..e7ccab76
---- /dev/null
-+++ b/tests/09imsm-overlap.broken
-@@ -0,0 +1,7 @@
-+always fails
-+
-+Fails with errors:
-+
-+    **Error**: Offset mismatch - expected 15360, actual 0
-+    **Error**: Offset mismatch - expected 15360, actual 0
-+    /dev/md/vol3 failed check
-diff --git a/tests/10ddf-assemble-missing.broken b/tests/10ddf-assemble-missing.broken
-new file mode 100644
-index 00000000..bfd8d103
---- /dev/null
-+++ b/tests/10ddf-assemble-missing.broken
-@@ -0,0 +1,6 @@
-+always fails
-+
-+Fails with errors:
-+
-+    ERROR: /dev/md/vol0 has unexpected state on /dev/loop10
-+    ERROR: unexpected number of online disks on /dev/loop10
-diff --git a/tests/10ddf-fail-create-race.broken b/tests/10ddf-fail-create-race.broken
-new file mode 100644
-index 00000000..6c0df023
---- /dev/null
-+++ b/tests/10ddf-fail-create-race.broken
-@@ -0,0 +1,7 @@
-+usually fails
-+
-+Fails about 9 out of 10 times with many errors:
-+
-+    mdadm: cannot open MISSING: No such file or directory
-+    ERROR: non-degraded array found
-+    ERROR: disk 0 not marked as failed in meta data
-diff --git a/tests/10ddf-fail-two-spares.broken b/tests/10ddf-fail-two-spares.broken
-new file mode 100644
-index 00000000..eeea56d9
---- /dev/null
-+++ b/tests/10ddf-fail-two-spares.broken
-@@ -0,0 +1,5 @@
-+fails infrequently
-+
-+Fails roughly 1 in 3 with error:
-+
-+   ERROR: /dev/md/vol1 should be optimal in meta data
-diff --git a/tests/10ddf-incremental-wrong-order.broken b/tests/10ddf-incremental-wrong-order.broken
-new file mode 100644
-index 00000000..a5af3bab
---- /dev/null
-+++ b/tests/10ddf-incremental-wrong-order.broken
-@@ -0,0 +1,9 @@
-+always fails
-+
-+Fails with errors:
-+    ERROR: sha1sum of /dev/md/vol0 has changed
-+    ERROR: /dev/md/vol0 has unexpected state on /dev/loop10
-+    ERROR: unexpected number of online disks on /dev/loop10
-+    ERROR: /dev/md/vol0 has unexpected state on /dev/loop8
-+    ERROR: unexpected number of online disks on /dev/loop8
-+    ERROR: sha1sum of /dev/md/vol0 has changed
-diff --git a/tests/14imsm-r1_2d-grow-r1_3d.broken b/tests/14imsm-r1_2d-grow-r1_3d.broken
-new file mode 100644
-index 00000000..4ef1d406
---- /dev/null
-+++ b/tests/14imsm-r1_2d-grow-r1_3d.broken
-@@ -0,0 +1,5 @@
-+always fails
-+
-+Fails with error:
-+
-+    mdadm/tests/func.sh: line 325: dvsize/chunk: division by 0 (error token is "chunk")
-diff --git a/tests/14imsm-r1_2d-takeover-r0_2d.broken b/tests/14imsm-r1_2d-takeover-r0_2d.broken
-new file mode 100644
-index 00000000..89cd4e57
---- /dev/null
-+++ b/tests/14imsm-r1_2d-takeover-r0_2d.broken
-@@ -0,0 +1,6 @@
-+always fails
-+
-+Fails with error:
-+
-+    tests/func.sh: line 325: dvsize/chunk: division by 0 (error token
-+		is "chunk")
-diff --git a/tests/18imsm-r10_4d-takeover-r0_2d.broken b/tests/18imsm-r10_4d-takeover-r0_2d.broken
-new file mode 100644
-index 00000000..a27399f5
---- /dev/null
-+++ b/tests/18imsm-r10_4d-takeover-r0_2d.broken
-@@ -0,0 +1,5 @@
-+fails rarely
-+
-+Fails about 1 run in 100 with message:
-+
-+   ERROR:  size is wrong for /dev/md/vol0: 2 * 5120 (chunk=128) = 20480, not 0
-diff --git a/tests/18imsm-r1_2d-takeover-r0_1d.broken b/tests/18imsm-r1_2d-takeover-r0_1d.broken
-new file mode 100644
-index 00000000..aa1982e6
---- /dev/null
-+++ b/tests/18imsm-r1_2d-takeover-r0_1d.broken
-@@ -0,0 +1,6 @@
-+always fails
-+
-+Fails with error:
-+
-+    tests/func.sh: line 325: dvsize/chunk: division by 0 (error token
-+			is "chunk")
-diff --git a/tests/19raid6auto-repair.broken b/tests/19raid6auto-repair.broken
-new file mode 100644
-index 00000000..e91a1425
---- /dev/null
-+++ b/tests/19raid6auto-repair.broken
-@@ -0,0 +1,5 @@
-+always fails
-+
-+Fails with:
-+
-+    "should detect errors"
-diff --git a/tests/19raid6repair.broken b/tests/19raid6repair.broken
-new file mode 100644
-index 00000000..e91a1425
---- /dev/null
-+++ b/tests/19raid6repair.broken
-@@ -0,0 +1,5 @@
-+always fails
-+
-+Fails with:
-+
-+    "should detect errors"
--- 
-2.38.1
-

SOURCES/0045-mdadm-Replace-obsolete-usleep-with-nanosleep.patch

@@ -1,316 +0,0 @@
-From 239b3cc0b5da87e966746533b1873c439db54b16 Mon Sep 17 00:00:00 2001
-From: Mateusz Grzonka <mateusz.grzonka@intel.com>
-Date: Fri, 12 Aug 2022 16:36:02 +0200
-Subject: [PATCH 45/83] mdadm: Replace obsolete usleep with nanosleep
-
-According to POSIX.1-2001, usleep is considered obsolete.
-Replace it with a wrapper that uses nanosleep, as recommended in man.
-Add handy macros for conversions between msec, usec and nsec.
-
-Signed-off-by: Mateusz Grzonka <mateusz.grzonka@intel.com>
-Signed-off-by: Jes Sorensen <jsorensen@fb.com>
----
- Assemble.c    |  2 +-
- Grow.c        |  4 ++--
- Manage.c      | 10 +++++-----
- managemon.c   |  8 ++++----
- mdadm.h       |  4 ++++
- mdmon.c       |  4 ++--
- super-intel.c |  6 +++---
- util.c        | 42 +++++++++++++++++++++++++++++++++---------
- 8 files changed, 54 insertions(+), 26 deletions(-)
-
-diff --git a/Assemble.c b/Assemble.c
-index 6df6bfbc..be2160b4 100644
---- a/Assemble.c
-+++ b/Assemble.c
-@@ -1947,7 +1947,7 @@ out:
- 						break;
- 					close(mdfd);
- 				}
--				usleep(usecs);
-+				sleep_for(0, USEC_TO_NSEC(usecs), true);
- 				usecs <<= 1;
- 			}
- 		}
-diff --git a/Grow.c b/Grow.c
-index 97f22c75..5780635a 100644
---- a/Grow.c
-+++ b/Grow.c
-@@ -954,7 +954,7 @@ int start_reshape(struct mdinfo *sra, int already_running,
- 			err = sysfs_set_str(sra, NULL, "sync_action",
- 					    "reshape");
- 			if (err)
--				sleep(1);
-+				sleep_for(1, 0, true);
- 		} while (err && errno == EBUSY && cnt-- > 0);
- 	}
- 	return err;
-@@ -5058,7 +5058,7 @@ int Grow_continue_command(char *devname, int fd,
- 			}
- 			st->ss->getinfo_super(st, content, NULL);
- 			if (!content->reshape_active)
--				sleep(3);
-+				sleep_for(3, 0, true);
- 			else
- 				break;
- 		} while (cnt-- > 0);
-diff --git a/Manage.c b/Manage.c
-index e5e6abe4..a142f8bd 100644
---- a/Manage.c
-+++ b/Manage.c
-@@ -244,7 +244,7 @@ int Manage_stop(char *devname, int fd, int verbose, int will_retry)
- 					    "array_state",
- 					    "inactive")) < 0 &&
- 		       errno == EBUSY) {
--			usleep(200000);
-+			sleep_for(0, MSEC_TO_NSEC(200), true);
- 			count--;
- 		}
- 		if (err) {
-@@ -328,7 +328,7 @@ int Manage_stop(char *devname, int fd, int verbose, int will_retry)
- 		       sysfs_get_ll(mdi, NULL, "sync_max", &old_sync_max) == 0) {
- 			/* must be in the critical section - wait a bit */
- 			delay -= 1;
--			usleep(100000);
-+			sleep_for(0, MSEC_TO_NSEC(100), true);
- 		}
- 
- 		if (sysfs_set_str(mdi, NULL, "sync_action", "frozen") != 0)
-@@ -405,7 +405,7 @@ int Manage_stop(char *devname, int fd, int verbose, int will_retry)
- 				 * quite started yet.  Wait a bit and
- 				 * check  'sync_action' to see.
- 				 */
--				usleep(10000);
-+				sleep_for(0, MSEC_TO_NSEC(10), true);
- 				sysfs_get_str(mdi, NULL, "sync_action", buf, sizeof(buf));
- 				if (strncmp(buf, "reshape", 7) != 0)
- 					break;
-@@ -447,7 +447,7 @@ done:
- 	count = 25; err = 0;
- 	while (count && fd >= 0 &&
- 	       (err = ioctl(fd, STOP_ARRAY, NULL)) < 0 && errno == EBUSY) {
--		usleep(200000);
-+		sleep_for(0, MSEC_TO_NSEC(200), true);
- 		count --;
- 	}
- 	if (fd >= 0 && err) {
-@@ -1105,7 +1105,7 @@ int Manage_remove(struct supertype *tst, int fd, struct mddev_dev *dv,
- 				ret = sysfs_unique_holder(devnm, rdev);
- 				if (ret < 2)
- 					break;
--				usleep(100 * 1000);	/* 100ms */
-+				sleep_for(0, MSEC_TO_NSEC(100), true);
- 			} while (--count > 0);
- 
- 			if (ret == 0) {
-diff --git a/managemon.c b/managemon.c
-index 0e9bdf00..a7bfa8f6 100644
---- a/managemon.c
-+++ b/managemon.c
-@@ -207,7 +207,7 @@ static void replace_array(struct supertype *container,
- 	remove_old();
- 	while (pending_discard) {
- 		while (discard_this == NULL)
--			sleep(1);
-+			sleep_for(1, 0, true);
- 		remove_old();
- 	}
- 	pending_discard = old;
-@@ -568,7 +568,7 @@ static void manage_member(struct mdstat_ent *mdstat,
- 		updates = NULL;
- 		while (update_queue_pending || update_queue) {
- 			check_update_queue(container);
--			usleep(15*1000);
-+			sleep_for(0, MSEC_TO_NSEC(15), true);
- 		}
- 		replace_array(container, a, newa);
- 		if (sysfs_set_str(&a->info, NULL,
-@@ -822,7 +822,7 @@ static void handle_message(struct supertype *container, struct metadata_update *
- 	if (msg->len <= 0)
- 		while (update_queue_pending || update_queue) {
- 			check_update_queue(container);
--			usleep(15*1000);
-+			sleep_for(0, MSEC_TO_NSEC(15), true);
- 		}
- 
- 	if (msg->len == 0) { /* ping_monitor */
-@@ -836,7 +836,7 @@ static void handle_message(struct supertype *container, struct metadata_update *
- 		wakeup_monitor();
- 
- 		while (monitor_loop_cnt - cnt < 0)
--			usleep(10 * 1000);
-+			sleep_for(0, MSEC_TO_NSEC(10), true);
- 	} else if (msg->len == -1) { /* ping_manager */
- 		struct mdstat_ent *mdstat = mdstat_read(1, 0);
- 
-diff --git a/mdadm.h b/mdadm.h
-index 163f4a49..add9c0b6 100644
---- a/mdadm.h
-+++ b/mdadm.h
-@@ -1720,6 +1720,10 @@ extern int cluster_get_dlmlock(void);
- extern int cluster_release_dlmlock(void);
- extern void set_dlm_hooks(void);
- 
-+#define MSEC_TO_NSEC(msec) ((msec) * 1000000)
-+#define USEC_TO_NSEC(usec) ((usec) * 1000)
-+extern void sleep_for(unsigned int sec, long nsec, bool wake_after_interrupt);
-+
- #define _ROUND_UP(val, base)	(((val) + (base) - 1) & ~(base - 1))
- #define ROUND_UP(val, base)	_ROUND_UP(val, (typeof(val))(base))
- #define ROUND_UP_PTR(ptr, base)	((typeof(ptr)) \
-diff --git a/mdmon.c b/mdmon.c
-index c057da63..e9d035eb 100644
---- a/mdmon.c
-+++ b/mdmon.c
-@@ -99,7 +99,7 @@ static int clone_monitor(struct supertype *container)
- 	if (rc)
- 		return rc;
- 	while (mon_tid == -1)
--		usleep(10);
-+		sleep_for(0, USEC_TO_NSEC(10), true);
- 	pthread_attr_destroy(&attr);
- 
- 	mgr_tid = syscall(SYS_gettid);
-@@ -209,7 +209,7 @@ static void try_kill_monitor(pid_t pid, char *devname, int sock)
- 		rv = kill(pid, SIGUSR1);
- 		if (rv < 0)
- 			break;
--		usleep(200000);
-+		sleep_for(0, MSEC_TO_NSEC(200), true);
- 	}
- }
- 
-diff --git a/super-intel.c b/super-intel.c
-index 4ddfcf94..4d82af3d 100644
---- a/super-intel.c
-+++ b/super-intel.c
-@@ -5275,7 +5275,7 @@ static int get_super_block(struct intel_super **super_list, char *devnm, char *d
- 	/* retry the load if we might have raced against mdmon */
- 	if (err == 3 && devnm && mdmon_running(devnm))
- 		for (retry = 0; retry < 3; retry++) {
--			usleep(3000);
-+			sleep_for(0, MSEC_TO_NSEC(3), true);
- 			err = load_and_parse_mpb(dfd, s, NULL, keep_fd);
- 			if (err != 3)
- 				break;
-@@ -5377,7 +5377,7 @@ static int load_super_imsm(struct supertype *st, int fd, char *devname)
- 
- 		if (mdstat && mdmon_running(mdstat->devnm) && getpid() != mdmon_pid(mdstat->devnm)) {
- 			for (retry = 0; retry < 3; retry++) {
--				usleep(3000);
-+				sleep_for(0, MSEC_TO_NSEC(3), true);
- 				rv = load_and_parse_mpb(fd, super, devname, 0);
- 				if (rv != 3)
- 					break;
-@@ -12084,7 +12084,7 @@ int wait_for_reshape_imsm(struct mdinfo *sra, int ndata)
- 				close(fd);
- 				return 1;
- 			}
--			usleep(30000);
-+			sleep_for(0, MSEC_TO_NSEC(30), true);
- 		} else
- 			break;
- 	} while (retry--);
-diff --git a/util.c b/util.c
-index 38f0420e..ca48d976 100644
---- a/util.c
-+++ b/util.c
-@@ -166,7 +166,7 @@ retry:
- 		pr_err("error %d when get PW mode on lock %s\n", errno, str);
- 		/* let's try several times if EAGAIN happened */
- 		if (dlm_lock_res->lksb.sb_status == EAGAIN && retry_count < 10) {
--			sleep(10);
-+			sleep_for(10, 0, true);
- 			retry_count++;
- 			goto retry;
- 		}
-@@ -1085,7 +1085,7 @@ int open_dev_excl(char *devnm)
- 	int i;
- 	int flags = O_RDWR;
- 	dev_t devid = devnm2devid(devnm);
--	long delay = 1000;
-+	unsigned int delay = 1; // miliseconds
- 
- 	sprintf(buf, "%d:%d", major(devid), minor(devid));
- 	for (i = 0; i < 25; i++) {
-@@ -1098,8 +1098,8 @@ int open_dev_excl(char *devnm)
- 		}
- 		if (errno != EBUSY)
- 			return fd;
--		usleep(delay);
--		if (delay < 200000)
-+		sleep_for(0, MSEC_TO_NSEC(delay), true);
-+		if (delay < 200)
- 			delay *= 2;
- 	}
- 	return -1;
-@@ -1123,7 +1123,7 @@ void wait_for(char *dev, int fd)
- {
- 	int i;
- 	struct stat stb_want;
--	long delay = 1000;
-+	unsigned int delay = 1; // miliseconds
- 
- 	if (fstat(fd, &stb_want) != 0 ||
- 	    (stb_want.st_mode & S_IFMT) != S_IFBLK)
-@@ -1135,8 +1135,8 @@ void wait_for(char *dev, int fd)
- 		    (stb.st_mode & S_IFMT) == S_IFBLK &&
- 		    (stb.st_rdev == stb_want.st_rdev))
- 			return;
--		usleep(delay);
--		if (delay < 200000)
-+		sleep_for(0, MSEC_TO_NSEC(delay), true);
-+		if (delay < 200)
- 			delay *= 2;
- 	}
- 	if (i == 25)
-@@ -1821,7 +1821,7 @@ int hot_remove_disk(int mdfd, unsigned long dev, int force)
- 	while ((ret = ioctl(mdfd, HOT_REMOVE_DISK, dev)) == -1 &&
- 	       errno == EBUSY &&
- 	       cnt-- > 0)
--		usleep(10000);
-+		sleep_for(0, MSEC_TO_NSEC(10), true);
- 
- 	return ret;
- }
-@@ -1834,7 +1834,7 @@ int sys_hot_remove_disk(int statefd, int force)
- 	while ((ret = write(statefd, "remove", 6)) == -1 &&
- 	       errno == EBUSY &&
- 	       cnt-- > 0)
--		usleep(10000);
-+		sleep_for(0, MSEC_TO_NSEC(10), true);
- 	return ret == 6 ? 0 : -1;
- }
- 
-@@ -2375,3 +2375,27 @@ out:
- 	close(fd_zero);
- 	return ret;
- }
-+
-+/**
-+ * sleep_for() - Sleeps for specified time.
-+ * @sec: Seconds to sleep for.
-+ * @nsec: Nanoseconds to sleep for, has to be less than one second.
-+ * @wake_after_interrupt: If set, wake up if interrupted.
-+ *
-+ * Function immediately returns if error different than EINTR occurs.
-+ */
-+void sleep_for(unsigned int sec, long nsec, bool wake_after_interrupt)
-+{
-+	struct timespec delay = {.tv_sec = sec, .tv_nsec = nsec};
-+
-+	assert(nsec < MSEC_TO_NSEC(1000));
-+
-+	do {
-+		errno = 0;
-+		nanosleep(&delay, &delay);
-+		if (errno != 0 && errno != EINTR) {
-+			pr_err("Error sleeping for %us %ldns: %s\n", sec, nsec, strerror(errno));
-+			return;
-+		}
-+	} while (!wake_after_interrupt && errno == EINTR);
-+}
--- 
-2.38.1
-

SOURCES/0046-tests-00readonly-Run-udevadm-settle-before-setting-r.patch

@@ -1,36 +0,0 @@
-From 39b381252c32275079344d30de18b76fda4bba26 Mon Sep 17 00:00:00 2001
-From: Logan Gunthorpe <logang@deltatee.com>
-Date: Wed, 27 Jul 2022 15:52:45 -0600
-Subject: [PATCH 46/83] tests/00readonly: Run udevadm settle before setting ro
-
-In some recent kernel versions, 00readonly fails with:
-
-  mdadm: failed to set readonly for /dev/md0: Device or resource busy
-  ERROR: array is not read-only!
-
-This was traced down to a race condition with udev holding a reference
-to the block device at the same time as trying to set it read only.
-
-To fix this, call udevadm settle before setting the array read only.
-
-Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
-Signed-off-by: Jes Sorensen <jsorensen@fb.com>
----
- tests/00readonly | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/tests/00readonly b/tests/00readonly
-index 39202487..afe243b3 100644
---- a/tests/00readonly
-+++ b/tests/00readonly
-@@ -12,6 +12,7 @@ do
- 			$dev1 $dev2 $dev3 $dev4 --assume-clean
- 		check nosync
- 		check $level
-+		udevadm settle
- 		mdadm -ro $md0
- 		check readonly
- 		state=$(cat /sys/block/md0/md/array_state)
--- 
-2.38.1
-

SOURCES/0047-tests-add-test-for-names.patch

@@ -1,119 +0,0 @@
-From b7671c82010ffc04dfaecff2dd19ef8b2283e2b6 Mon Sep 17 00:00:00 2001
-From: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
-Date: Tue, 19 Jul 2022 14:48:21 +0200
-Subject: [PATCH 47/83] tests: add test for names
-
-Current behavior is not documented and tested. This test is a base for
-future improvements. It is enough to test it only with native metadata,
-because it is generic code. Generated properties are passed to metadata
-handler.
-
-Signed-off-by: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
-Signed-off-by: Jes Sorensen <jsorensen@fb.com>
----
- tests/00createnames | 93 +++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 93 insertions(+)
- create mode 100644 tests/00createnames
-
-diff --git a/tests/00createnames b/tests/00createnames
-new file mode 100644
-index 00000000..64b81b92
---- /dev/null
-+++ b/tests/00createnames
-@@ -0,0 +1,93 @@
-+set -x -e
-+
-+# Test how <devname> and --name= are handled for create mode.
-+# We need to check three properties, generated from those parameters:
-+# - devnode name
-+# - link in /dev/md/ (MD_DEVNAME property from --detail --export)
-+# - name in metadata (MD_NAME property from --examine --export)
-+
-+function _verify() {
-+  local DEVNODE_NAME="$1"
-+  local WANTED_LINK="$2"
-+  local WANTED_NAME="$3"
-+
-+  local RES="$(mdadm -D --export $DEVNODE_NAME | grep MD_DEVNAME)"
-+  if [[ "$?" != "0" ]]; then
-+    echo "Cannot get details for $DEVNODE_NAME - unexpected devnode."
-+    exit 1
-+  fi
-+
-+  if [[ "$WANTED_LINK" != "empty" ]]; then
-+    local EXPECTED="MD_DEVNAME=$WANTED_LINK"
-+      if [[ "$RES" != "$EXPECTED" ]]; then
-+        echo "$RES doesn't match $EXPECTED."
-+        exit 1
-+      fi
-+  fi
-+
-+
-+  local RES="$(mdadm -E --export $dev0 | grep MD_NAME)"
-+  if [[ "$?" != "0" ]]; then
-+    echo "Cannot get metadata from $dev0."
-+    exit 1
-+  fi
-+
-+  local EXPECTED="MD_NAME=$(hostname):$WANTED_NAME"
-+  if [[ "$RES" != "$EXPECTED" ]]; then
-+    echo "$RES doesn't match $EXPECTED."
-+    exit 1
-+  fi
-+}
-+
-+function _create() {
-+  local DEVNAME=$1
-+  local NAME=$2
-+
-+  if [[ -z "$NAME" ]]; then
-+    mdadm -CR "$DEVNAME" -l0 -n 1 $dev0 --force
-+  else
-+    mdadm -CR "$DEVNAME" --name="$NAME" -l0 -n 1 $dev0 --force
-+  fi
-+
-+  if [[ "$?" != "0" ]]; then
-+    echo "Cannot create device."
-+    exit 1
-+  fi
-+}
-+
-+# The most trivial case.
-+_create "/dev/md/name"
-+_verify "/dev/md127" "name" "name"
-+mdadm -S "/dev/md127"
-+
-+_create "name"
-+_verify "/dev/md127" "name" "name"
-+mdadm -S "/dev/md127"
-+
-+# Use 'mdX' as name.
-+_create "/dev/md/md0"
-+_verify "/dev/md127" "md0" "md0"
-+mdadm -S "/dev/md127"
-+
-+_create "md0"
-+_verify "/dev/md127" "md0" "md0"
-+mdadm -S "/dev/md127"
-+
-+# <devnode> is used to create MD_DEVNAME but, name is used to create MD_NAME.
-+_create "/dev/md/devnode" "name"
-+_verify "/dev/md127" "devnode" "name"
-+mdadm -S "/dev/md127"
-+
-+_create "devnode" "name"
-+_verify "/dev/md127" "devnode" "name"
-+mdadm -S "/dev/md127"
-+
-+# Devnode points to /dev/ directory. MD_DEVNAME doesn't exist.
-+_create "/dev/md0"
-+_verify "/dev/md0" "empty" "0"
-+mdadm -S "/dev/md0"
-+
-+# Devnode points to /dev/ directory and name is set.
-+_create "/dev/md0" "name"
-+_verify "/dev/md0" "empty" "name"
-+mdadm -S "/dev/md0"
--- 
-2.38.1
-

SOURCES/0048-mdadm-remove-symlink-option.patch

@@ -1,176 +0,0 @@
-From e4a030a0d3a953b8e74c118200e58dc83c2fc608 Mon Sep 17 00:00:00 2001
-From: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
-Date: Tue, 19 Jul 2022 14:48:22 +0200
-Subject: [PATCH 48/83] mdadm: remove symlink option
-
-The option is not used. Remove it from code.
-
-Signed-off-by: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
-Signed-off-by: Jes Sorensen <jsorensen@fb.com>
----
- ReadMe.c        |  1 -
- config.c        |  7 +------
- mdadm.8.in      |  9 ---------
- mdadm.c         | 20 --------------------
- mdadm.conf.5.in | 15 ---------------
- mdadm.h         |  2 --
- 6 files changed, 1 insertion(+), 53 deletions(-)
-
-diff --git a/ReadMe.c b/ReadMe.c
-index 7518a32a..7f94847e 100644
---- a/ReadMe.c
-+++ b/ReadMe.c
-@@ -147,7 +147,6 @@ struct option long_options[] = {
-     {"nofailfast",0, 0,  NoFailFast},
-     {"re-add",    0, 0,  ReAdd},
-     {"homehost",  1, 0,  HomeHost},
--    {"symlinks",  1, 0,  Symlinks},
-     {"data-offset",1, 0, DataOffset},
-     {"nodes",1, 0, Nodes}, /* also for --assemble */
-     {"home-cluster",1, 0, ClusterName},
-diff --git a/config.c b/config.c
-index 9c725457..dc1620c1 100644
---- a/config.c
-+++ b/config.c
-@@ -194,7 +194,6 @@ struct mddev_dev *load_containers(void)
- 
- struct createinfo createinfo = {
- 	.autof = 2, /* by default, create devices with standard names */
--	.symlinks = 1,
- 	.names = 0, /* By default, stick with numbered md devices. */
- 	.bblist = 1, /* Use a bad block list by default */
- #ifdef DEBIAN
-@@ -310,11 +309,7 @@ static void createline(char *line)
- 			if (!createinfo.supertype)
- 				pr_err("metadata format %s unknown, ignoring\n",
- 					w+9);
--		} else if (strncasecmp(w, "symlinks=yes", 12) == 0)
--			createinfo.symlinks = 1;
--		else if  (strncasecmp(w, "symlinks=no", 11) == 0)
--			createinfo.symlinks = 0;
--		else if (strncasecmp(w, "names=yes", 12) == 0)
-+		} else if (strncasecmp(w, "names=yes", 12) == 0)
- 			createinfo.names = 1;
- 		else if  (strncasecmp(w, "names=no", 11) == 0)
- 			createinfo.names = 0;
-diff --git a/mdadm.8.in b/mdadm.8.in
-index 0be02e4a..f2736226 100644
---- a/mdadm.8.in
-+++ b/mdadm.8.in
-@@ -1048,11 +1048,6 @@ simultaneously. If not specified, this defaults to 4.
- Specify journal device for the RAID-4/5/6 array. The journal device
- should be a SSD with reasonable lifetime.
- 
--.TP
--.BR \-\-symlinks
--Auto creation of symlinks in /dev to /dev/md, option --symlinks must
--be 'no' or 'yes' and work with --create and --build.
--
- .TP
- .BR \-k ", " \-\-consistency\-policy=
- Specify how the array maintains consistency in case of unexpected shutdown.
-@@ -1405,10 +1400,6 @@ Reshape can be continued later using the
- .B \-\-continue
- option for the grow command.
- 
--.TP
--.BR \-\-symlinks
--See this option under Create and Build options.
--
- .SH For Manage mode:
- 
- .TP
-diff --git a/mdadm.c b/mdadm.c
-index 56722ed9..180f7a9c 100644
---- a/mdadm.c
-+++ b/mdadm.c
-@@ -59,7 +59,6 @@ int main(int argc, char *argv[])
- 	struct mddev_dev *dv;
- 	mdu_array_info_t array;
- 	int devs_found = 0;
--	char *symlinks = NULL;
- 	int grow_continue = 0;
- 	/* autof indicates whether and how to create device node.
- 	 * bottom 3 bits are style.  Rest (when shifted) are number of parts
-@@ -663,13 +662,6 @@ int main(int argc, char *argv[])
- 		case O(ASSEMBLE,Auto): /* auto-creation of device node */
- 			c.autof = parse_auto(optarg, "--auto flag", 0);
- 			continue;
--
--		case O(CREATE,Symlinks):
--		case O(BUILD,Symlinks):
--		case O(ASSEMBLE,Symlinks): /* auto creation of symlinks in /dev to /dev/md */
--			symlinks = optarg;
--			continue;
--
- 		case O(BUILD,'f'): /* force honouring '-n 1' */
- 		case O(BUILD,Force): /* force honouring '-n 1' */
- 		case O(GROW,'f'): /* ditto */
-@@ -1325,18 +1317,6 @@ int main(int argc, char *argv[])
- 		exit(2);
- 	}
- 
--	if (symlinks) {
--		struct createinfo *ci = conf_get_create_info();
--
--		if (strcasecmp(symlinks, "yes") == 0)
--			ci->symlinks = 1;
--		else if (strcasecmp(symlinks, "no") == 0)
--			ci->symlinks = 0;
--		else {
--			pr_err("option --symlinks must be 'no' or 'yes'\n");
--			exit(2);
--		}
--	}
- 	/* Ok, got the option parsing out of the way
- 	 * hopefully it's mostly right but there might be some stuff
- 	 * missing
-diff --git a/mdadm.conf.5.in b/mdadm.conf.5.in
-index cd4e6a9d..bc2295c2 100644
---- a/mdadm.conf.5.in
-+++ b/mdadm.conf.5.in
-@@ -338,21 +338,6 @@ missing device entries should be created.
- The name of the metadata format to use if none is explicitly given.
- This can be useful to impose a system-wide default of version-1 superblocks.
- 
--.TP
--.B symlinks=no
--Normally when creating devices in
--.B /dev/md/
--.I mdadm
--will create a matching symlink from
--.B /dev/
--with a name starting
--.B md
--or
--.BR md_ .
--Give
--.B symlinks=no
--to suppress this symlink creation.
--
- .TP
- .B names=yes
- Since Linux 2.6.29 it has been possible to create
-diff --git a/mdadm.h b/mdadm.h
-index add9c0b6..93e72786 100644
---- a/mdadm.h
-+++ b/mdadm.h
-@@ -394,7 +394,6 @@ struct createinfo {
- 	int	gid;
- 	int	autof;
- 	int	mode;
--	int	symlinks;
- 	int	names;
- 	int	bblist;
- 	struct supertype *supertype;
-@@ -442,7 +441,6 @@ enum special_options {
- 	BackupFile,
- 	HomeHost,
- 	AutoHomeHost,
--	Symlinks,
- 	AutoDetect,
- 	Waitclean,
- 	DetailPlatform,
--- 
-2.38.1
-

SOURCES/0049-mdadm-move-data_offset-to-struct-shape.patch

@@ -1,232 +0,0 @@
-From ae5dfc56b7a96805d5a0b50eaf93b9fec8604298 Mon Sep 17 00:00:00 2001
-From: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
-Date: Tue, 19 Jul 2022 14:48:23 +0200
-Subject: [PATCH 49/83] mdadm: move data_offset to struct shape
-
-Data offset is a shape property so move it there to remove additional
-parameter from some functions.
-
-Signed-off-by: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
-Signed-off-by: Jes Sorensen <jsorensen@fb.com>
----
- Create.c | 16 ++++++++--------
- Grow.c   |  7 +++----
- mdadm.c  | 20 +++++++++-----------
- mdadm.h  |  5 ++---
- 4 files changed, 22 insertions(+), 26 deletions(-)
-
-diff --git a/Create.c b/Create.c
-index c84c1ac8..e06ec2ae 100644
---- a/Create.c
-+++ b/Create.c
-@@ -95,7 +95,7 @@ int Create(struct supertype *st, char *mddev,
- 	   char *name, int *uuid,
- 	   int subdevs, struct mddev_dev *devlist,
- 	   struct shape *s,
--	   struct context *c, unsigned long long data_offset)
-+	   struct context *c)
- {
- 	/*
- 	 * Create a new raid array.
-@@ -288,7 +288,7 @@ int Create(struct supertype *st, char *mddev,
- 	newsize = s->size * 2;
- 	if (st && ! st->ss->validate_geometry(st, s->level, s->layout, s->raiddisks,
- 					      &s->chunk, s->size*2,
--					      data_offset, NULL,
-+					      s->data_offset, NULL,
- 					      &newsize, s->consistency_policy,
- 					      c->verbose >= 0))
- 		return 1;
-@@ -323,10 +323,10 @@ int Create(struct supertype *st, char *mddev,
- 	info.array.working_disks = 0;
- 	dnum = 0;
- 	for (dv = devlist; dv; dv = dv->next)
--		if (data_offset == VARIABLE_OFFSET)
-+		if (s->data_offset == VARIABLE_OFFSET)
- 			dv->data_offset = INVALID_SECTORS;
- 		else
--			dv->data_offset = data_offset;
-+			dv->data_offset = s->data_offset;
- 
- 	for (dv=devlist; dv && !have_container; dv=dv->next, dnum++) {
- 		char *dname = dv->devname;
-@@ -342,7 +342,7 @@ int Create(struct supertype *st, char *mddev,
- 			missing_disks ++;
- 			continue;
- 		}
--		if (data_offset == VARIABLE_OFFSET) {
-+		if (s->data_offset == VARIABLE_OFFSET) {
- 			doff = strchr(dname, ':');
- 			if (doff) {
- 				*doff++ = 0;
-@@ -350,7 +350,7 @@ int Create(struct supertype *st, char *mddev,
- 			} else
- 				dv->data_offset = INVALID_SECTORS;
- 		} else
--			dv->data_offset = data_offset;
-+			dv->data_offset = s->data_offset;
- 
- 		dfd = open(dname, O_RDONLY);
- 		if (dfd < 0) {
-@@ -535,7 +535,7 @@ int Create(struct supertype *st, char *mddev,
- 			if (!st->ss->validate_geometry(st, s->level, s->layout,
- 						       s->raiddisks,
- 						       &s->chunk, minsize*2,
--						       data_offset,
-+						       s->data_offset,
- 						       NULL, NULL,
- 						       s->consistency_policy, 0)) {
- 				pr_err("devices too large for RAID level %d\n", s->level);
-@@ -754,7 +754,7 @@ int Create(struct supertype *st, char *mddev,
- 		}
- 	}
- 	if (!st->ss->init_super(st, &info.array, s, name, c->homehost, uuid,
--				data_offset))
-+				s->data_offset))
- 		goto abort_locked;
- 
- 	total_slots = info.array.nr_disks;
-diff --git a/Grow.c b/Grow.c
-index 5780635a..868bdc3a 100644
---- a/Grow.c
-+++ b/Grow.c
-@@ -1775,7 +1775,6 @@ static int reshape_container(char *container, char *devname,
- 
- int Grow_reshape(char *devname, int fd,
- 		 struct mddev_dev *devlist,
--		 unsigned long long data_offset,
- 		 struct context *c, struct shape *s)
- {
- 	/* Make some changes in the shape of an array.
-@@ -1821,7 +1820,7 @@ int Grow_reshape(char *devname, int fd,
- 		return 1;
- 	}
- 
--	if (data_offset != INVALID_SECTORS && array.level != 10 &&
-+	if (s->data_offset != INVALID_SECTORS && array.level != 10 &&
- 	    (array.level < 4 || array.level > 6)) {
- 		pr_err("--grow --data-offset not yet supported\n");
- 		return 1;
-@@ -2179,7 +2178,7 @@ size_change_error:
- 	if ((s->level == UnSet || s->level == array.level) &&
- 	    (s->layout_str == NULL) &&
- 	    (s->chunk == 0 || s->chunk == array.chunk_size) &&
--	    data_offset == INVALID_SECTORS &&
-+	    s->data_offset == INVALID_SECTORS &&
- 	    (s->raiddisks == 0 || s->raiddisks == array.raid_disks)) {
- 		/* Nothing more to do */
- 		if (!changed && c->verbose >= 0)
-@@ -2379,7 +2378,7 @@ size_change_error:
- 		}
- 		sync_metadata(st);
- 		rv = reshape_array(container, fd, devname, st, &info, c->force,
--				   devlist, data_offset, c->backup_file,
-+				   devlist, s->data_offset, c->backup_file,
- 				   c->verbose, 0, 0, 0);
- 		frozen = 0;
- 	}
-diff --git a/mdadm.c b/mdadm.c
-index 180f7a9c..845e4466 100644
---- a/mdadm.c
-+++ b/mdadm.c
-@@ -49,7 +49,6 @@ int main(int argc, char *argv[])
- 	int i;
- 
- 	unsigned long long array_size = 0;
--	unsigned long long data_offset = INVALID_SECTORS;
- 	struct mddev_ident ident;
- 	char *configfile = NULL;
- 	int devmode = 0;
-@@ -79,6 +78,7 @@ int main(int argc, char *argv[])
- 		.layout		= UnSet,
- 		.bitmap_chunk	= UnSet,
- 		.consistency_policy	= CONSISTENCY_POLICY_UNKNOWN,
-+		.data_offset = INVALID_SECTORS,
- 	};
- 
- 	char sys_hostname[256];
-@@ -479,15 +479,15 @@ int main(int argc, char *argv[])
- 
- 		case O(CREATE,DataOffset):
- 		case O(GROW,DataOffset):
--			if (data_offset != INVALID_SECTORS) {
-+			if (s.data_offset != INVALID_SECTORS) {
- 				pr_err("data-offset may only be specified one. Second value is %s.\n", optarg);
- 				exit(2);
- 			}
- 			if (mode == CREATE && strcmp(optarg, "variable") == 0)
--				data_offset = VARIABLE_OFFSET;
-+				s.data_offset = VARIABLE_OFFSET;
- 			else
--				data_offset = parse_size(optarg);
--			if (data_offset == INVALID_SECTORS) {
-+				s.data_offset = parse_size(optarg);
-+			if (s.data_offset == INVALID_SECTORS) {
- 				pr_err("invalid data-offset: %s\n",
- 					optarg);
- 				exit(2);
-@@ -1416,7 +1416,7 @@ int main(int argc, char *argv[])
- 		exit(1);
- 	}
- 
--	if (c.backup_file && data_offset != INVALID_SECTORS) {
-+	if (c.backup_file && s.data_offset != INVALID_SECTORS) {
- 		pr_err("--backup-file and --data-offset are incompatible\n");
- 		exit(2);
- 	}
-@@ -1587,8 +1587,7 @@ int main(int argc, char *argv[])
- 
- 		rv = Create(ss, devlist->devname,
- 			    ident.name, ident.uuid_set ? ident.uuid : NULL,
--			    devs_found-1, devlist->next,
--			    &s, &c, data_offset);
-+			    devs_found - 1, devlist->next, &s, &c);
- 		break;
- 	case MISC:
- 		if (devmode == 'E') {
-@@ -1706,10 +1705,9 @@ int main(int argc, char *argv[])
- 						   c.verbose);
- 		else if (s.size > 0 || s.raiddisks || s.layout_str ||
- 			 s.chunk != 0 || s.level != UnSet ||
--			 data_offset != INVALID_SECTORS) {
-+			 s.data_offset != INVALID_SECTORS) {
- 			rv = Grow_reshape(devlist->devname, mdfd,
--					  devlist->next,
--					  data_offset, &c, &s);
-+					  devlist->next, &c, &s);
- 		} else if (s.consistency_policy != CONSISTENCY_POLICY_UNKNOWN) {
- 			rv = Grow_consistency_policy(devlist->devname, mdfd, &c, &s);
- 		} else if (array_size == 0)
-diff --git a/mdadm.h b/mdadm.h
-index 93e72786..adb7cdaa 100644
---- a/mdadm.h
-+++ b/mdadm.h
-@@ -595,6 +595,7 @@ struct shape {
- 	int	assume_clean;
- 	int	write_behind;
- 	unsigned long long size;
-+	unsigned long long data_offset;
- 	int	consistency_policy;
- };
- 
-@@ -1431,7 +1432,6 @@ extern int Grow_addbitmap(char *devname, int fd,
- 			  struct context *c, struct shape *s);
- extern int Grow_reshape(char *devname, int fd,
- 			struct mddev_dev *devlist,
--			unsigned long long data_offset,
- 			struct context *c, struct shape *s);
- extern int Grow_restart(struct supertype *st, struct mdinfo *info,
- 			int *fdlist, int cnt, char *backup_file, int verbose);
-@@ -1462,8 +1462,7 @@ extern int Create(struct supertype *st, char *mddev,
- 		  char *name, int *uuid,
- 		  int subdevs, struct mddev_dev *devlist,
- 		  struct shape *s,
--		  struct context *c,
--		  unsigned long long data_offset);
-+		  struct context *c);
- 
- extern int Detail(char *dev, struct context *c);
- extern int Detail_Platform(struct superswitch *ss, int scan, int verbose, int export, char *controller_path);
--- 
-2.38.1
-

SOURCES/0050-mdadm-Don-t-open-md-device-for-CREATE-and-ASSEMBLE.patch

@@ -1,162 +0,0 @@
-From 27ad4900501c615b7c6b266bf23948e5606dba53 Mon Sep 17 00:00:00 2001
-From: Logan Gunthorpe <logang@deltatee.com>
-Date: Wed, 27 Jul 2022 15:52:46 -0600
-Subject: [PATCH 50/83] mdadm: Don't open md device for CREATE and ASSEMBLE
-
-The mdadm command tries to open the md device for most modes, first
-thing, no matter what. When running to create or assemble an array,
-in most cases, the md device will not exist, the open call will fail
-and everything will proceed correctly.
-
-However, when running tests, a create or assembly command may be run
-shortly after stopping an array and the old md device file may still
-be around. Then, if create_on_open is set in the kernel, a new md
-device will be created when mdadm does its initial open.
-
-When mdadm gets around to creating the new device with the new_array
-parameter it issues this error:
-
-   mdadm: Fail to create md0 when using
-   /sys/module/md_mod/parameters/new_array, fallback to creation via node
-
-This is because an mddev was already created by the kernel with the
-earlier open() call and thus the new one being created will fail with
-EEXIST. The mdadm command will still successfully be created due to
-falling back to the node creation method. However, the error message
-itself will fail any test that's running it.
-
-This issue is a race condition that is very rare, but a recent change
-in the kernel caused this to happen more frequently: about 1 in 50
-times.
-
-To fix this, don't bother trying to open the md device for CREATE,
-ASSEMBLE and BUILD commands, as the file descriptor will never be used
-anyway even if it is successfully openned. The mdfd has not been used
-for these commands since:
-
-   7f91af49ad09 ("Delay creation of array devices for assemble/build/create")
-
-The checks that were done on the open device can be changed to being
-done with stat.
-
-Side note: it would be nice to disable create_on_open as well to help
-solve this, but it seems the work for this was never finished. By default,
-mdadm will create using the old node interface when a name is specified
-unless the user specifically puts names=yes in a config file, which
-doesn't seem to be common or desirable to require this..
-
-Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
-Signed-off-by: Jes Sorensen <jsorensen@fb.com>
----
- lib.c   | 12 ++++++++++++
- mdadm.c | 40 ++++++++++++++++++++--------------------
- mdadm.h |  1 +
- 3 files changed, 33 insertions(+), 20 deletions(-)
-
-diff --git a/lib.c b/lib.c
-index 7e3e3d47..e395b28d 100644
---- a/lib.c
-+++ b/lib.c
-@@ -164,6 +164,18 @@ char *stat2devnm(struct stat *st)
- 	return devid2devnm(st->st_rdev);
- }
- 
-+bool stat_is_md_dev(struct stat *st)
-+{
-+	if ((S_IFMT & st->st_mode) != S_IFBLK)
-+		return false;
-+	if (major(st->st_rdev) == MD_MAJOR)
-+		return true;
-+	if (major(st->st_rdev) == (unsigned)get_mdp_major())
-+		return true;
-+
-+	return false;
-+}
-+
- char *fd2devnm(int fd)
- {
- 	struct stat stb;
-diff --git a/mdadm.c b/mdadm.c
-index 845e4466..972adb52 100644
---- a/mdadm.c
-+++ b/mdadm.c
-@@ -1329,6 +1329,9 @@ int main(int argc, char *argv[])
- 
- 	if (mode == MANAGE || mode == BUILD || mode == CREATE ||
- 	    mode == GROW || (mode == ASSEMBLE && ! c.scan)) {
-+		struct stat stb;
-+		int ret;
-+
- 		if (devs_found < 1) {
- 			pr_err("an md device must be given in this mode\n");
- 			exit(2);
-@@ -1341,6 +1344,12 @@ int main(int argc, char *argv[])
- 			mdfd = open_mddev(devlist->devname, 1);
- 			if (mdfd < 0)
- 				exit(1);
-+
-+			ret = fstat(mdfd, &stb);
-+			if (ret) {
-+				pr_err("fstat failed on %s.\n", devlist->devname);
-+				exit(1);
-+			}
- 		} else {
- 			char *bname = basename(devlist->devname);
- 
-@@ -1348,30 +1357,21 @@ int main(int argc, char *argv[])
- 				pr_err("Name %s is too long.\n", devlist->devname);
- 				exit(1);
- 			}
--			/* non-existent device is OK */
--			mdfd = open_mddev(devlist->devname, 0);
--		}
--		if (mdfd == -2) {
--			pr_err("device %s exists but is not an md array.\n", devlist->devname);
--			exit(1);
--		}
--		if ((int)ident.super_minor == -2) {
--			struct stat stb;
--			if (mdfd < 0) {
-+
-+			ret = stat(devlist->devname, &stb);
-+			if (ident.super_minor == -2 && ret != 0) {
- 				pr_err("--super-minor=dev given, and listed device %s doesn't exist.\n",
--					devlist->devname);
-+				       devlist->devname);
-+				exit(1);
-+			}
-+
-+			if (!ret && !stat_is_md_dev(&stb)) {
-+				pr_err("device %s exists but is not an md array.\n", devlist->devname);
- 				exit(1);
- 			}
--			fstat(mdfd, &stb);
--			ident.super_minor = minor(stb.st_rdev);
--		}
--		if (mdfd >= 0 && mode != MANAGE && mode != GROW) {
--			/* We don't really want this open yet, we just might
--			 * have wanted to check some things
--			 */
--			close(mdfd);
--			mdfd = -1;
- 		}
-+		if (ident.super_minor == -2)
-+			ident.super_minor = minor(stb.st_rdev);
- 	}
- 
- 	if (s.raiddisks) {
-diff --git a/mdadm.h b/mdadm.h
-index adb7cdaa..8208b81e 100644
---- a/mdadm.h
-+++ b/mdadm.h
-@@ -1672,6 +1672,7 @@ void *super1_make_v0(struct supertype *st, struct mdinfo *info, mdp_super_t *sb0
- extern char *stat2kname(struct stat *st);
- extern char *fd2kname(int fd);
- extern char *stat2devnm(struct stat *st);
-+bool stat_is_md_dev(struct stat *st);
- extern char *fd2devnm(int fd);
- extern void udev_block(char *devnm);
- extern void udev_unblock(void);
--- 
-2.38.1
-

SOURCES/0051-Grow-Split-Grow_reshape-into-helper-function.patch

@@ -1,231 +0,0 @@
-From 7211116c295ba1f9e1fcbdc2dd2d3762855062e1 Mon Sep 17 00:00:00 2001
-From: Mateusz Kusiak <mateusz.kusiak@intel.com>
-Date: Thu, 28 Jul 2022 20:20:53 +0800
-Subject: [PATCH 51/83] Grow: Split Grow_reshape into helper function
-
-Grow_reshape should be split into helper functions given its size.
-- Add helper function for preparing reshape on external metadata.
-- Close cfd file descriptor.
-
-Signed-off-by: Mateusz Kusiak <mateusz.kusiak@intel.com>
-Acked-by: Coly Li <colyli@suse.de>
-Signed-off-by: Jes Sorensen <jsorensen@fb.com>
----
- Grow.c  | 125 ++++++++++++++++++++++++++++++--------------------------
- mdadm.h |   1 +
- util.c  |  14 +++++++
- 3 files changed, 81 insertions(+), 59 deletions(-)
-
-diff --git a/Grow.c b/Grow.c
-index 868bdc3a..0f07a894 100644
---- a/Grow.c
-+++ b/Grow.c
-@@ -1773,6 +1773,65 @@ static int reshape_container(char *container, char *devname,
- 			     char *backup_file, int verbose,
- 			     int forked, int restart, int freeze_reshape);
- 
-+/**
-+ * prepare_external_reshape() - prepares update on external metadata if supported.
-+ * @devname: Device name.
-+ * @subarray: Subarray.
-+ * @st: Supertype.
-+ * @container: Container.
-+ * @cfd: Container file descriptor.
-+ *
-+ * Function checks that the requested reshape is supported on external metadata,
-+ * and performs an initial check that the container holds the pre-requisite
-+ * spare devices (mdmon owns final validation).
-+ *
-+ * Return: 0 on success, else 1
-+ */
-+static int prepare_external_reshape(char *devname, char *subarray,
-+				    struct supertype *st, char *container,
-+				    const int cfd)
-+{
-+	struct mdinfo *cc = NULL;
-+	struct mdinfo *content = NULL;
-+
-+	if (st->ss->load_container(st, cfd, NULL)) {
-+		pr_err("Cannot read superblock for %s\n", devname);
-+		return 1;
-+	}
-+
-+	if (!st->ss->container_content)
-+		return 1;
-+
-+	cc = st->ss->container_content(st, subarray);
-+	for (content = cc; content ; content = content->next) {
-+		/*
-+		 * check if reshape is allowed based on metadata
-+		 * indications stored in content.array.status
-+		 */
-+		if (is_bit_set(&content->array.state, MD_SB_BLOCK_VOLUME) ||
-+		    is_bit_set(&content->array.state, MD_SB_BLOCK_CONTAINER_RESHAPE)) {
-+			pr_err("Cannot reshape arrays in container with unsupported metadata: %s(%s)\n",
-+			       devname, container);
-+			goto error;
-+		}
-+		if (content->consistency_policy == CONSISTENCY_POLICY_PPL) {
-+			pr_err("Operation not supported when ppl consistency policy is enabled\n");
-+			goto error;
-+		}
-+		if (content->consistency_policy == CONSISTENCY_POLICY_BITMAP) {
-+			pr_err("Operation not supported when write-intent bitmap consistency policy is enabled\n");
-+			goto error;
-+		}
-+	}
-+	sysfs_free(cc);
-+	if (mdmon_running(container))
-+		st->update_tail = &st->updates;
-+	return 0;
-+error:
-+	sysfs_free(cc);
-+	return 1;
-+}
-+
- int Grow_reshape(char *devname, int fd,
- 		 struct mddev_dev *devlist,
- 		 struct context *c, struct shape *s)
-@@ -1799,7 +1858,7 @@ int Grow_reshape(char *devname, int fd,
- 	struct supertype *st;
- 	char *subarray = NULL;
- 
--	int frozen;
-+	int frozen = 0;
- 	int changed = 0;
- 	char *container = NULL;
- 	int cfd = -1;
-@@ -1808,7 +1867,7 @@ int Grow_reshape(char *devname, int fd,
- 	int added_disks;
- 
- 	struct mdinfo info;
--	struct mdinfo *sra;
-+	struct mdinfo *sra = NULL;
- 
- 	if (md_get_array_info(fd, &array) < 0) {
- 		pr_err("%s is not an active md array - aborting\n",
-@@ -1865,13 +1924,7 @@ int Grow_reshape(char *devname, int fd,
- 		}
- 	}
- 
--	/* in the external case we need to check that the requested reshape is
--	 * supported, and perform an initial check that the container holds the
--	 * pre-requisite spare devices (mdmon owns final validation)
--	 */
- 	if (st->ss->external) {
--		int retval;
--
- 		if (subarray) {
- 			container = st->container_devnm;
- 			cfd = open_dev_excl(st->container_devnm);
-@@ -1887,13 +1940,12 @@ int Grow_reshape(char *devname, int fd,
- 			return 1;
- 		}
- 
--		retval = st->ss->load_container(st, cfd, NULL);
--
--		if (retval) {
--			pr_err("Cannot read superblock for %s\n", devname);
--			close(cfd);
-+		rv = prepare_external_reshape(devname, subarray, st,
-+					      container, cfd);
-+		if (rv > 0) {
- 			free(subarray);
--			return 1;
-+			close(cfd);
-+			goto release;
- 		}
- 
- 		if (s->raiddisks && subarray) {
-@@ -1902,51 +1954,6 @@ int Grow_reshape(char *devname, int fd,
- 			free(subarray);
- 			return 1;
- 		}
--
--		/* check if operation is supported for metadata handler */
--		if (st->ss->container_content) {
--			struct mdinfo *cc = NULL;
--			struct mdinfo *content = NULL;
--
--			cc = st->ss->container_content(st, subarray);
--			for (content = cc; content ; content = content->next) {
--				int allow_reshape = 1;
--
--				/* check if reshape is allowed based on metadata
--				 * indications stored in content.array.status
--				 */
--				if (content->array.state &
--				    (1 << MD_SB_BLOCK_VOLUME))
--					allow_reshape = 0;
--				if (content->array.state &
--				    (1 << MD_SB_BLOCK_CONTAINER_RESHAPE))
--					allow_reshape = 0;
--				if (!allow_reshape) {
--					pr_err("cannot reshape arrays in container with unsupported metadata: %s(%s)\n",
--					       devname, container);
--					sysfs_free(cc);
--					free(subarray);
--					return 1;
--				}
--				if (content->consistency_policy ==
--				    CONSISTENCY_POLICY_PPL) {
--					pr_err("Operation not supported when ppl consistency policy is enabled\n");
--					sysfs_free(cc);
--					free(subarray);
--					return 1;
--				}
--				if (content->consistency_policy ==
--				    CONSISTENCY_POLICY_BITMAP) {
--					pr_err("Operation not supported when write-intent bitmap is enabled\n");
--					sysfs_free(cc);
--					free(subarray);
--					return 1;
--				}
--			}
--			sysfs_free(cc);
--		}
--		if (mdmon_running(container))
--			st->update_tail = &st->updates;
- 	}
- 
- 	added_disks = 0;
-diff --git a/mdadm.h b/mdadm.h
-index 8208b81e..941a5f38 100644
---- a/mdadm.h
-+++ b/mdadm.h
-@@ -1539,6 +1539,7 @@ extern int stat_is_blkdev(char *devname, dev_t *rdev);
- extern bool is_dev_alive(char *path);
- extern int get_mdp_major(void);
- extern int get_maj_min(char *dev, int *major, int *minor);
-+extern bool is_bit_set(int *val, unsigned char index);
- extern int dev_open(char *dev, int flags);
- extern int open_dev(char *devnm);
- extern void reopen_mddev(int mdfd);
-diff --git a/util.c b/util.c
-index ca48d976..26ffdcea 100644
---- a/util.c
-+++ b/util.c
-@@ -1027,6 +1027,20 @@ int get_maj_min(char *dev, int *major, int *minor)
- 		*e == 0);
- }
- 
-+/**
-+ * is_bit_set() - get bit value by index.
-+ * @val: value.
-+ * @index: index of the bit (LSB numbering).
-+ *
-+ * Return: bit value.
-+ */
-+bool is_bit_set(int *val, unsigned char index)
-+{
-+	if ((*val) & (1 << index))
-+		return true;
-+	return false;
-+}
-+
- int dev_open(char *dev, int flags)
- {
- 	/* like 'open', but if 'dev' matches %d:%d, create a temp
--- 
-2.38.1
-

SOURCES/0052-Assemble-check-if-device-is-container-before-schedul.patch

@@ -1,36 +0,0 @@
-From 5c3c3df646dd3b7e8df81152f08e9ac4ddccc671 Mon Sep 17 00:00:00 2001
-From: Kinga Tanska <kinga.tanska@intel.com>
-Date: Fri, 19 Aug 2022 02:55:46 +0200
-Subject: [PATCH 52/83] Assemble: check if device is container before
- scheduling force-clean update
-
-Up to now using assemble with force flag making each array as clean.
-Force-clean should not be done for the container. This commit add
-check if device is different than container before cleaning.
-
-Signed-off-by: Kinga Tanska <kinga.tanska@intel.com>
-Signed-off-by: Jes Sorensen <jsorensen@fb.com>
----
- Assemble.c | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/Assemble.c b/Assemble.c
-index be2160b4..1dd82a8c 100644
---- a/Assemble.c
-+++ b/Assemble.c
-@@ -1809,10 +1809,9 @@ try_again:
- 		}
- #endif
- 	}
--	if (c->force && !clean &&
-+	if (c->force && !clean && content->array.level != LEVEL_CONTAINER &&
- 	    !enough(content->array.level, content->array.raid_disks,
--		    content->array.layout, clean,
--		    avail)) {
-+		    content->array.layout, clean, avail)) {
- 		change += st->ss->update_super(st, content, "force-array",
- 					       devices[chosen_drive].devname, c->verbose,
- 					       0, NULL);
--- 
-2.38.1
-

SOURCES/0053-super1-report-truncated-device.patch

@@ -1,112 +0,0 @@
-From 171e9743881edf2dfb163ddff483566fbf913ccd Mon Sep 17 00:00:00 2001
-From: NeilBrown <neilb@suse.de>
-Date: Fri, 26 Aug 2022 08:55:56 +1000
-Subject: [PATCH 53/83] super1: report truncated device
-
-When the metadata is at the start of the device, it is possible that it
-describes a device large than the one it is actually stored on.  When
-this happens, report it loudly in --examine.
-
-....
-   Unused Space : before=1968 sectors, after=-2047 sectors DEVICE TOO SMALL
-          State : clean TRUNCATED DEVICE
-....
-
-Also report in --assemble so that the failure which the kernel will
-report will be explained.
-
-mdadm: Device /dev/sdb is not large enough for data described in superblock
-mdadm: no RAID superblock on /dev/sdb
-mdadm: /dev/sdb has no superblock - assembly aborted
-
-Scenario can be demonstrated as follows:
-
-mdadm: Note: this array has metadata at the start and
-    may not be suitable as a boot device.  If you plan to
-    store '/boot' on this device please ensure that
-    your boot-loader understands md/v1.x metadata, or use
-    --metadata=0.90
-mdadm: Defaulting to version 1.2 metadata
-mdadm: array /dev/md/test started.
-mdadm: stopped /dev/md/test
-   Unused Space : before=1968 sectors, after=-2047 sectors DEVICE TOO SMALL
-          State : clean TRUNCATED DEVICE
-   Unused Space : before=1968 sectors, after=-2047 sectors DEVICE TOO SMALL
-          State : clean TRUNCATED DEVICE
-
-Signed-off-by: NeilBrown <neilb@suse.de>
-Signed-off-by: Jes Sorensen <jsorensen@fb.com>
----
- super1.c | 35 ++++++++++++++++++++++++++++-------
- 1 file changed, 28 insertions(+), 7 deletions(-)
-
-diff --git a/super1.c b/super1.c
-index 71af860c..58345e68 100644
---- a/super1.c
-+++ b/super1.c
-@@ -406,12 +406,18 @@ static void examine_super1(struct supertype *st, char *homehost)
- 
- 	st->ss->getinfo_super(st, &info, NULL);
- 	if (info.space_after != 1 &&
--	    !(__le32_to_cpu(sb->feature_map) & MD_FEATURE_NEW_OFFSET))
--		printf("   Unused Space : before=%llu sectors, after=%llu sectors\n",
--		       info.space_before, info.space_after);
--
--	printf("          State : %s\n",
--	       (__le64_to_cpu(sb->resync_offset)+1)? "active":"clean");
-+	    !(__le32_to_cpu(sb->feature_map) & MD_FEATURE_NEW_OFFSET)) {
-+		printf("   Unused Space : before=%llu sectors, ",
-+		       info.space_before);
-+		if (info.space_after < INT64_MAX)
-+			printf("after=%llu sectors\n", info.space_after);
-+		else
-+			printf("after=-%llu sectors DEVICE TOO SMALL\n",
-+			       UINT64_MAX - info.space_after);
-+	}
-+	printf("          State : %s%s\n",
-+	       (__le64_to_cpu(sb->resync_offset)+1) ? "active":"clean",
-+	       (info.space_after > INT64_MAX)       ? " TRUNCATED DEVICE" : "");
- 	printf("    Device UUID : ");
- 	for (i=0; i<16; i++) {
- 		if ((i&3)==0 && i != 0)
-@@ -2206,6 +2212,7 @@ static int load_super1(struct supertype *st, int fd, char *devname)
- 		tst.ss = &super1;
- 		for (tst.minor_version = 0; tst.minor_version <= 2;
- 		     tst.minor_version++) {
-+			tst.ignore_hw_compat = st->ignore_hw_compat;
- 			switch(load_super1(&tst, fd, devname)) {
- 			case 0: super = tst.sb;
- 				if (bestvers == -1 ||
-@@ -2312,7 +2319,6 @@ static int load_super1(struct supertype *st, int fd, char *devname)
- 		free(super);
- 		return 2;
- 	}
--	st->sb = super;
- 
- 	bsb = (struct bitmap_super_s *)(((char*)super)+MAX_SB_SIZE);
- 
-@@ -2322,6 +2328,21 @@ static int load_super1(struct supertype *st, int fd, char *devname)
- 	if (st->data_offset == INVALID_SECTORS)
- 		st->data_offset = __le64_to_cpu(super->data_offset);
- 
-+	if (st->minor_version >= 1 &&
-+	    st->ignore_hw_compat == 0 &&
-+	    (dsize < (__le64_to_cpu(super->data_offset) +
-+		      __le64_to_cpu(super->size))
-+	     ||
-+	     dsize < (__le64_to_cpu(super->data_offset) +
-+		      __le64_to_cpu(super->data_size)))) {
-+		if (devname)
-+			pr_err("Device %s is not large enough for data described in superblock\n",
-+			       devname);
-+		free(super);
-+		return 2;
-+	}
-+	st->sb = super;
-+
- 	/* Now check on the bitmap superblock */
- 	if ((__le32_to_cpu(super->feature_map)&MD_FEATURE_BITMAP_OFFSET) == 0)
- 		return 0;
--- 
-2.38.1
-

SOURCES/0054-mdadm-Correct-typos-punctuation-and-grammar-in-man.patch

@@ -1,616 +0,0 @@
-From 1a386f804d8392b849b3362da6b0157b0db83091 Mon Sep 17 00:00:00 2001
-From: Mateusz Grzonka <mateusz.grzonka@intel.com>
-Date: Fri, 12 Aug 2022 16:52:12 +0200
-Subject: [PATCH 54/83] mdadm: Correct typos, punctuation and grammar in man
-
-Signed-off-by: Mateusz Grzonka <mateusz.grzonka@intel.com>
-Reviewed-by: Wol <anthony@youngman.org.uk>
-Signed-off-by: Jes Sorensen <jsorensen@fb.com>
----
- mdadm.8.in | 178 ++++++++++++++++++++++++++---------------------------
- 1 file changed, 88 insertions(+), 90 deletions(-)
-
-diff --git a/mdadm.8.in b/mdadm.8.in
-index f2736226..70c79d1e 100644
---- a/mdadm.8.in
-+++ b/mdadm.8.in
-@@ -158,7 +158,7 @@ adding new spares and removing faulty devices.
- .B Misc
- This is an 'everything else' mode that supports operations on active
- arrays, operations on component devices such as erasing old superblocks, and
--information gathering operations.
-+information-gathering operations.
- .\"This mode allows operations on independent devices such as examine MD
- .\"superblocks, erasing old superblocks and stopping active arrays.
- 
-@@ -231,12 +231,12 @@ mode to be assumed.
- 
- .TP
- .BR \-h ", " \-\-help
--Display general help message or, after one of the above options, a
-+Display a general help message or, after one of the above options, a
- mode-specific help message.
- 
- .TP
- .B \-\-help\-options
--Display more detailed help about command line parsing and some commonly
-+Display more detailed help about command-line parsing and some commonly
- used options.
- 
- .TP
-@@ -266,7 +266,7 @@ the exact meaning of this option in different contexts.
- 
- .TP
- .BR \-c ", " \-\-config=
--Specify the config file or directory.  If not specified, default config file
-+Specify the config file or directory.  If not specified, the default config file
- and default conf.d directory will be used.  See
- .BR mdadm.conf (5)
- for more details.
-@@ -379,7 +379,7 @@ When creating an array, the
- .B homehost
- will be recorded in the metadata.  For version-1 superblocks, it will
- be prefixed to the array name.  For version-0.90 superblocks, part of
--the SHA1 hash of the hostname will be stored in the later half of the
-+the SHA1 hash of the hostname will be stored in the latter half of the
- UUID.
- 
- When reporting information about an array, any array which is tagged
-@@ -388,7 +388,7 @@ for the given homehost will be reported as such.
- When using Auto-Assemble, only arrays tagged for the given homehost
- will be allowed to use 'local' names (i.e. not ending in '_' followed
- by a digit string).  See below under
--.BR "Auto Assembly" .
-+.BR "Auto-Assembly" .
- 
- The special name "\fBany\fP" can be used as a wild card.  If an array
- is created with
-@@ -403,7 +403,7 @@ When
- .I mdadm
- needs to print the name for a device it normally finds the name in
- .B /dev
--which refers to the device and is shortest.  When a path component is
-+which refers to the device and is the shortest.  When a path component is
- given with
- .B \-\-prefer
- .I mdadm
-@@ -478,9 +478,9 @@ still be larger than any replacement.
- 
- This option can be used with
- .B \-\-create
--for determining initial size of an array. For external metadata,
-+for determining the initial size of an array. For external metadata,
- it can be used on a volume, but not on a container itself.
--Setting initial size of
-+Setting the initial size of
- .B RAID 0
- array is only valid for external metadata.
- 
-@@ -545,20 +545,20 @@ Clustered arrays do not support this parameter yet.
- 
- .TP
- .BR \-c ", " \-\-chunk=
--Specify chunk size of kilobytes.  The default when creating an
-+Specify chunk size in kilobytes.  The default when creating an
- array is 512KB.  To ensure compatibility with earlier versions, the
- default when building an array with no persistent metadata is 64KB.
- This is only meaningful for RAID0, RAID4, RAID5, RAID6, and RAID10.
- 
- RAID4, RAID5, RAID6, and RAID10 require the chunk size to be a power
--of 2.  In any case it must be a multiple of 4KB.
-+of 2, with minimal chunk size being 4KB.
- 
- A suffix of 'K', 'M', 'G' or 'T' can be given to indicate Kilobytes,
- Megabytes, Gigabytes or Terabytes respectively.
- 
- .TP
- .BR \-\-rounding=
--Specify rounding factor for a Linear array.  The size of each
-+Specify the rounding factor for a Linear array.  The size of each
- component will be rounded down to a multiple of this size.
- This is a synonym for
- .B \-\-chunk
-@@ -655,7 +655,8 @@ option to set subsequent failure modes.
- and "flush" will clear any persistent faults.
- 
- The layout options for RAID10 are one of 'n', 'o' or 'f' followed
--by a small number.  The default is 'n2'.  The supported options are:
-+by a small number signifying the number of copies of each datablock.
-+The default is 'n2'.  The supported options are:
- 
- .I 'n'
- signals 'near' copies.  Multiple copies of one data block are at
-@@ -673,7 +674,7 @@ signals 'far' copies
- (multiple copies have very different offsets).
- See md(4) for more detail about 'near', 'offset', and 'far'.
- 
--The number is the number of copies of each datablock.  2 is normal, 3
-+As for the number of copies of each data block, 2 is normal, 3
- can be useful.  This number can be at most equal to the number of
- devices in the array.  It does not need to divide evenly into that
- number (e.g. it is perfectly legal to have an 'n2' layout for an array
-@@ -684,7 +685,7 @@ A bug introduced in Linux 3.14 means that RAID0 arrays
- started using a different layout.  This could lead to
- data corruption.  Since Linux 5.4 (and various stable releases that received
- backports), the kernel will not accept such an array unless
--a layout is explictly set.  It can be set to
-+a layout is explicitly set.  It can be set to
- .RB ' original '
- or
- .RB ' alternate '.
-@@ -760,13 +761,13 @@ or by selecting a different consistency policy with
- 
- .TP
- .BR \-\-bitmap\-chunk=
--Set the chunksize of the bitmap.  Each bit corresponds to that many
-+Set the chunk size of the bitmap.  Each bit corresponds to that many
- Kilobytes of storage.
--When using a file based bitmap, the default is to use the smallest
--size that is at-least 4 and requires no more than 2^21 chunks.
-+When using a file-based bitmap, the default is to use the smallest
-+size that is at least 4 and requires no more than 2^21 chunks.
- When using an
- .B internal
--bitmap, the chunksize defaults to 64Meg, or larger if necessary to
-+bitmap, the chunk size defaults to 64Meg, or larger if necessary to
- fit the bitmap into the available space.
- 
- A suffix of 'K', 'M', 'G' or 'T' can be given to indicate Kilobytes,
-@@ -840,7 +841,7 @@ can be used with that command to avoid the automatic resync.
- .BR \-\-backup\-file=
- This is needed when
- .B \-\-grow
--is used to increase the number of raid-devices in a RAID5 or RAID6 if
-+is used to increase the number of raid devices in a RAID5 or RAID6 if
- there are no spare devices available, or to shrink, change RAID level
- or layout.  See the GROW MODE section below on RAID\-DEVICES CHANGES.
- The file must be stored on a separate device, not on the RAID array
-@@ -879,7 +880,7 @@ When creating an array,
- .B \-\-data\-offset
- can be specified as
- .BR variable .
--In the case each member device is expected to have a offset appended
-+In the case each member device is expected to have an offset appended
- to the name, separated by a colon.  This makes it possible to recreate
- exactly an array which has varying data offsets (as can happen when
- different versions of
-@@ -943,7 +944,7 @@ Insist that
- .I mdadm
- accept the geometry and layout specified without question.  Normally
- .I mdadm
--will not allow creation of an array with only one device, and will try
-+will not allow the creation of an array with only one device, and will try
- to create a RAID5 array with one missing drive (as this makes the
- initial resync work faster).  With
- .BR \-\-force ,
-@@ -1004,7 +1005,7 @@ number added, e.g.
- If the md device name is in a 'standard' format as described in DEVICE
- NAMES, then it will be created, if necessary, with the appropriate
- device number based on that name.  If the device name is not in one of these
--formats, then a unused device number will be allocated.  The device
-+formats, then an unused device number will be allocated.  The device
- number will be considered unused if there is no active array for that
- number, and there is no entry in /dev for that number and with a
- non-standard name.  Names that are not in 'standard' format are only
-@@ -1032,25 +1033,25 @@ then
- .B \-\-add
- can be used to add some extra devices to be included in the array.
- In most cases this is not needed as the extra devices can be added as
--spares first, and then the number of raid-disks can be changed.
--However for RAID0, it is not possible to add spares.  So to increase
-+spares first, and then the number of raid disks can be changed.
-+However, for RAID0 it is not possible to add spares.  So to increase
- the number of devices in a RAID0, it is necessary to set the new
- number of devices, and to add the new devices, in the same command.
- 
- .TP
- .BR \-\-nodes
--Only works when the array is for clustered environment. It specifies
-+Only works when the array is created for a clustered environment. It specifies
- the maximum number of nodes in the cluster that will use this device
- simultaneously. If not specified, this defaults to 4.
- 
- .TP
- .BR \-\-write-journal
- Specify journal device for the RAID-4/5/6 array. The journal device
--should be a SSD with reasonable lifetime.
-+should be an SSD with a reasonable lifetime.
- 
- .TP
- .BR \-k ", " \-\-consistency\-policy=
--Specify how the array maintains consistency in case of unexpected shutdown.
-+Specify how the array maintains consistency in the case of an unexpected shutdown.
- Only relevant for RAID levels with redundancy.
- Currently supported options are:
- .RS
-@@ -1058,7 +1059,7 @@ Currently supported options are:
- .TP
- .B resync
- Full resync is performed and all redundancy is regenerated when the array is
--started after unclean shutdown.
-+started after an unclean shutdown.
- 
- .TP
- .B bitmap
-@@ -1067,8 +1068,8 @@ Resync assisted by a write-intent bitmap. Implicitly selected when using
- 
- .TP
- .B journal
--For RAID levels 4/5/6, journal device is used to log transactions and replay
--after unclean shutdown. Implicitly selected when using
-+For RAID levels 4/5/6, the journal device is used to log transactions and replay
-+after an unclean shutdown. Implicitly selected when using
- .BR \-\-write\-journal .
- 
- .TP
-@@ -1237,7 +1238,7 @@ This can be useful if
- reports a different "Preferred Minor" to
- .BR \-\-detail .
- In some cases this update will be performed automatically
--by the kernel driver.  In particular the update happens automatically
-+by the kernel driver.  In particular, the update happens automatically
- at the first write to an array with redundancy (RAID level 1 or
- greater) on a 2.6 (or later) kernel.
- 
-@@ -1277,7 +1278,7 @@ For version-1 superblocks, this involves updating the name.
- The
- .B home\-cluster
- option will change the cluster name as recorded in the superblock and
--bitmap. This option only works for clustered environment.
-+bitmap. This option only works for a clustered environment.
- 
- The
- .B resync
-@@ -1390,10 +1391,10 @@ This option should be used with great caution.
- 
- .TP
- .BR \-\-freeze\-reshape
--Option is intended to be used in start-up scripts during initrd boot phase.
--When array under reshape is assembled during initrd phase, this option
--stops reshape after reshape critical section is being restored. This happens
--before file system pivot operation and avoids loss of file system context.
-+This option is intended to be used in start-up scripts during the initrd boot phase.
-+When the array under reshape is assembled during the initrd phase, this option
-+stops the reshape after the reshape-critical section has been restored. This happens
-+before the file system pivot operation and avoids loss of filesystem context.
- Losing file system context would cause reshape to be broken.
- 
- Reshape can be continued later using the
-@@ -1437,9 +1438,9 @@ re\-add a device that was previously removed from an array.
- If the metadata on the device reports that it is a member of the
- array, and the slot that it used is still vacant, then the device will
- be added back to the array in the same position.  This will normally
--cause the data for that device to be recovered.  However based on the
-+cause the data for that device to be recovered.  However, based on the
- event count on the device, the recovery may only require sections that
--are flagged a write-intent bitmap to be recovered or may not require
-+are flagged by a write-intent bitmap to be recovered or may not require
- any recovery at all.
- 
- When used on an array that has no metadata (i.e. it was built with
-@@ -1447,13 +1448,12 @@ When used on an array that has no metadata (i.e. it was built with
- it will be assumed that bitmap-based recovery is enough to make the
- device fully consistent with the array.
- 
--When used with v1.x metadata,
- .B \-\-re\-add
--can be accompanied by
-+can also be accompanied by
- .BR \-\-update=devicesize ,
- .BR \-\-update=bbl ", or"
- .BR \-\-update=no\-bbl .
--See the description of these option when used in Assemble mode for an
-+See descriptions of these options when used in Assemble mode for an
- explanation of their use.
- 
- If the device name given is
-@@ -1480,7 +1480,7 @@ Add a device as a spare.  This is similar to
- except that it does not attempt
- .B \-\-re\-add
- first.  The device will be added as a spare even if it looks like it
--could be an recent member of the array.
-+could be a recent member of the array.
- 
- .TP
- .BR \-r ", " \-\-remove
-@@ -1497,12 +1497,12 @@ and names like
- .B set-A
- can be given to
- .BR \-\-remove .
--The first causes all failed device to be removed.  The second causes
-+The first causes all failed devices to be removed.  The second causes
- any device which is no longer connected to the system (i.e an 'open'
- returns
- .BR ENXIO )
- to be removed.
--The third will remove a set as describe below under
-+The third will remove a set as described below under
- .BR \-\-fail .
- 
- .TP
-@@ -1519,7 +1519,7 @@ For RAID10 arrays where the number of copies evenly divides the number
- of devices, the devices can be conceptually divided into sets where
- each set contains a single complete copy of the data on the array.
- Sometimes a RAID10 array will be configured so that these sets are on
--separate controllers.  In this case all the devices in one set can be
-+separate controllers.  In this case, all the devices in one set can be
- failed by giving a name like
- .B set\-A
- or
-@@ -1549,9 +1549,9 @@ This can follow a list of
- .B \-\-replace
- devices.  The devices listed after
- .B \-\-with
--will be preferentially used to replace the devices listed after
-+will preferentially be used to replace the devices listed after
- .BR \-\-replace .
--These device must already be spare devices in the array.
-+These devices must already be spare devices in the array.
- 
- .TP
- .BR \-\-write\-mostly
-@@ -1574,8 +1574,8 @@ the device is found or <slot>:missing in case the device is not found.
- 
- .TP
- .BR \-\-add-journal
--Add journal to an existing array, or recreate journal for RAID-4/5/6 array
--that lost a journal device. To avoid interrupting on-going write opertions,
-+Add a journal to an existing array, or recreate journal for a RAID-4/5/6 array
-+that lost a journal device. To avoid interrupting ongoing write operations,
- .B \-\-add-journal
- only works for array in Read-Only state.
- 
-@@ -1631,9 +1631,9 @@ Print details of one or more md devices.
- .TP
- .BR \-\-detail\-platform
- Print details of the platform's RAID capabilities (firmware / hardware
--topology) for a given metadata format. If used without argument, mdadm
-+topology) for a given metadata format. If used without an argument, mdadm
- will scan all controllers looking for their capabilities. Otherwise, mdadm
--will only look at the controller specified by the argument in form of an
-+will only look at the controller specified by the argument in the form of an
- absolute filepath or a link, e.g.
- .IR /sys/devices/pci0000:00/0000:00:1f.2 .
- 
-@@ -1742,8 +1742,8 @@ the block where the superblock would be is overwritten even if it
- doesn't appear to be valid.
- 
- .B Note:
--Be careful to call \-\-zero\-superblock with clustered raid, make sure
--array isn't used or assembled in other cluster node before execute it.
-+Be careful when calling \-\-zero\-superblock with clustered raid. Make sure
-+the array isn't used or assembled in another cluster node before executing it.
- 
- .TP
- .B \-\-kill\-subarray=
-@@ -1790,7 +1790,7 @@ For each md device given, or each device in /proc/mdstat if
- is given, arrange for the array to be marked clean as soon as possible.
- .I mdadm
- will return with success if the array uses external metadata and we
--successfully waited.  For native arrays this returns immediately as the
-+successfully waited.  For native arrays, this returns immediately as the
- kernel handles dirty-clean transitions at shutdown.  No action is taken
- if safe-mode handling is disabled.
- 
-@@ -1830,7 +1830,7 @@ uses to help track which arrays are currently being assembled.
- 
- .TP
- .BR \-\-run ", " \-R
--Run any array assembled as soon as a minimal number of devices are
-+Run any array assembled as soon as a minimal number of devices is
- available, rather than waiting until all expected devices are present.
- 
- .TP
-@@ -1860,7 +1860,7 @@ Only used with \-\-fail.  The 'path' given will be recorded so that if
- a new device appears at the same location it can be automatically
- added to the same array.  This allows the failed device to be
- automatically replaced by a new device without metadata if it appears
--at specified path.   This option is normally only set by a
-+at specified path.   This option is normally only set by an
- .I udev
- script.
- 
-@@ -1961,7 +1961,7 @@ Usage:
- .PP
- This usage assembles one or more RAID arrays from pre-existing components.
- For each array, mdadm needs to know the md device, the identity of the
--array, and a number of component-devices.  These can be found in a number of ways.
-+array, and the number of component devices.  These can be found in a number of ways.
- 
- In the first usage example (without the
- .BR \-\-scan )
-@@ -2001,7 +2001,7 @@ The config file is only used if explicitly named with
- .B \-\-config
- or requested with (a possibly implicit)
- .BR \-\-scan .
--In the later case, default config file is used.  See
-+In the latter case, the default config file is used.  See
- .BR mdadm.conf (5)
- for more details.
- 
-@@ -2039,14 +2039,14 @@ detects that udev is not configured, it will create the devices in
- .B /dev
- itself.
- 
--In Linux kernels prior to version 2.6.28 there were two distinctly
--different types of md devices that could be created: one that could be
-+In Linux kernels prior to version 2.6.28 there were two distinct
-+types of md devices that could be created: one that could be
- partitioned using standard partitioning tools and one that could not.
--Since 2.6.28 that distinction is no longer relevant as both type of
-+Since 2.6.28 that distinction is no longer relevant as both types of
- devices can be partitioned.
- .I mdadm
- will normally create the type that originally could not be partitioned
--as it has a well defined major number (9).
-+as it has a well-defined major number (9).
- 
- Prior to 2.6.28, it is important that mdadm chooses the correct type
- of array device to use.  This can be controlled with the
-@@ -2066,7 +2066,7 @@ can also be given in the configuration file as a word starting
- .B auto=
- on the ARRAY line for the relevant array.
- 
--.SS Auto Assembly
-+.SS Auto-Assembly
- When
- .B \-\-assemble
- is used with
-@@ -2122,11 +2122,11 @@ See
- .IR mdadm.conf (5)
- for further details.
- 
--Note: Auto assembly cannot be used for assembling and activating some
-+Note: Auto-assembly cannot be used for assembling and activating some
- arrays which are undergoing reshape.  In particular as the
- .B backup\-file
--cannot be given, any reshape which requires a backup-file to continue
--cannot be started by auto assembly.  An array which is growing to more
-+cannot be given, any reshape which requires a backup file to continue
-+cannot be started by auto-assembly.  An array which is growing to more
- devices and has passed the critical section can be assembled using
- auto-assembly.
- 
-@@ -2233,7 +2233,7 @@ When creating a partition based array, using
- .I mdadm
- with version-1.x metadata, the partition type should be set to
- .B 0xDA
--(non fs-data).  This type selection allows for greater precision since
-+(non fs-data).  This type of selection allows for greater precision since
- using any other [RAID auto-detect (0xFD) or a GNU/Linux partition (0x83)],
- might create problems in the event of array recovery through a live cdrom.
- 
-@@ -2249,7 +2249,7 @@ when creating a v0.90 array will silently override any
- setting.
- .\"If the
- .\".B \-\-size
--.\"option is given, it is not necessary to list any component-devices in this command.
-+.\"option is given, it is not necessary to list any component devices in this command.
- .\"They can be added later, before a
- .\".B \-\-run.
- .\"If no
-@@ -2263,7 +2263,7 @@ requested with the
- .B \-\-bitmap
- option or a different consistency policy is selected with the
- .B \-\-consistency\-policy
--option. In any case space for a bitmap will be reserved so that one
-+option. In any case, space for a bitmap will be reserved so that one
- can be added later with
- .BR "\-\-grow \-\-bitmap=internal" .
- 
-@@ -2313,7 +2313,7 @@ will firstly mark
- as faulty in
- .B /dev/md0
- and will then remove it from the array and finally add it back
--in as a spare.  However only one md array can be affected by a single
-+in as a spare.  However, only one md array can be affected by a single
- command.
- 
- When a device is added to an active array, mdadm checks to see if it
-@@ -2458,14 +2458,14 @@ config file to be examined.
- If the device contains RAID metadata, a file will be created in the
- .I directory
- and the metadata will be written to it.  The file will be the same
--size as the device and have the metadata written in the file at the
--same locate that it exists in the device.  However the file will be "sparse" so
-+size as the device and will have the metadata written at the
-+same location as it exists in the device.  However, the file will be "sparse" so
- that only those blocks containing metadata will be allocated. The
- total space used will be small.
- 
--The file name used in the
-+The filename used in the
- .I directory
--will be the base name of the device.   Further if any links appear in
-+will be the base name of the device.   Further, if any links appear in
- .I /dev/disk/by-id
- which point to the device, then hard links to the file will be created
- in
-@@ -2567,7 +2567,7 @@ and if the destination array has a failed drive but no spares.
- 
- If any devices are listed on the command line,
- .I mdadm
--will only monitor those devices.  Otherwise all arrays listed in the
-+will only monitor those devices, otherwise, all arrays listed in the
- configuration file will be monitored.  Further, if
- .B \-\-scan
- is given, then any other md devices that appear in
-@@ -2624,10 +2624,10 @@ check, repair). (syslog priority: Warning)
- .BI Rebuild NN
- Where
- .I NN
--is a two-digit number (ie. 05, 48). This indicates that rebuild
--has passed that many percent of the total. The events are generated
--with fixed increment since 0. Increment size may be specified with
--a commandline option (default is 20). (syslog priority: Warning)
-+is a two-digit number (eg. 05, 48). This indicates that the rebuild
-+has reached that percentage of the total. The events are generated
-+at a fixed increment from 0. The increment size may be specified with
-+a command-line option (the default is 20). (syslog priority: Warning)
- 
- .TP
- .B RebuildFinished
-@@ -2735,8 +2735,8 @@ When
- detects that an array in a spare group has fewer active
- devices than necessary for the complete array, and has no spare
- devices, it will look for another array in the same spare group that
--has a full complement of working drive and a spare.  It will then
--attempt to remove the spare from the second drive and add it to the
-+has a full complement of working drives and a spare.  It will then
-+attempt to remove the spare from the second array and add it to the
- first.
- If the removal succeeds but the adding fails, then it is added back to
- the original array.
-@@ -2750,10 +2750,8 @@ and then follow similar steps as above if a matching spare is found.
- .SH GROW MODE
- The GROW mode is used for changing the size or shape of an active
- array.
--For this to work, the kernel must support the necessary change.
--Various types of growth are being added during 2.6 development.
- 
--Currently the supported changes include
-+During the kernel 2.6 era the following changes were added:
- .IP \(bu 4
- change the "size" attribute for RAID1, RAID4, RAID5 and RAID6.
- .IP \(bu 4
-@@ -2796,8 +2794,8 @@ use more than half of a spare device for backup space.
- 
- .SS SIZE CHANGES
- Normally when an array is built the "size" is taken from the smallest
--of the drives.  If all the small drives in an arrays are, one at a
--time, removed and replaced with larger drives, then you could have an
-+of the drives.  If all the small drives in an arrays are, over time,
-+removed and replaced with larger drives, then you could have an
- array of large drives with only a small amount used.  In this
- situation, changing the "size" with "GROW" mode will allow the extra
- space to start being used.  If the size is increased in this way, a
-@@ -2812,7 +2810,7 @@ after growing, or to reduce its size
- .B prior
- to shrinking the array.
- 
--Also the size of an array cannot be changed while it has an active
-+Also, the size of an array cannot be changed while it has an active
- bitmap.  If an array has a bitmap, it must be removed before the size
- can be changed. Once the change is complete a new bitmap can be created.
- 
-@@ -2892,7 +2890,7 @@ long time.  A
- is required.  If the array is not simultaneously being grown or
- shrunk, so that the array size will remain the same - for example,
- reshaping a 3-drive RAID5 into a 4-drive RAID6 - the backup file will
--be used not just for a "cricital section" but throughout the reshape
-+be used not just for a "critical section" but throughout the reshape
- operation, as described below under LAYOUT CHANGES.
- 
- .SS CHUNK-SIZE AND LAYOUT CHANGES
-@@ -2910,7 +2908,7 @@ slowly.
- If the reshape is interrupted for any reason, this backup file must be
- made available to
- .B "mdadm --assemble"
--so the array can be reassembled.  Consequently the file cannot be
-+so the array can be reassembled.  Consequently, the file cannot be
- stored on the device being reshaped.
- 
- 
--- 
-2.38.1
-

SOURCES/0055-Manage-Block-unsafe-member-failing.patch

@@ -1,91 +0,0 @@
-From fc6fd4063769f4194c3fb8f77b32b2819e140fb9 Mon Sep 17 00:00:00 2001
-From: Mateusz Kusiak <mateusz.kusiak@intel.com>
-Date: Thu, 18 Aug 2022 11:47:21 +0200
-Subject: [PATCH 55/83] Manage: Block unsafe member failing
-
-Kernel may or may not block mdadm from removing member device if it
-will cause arrays failed state. It depends on raid personality
-implementation in kernel.
-Add verification on requested removal path (#mdadm --set-faulty
-command).
-
-Signed-off-by: Mateusz Kusiak <mateusz.kusiak@intel.com>
-Signed-off-by: Jes Sorensen <jsorensen@fb.com>
----
- Manage.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
- 1 file changed, 52 insertions(+), 1 deletion(-)
-
-diff --git a/Manage.c b/Manage.c
-index a142f8bd..b1d0e630 100644
---- a/Manage.c
-+++ b/Manage.c
-@@ -1285,6 +1285,50 @@ int Manage_with(struct supertype *tst, int fd, struct mddev_dev *dv,
- 	return -1;
- }
- 
-+/**
-+ * is_remove_safe() - Check if remove is safe.
-+ * @array: Array info.
-+ * @fd: Array file descriptor.
-+ * @devname: Name of device to remove.
-+ * @verbose: Verbose.
-+ *
-+ * The function determines if array will be operational
-+ * after removing &devname.
-+ *
-+ * Return: True if array will be operational, false otherwise.
-+ */
-+bool is_remove_safe(mdu_array_info_t *array, const int fd, char *devname, const int verbose)
-+{
-+	dev_t devid = devnm2devid(devname + 5);
-+	struct mdinfo *mdi = sysfs_read(fd, NULL, GET_DEVS | GET_DISKS | GET_STATE);
-+
-+	if (!mdi) {
-+		if (verbose)
-+			pr_err("Failed to read sysfs attributes for %s\n", devname);
-+		return false;
-+	}
-+
-+	char *avail = xcalloc(array->raid_disks, sizeof(char));
-+
-+	for (mdi = mdi->devs; mdi; mdi = mdi->next) {
-+		if (mdi->disk.raid_disk < 0)
-+			continue;
-+		if (!(mdi->disk.state & (1 << MD_DISK_SYNC)))
-+			continue;
-+		if (makedev(mdi->disk.major, mdi->disk.minor) == devid)
-+			continue;
-+		avail[mdi->disk.raid_disk] = 1;
-+	}
-+	sysfs_free(mdi);
-+
-+	bool is_enough = enough(array->level, array->raid_disks,
-+				array->layout, (array->state & 1),
-+				avail);
-+
-+	free(avail);
-+	return is_enough;
-+}
-+
- int Manage_subdevs(char *devname, int fd,
- 		   struct mddev_dev *devlist, int verbose, int test,
- 		   char *update, int force)
-@@ -1598,7 +1642,14 @@ int Manage_subdevs(char *devname, int fd,
- 			break;
- 
- 		case 'f': /* set faulty */
--			/* FIXME check current member */
-+			if (!is_remove_safe(&array, fd, dv->devname, verbose)) {
-+				pr_err("Cannot remove %s from %s, array will be failed.\n",
-+				       dv->devname, devname);
-+				if (sysfd >= 0)
-+					close(sysfd);
-+				goto abort;
-+			}
-+
- 			if ((sysfd >= 0 && write(sysfd, "faulty", 6) != 6) ||
- 			    (sysfd < 0 && ioctl(fd, SET_DISK_FAULTY,
- 						rdev))) {
--- 
-2.38.1
-

SOURCES/0056-Monitor-Fix-statelist-memory-leaks.patch

@@ -1,112 +0,0 @@
-From 55c10e4de13abe3e6934895e1fff7d2d20d0b2c2 Mon Sep 17 00:00:00 2001
-From: Pawel Baldysiak <pawel.baldysiak@intel.com>
-Date: Thu, 1 Sep 2022 11:20:31 +0200
-Subject: [PATCH 56/83] Monitor: Fix statelist memory leaks
-
-Free statelist in error path in Monitor initialization.
-
-Signed-off-by: Pawel Baldysiak <pawel.baldysiak@intel.com>
-Signed-off-by: Jes Sorensen <jsorensen@fb.com>
----
- Monitor.c | 40 +++++++++++++++++++++++++++++++---------
- 1 file changed, 31 insertions(+), 9 deletions(-)
-
-diff --git a/Monitor.c b/Monitor.c
-index 93f36ac0..b4e954c6 100644
---- a/Monitor.c
-+++ b/Monitor.c
-@@ -74,6 +74,7 @@ static int add_new_arrays(struct mdstat_ent *mdstat, struct state **statelist,
- 			  int test, struct alert_info *info);
- static void try_spare_migration(struct state *statelist, struct alert_info *info);
- static void link_containers_with_subarrays(struct state *list);
-+static void free_statelist(struct state *statelist);
- #ifndef NO_LIBUDEV
- static int check_udev_activity(void);
- #endif
-@@ -128,7 +129,6 @@ int Monitor(struct mddev_dev *devlist,
- 	 */
- 
- 	struct state *statelist = NULL;
--	struct state *st2;
- 	int finished = 0;
- 	struct mdstat_ent *mdstat = NULL;
- 	char *mailfrom;
-@@ -185,12 +185,14 @@ int Monitor(struct mddev_dev *devlist,
- 				continue;
- 			if (strcasecmp(mdlist->devname, "<ignore>") == 0)
- 				continue;
-+			if (!is_mddev(mdlist->devname)) {
-+				free_statelist(statelist);
-+				return 1;
-+			}
- 
- 			st = xcalloc(1, sizeof *st);
- 			snprintf(st->devname, MD_NAME_MAX + sizeof("/dev/md/"),
- 				 "/dev/md/%s", basename(mdlist->devname));
--			if (!is_mddev(mdlist->devname))
--				return 1;
- 			st->next = statelist;
- 			st->devnm[0] = 0;
- 			st->percent = RESYNC_UNKNOWN;
-@@ -206,8 +208,10 @@ int Monitor(struct mddev_dev *devlist,
- 		for (dv = devlist; dv; dv = dv->next) {
- 			struct state *st;
- 
--			if (!is_mddev(dv->devname))
-+			if (!is_mddev(dv->devname)) {
-+				free_statelist(statelist);
- 				return 1;
-+			}
- 
- 			st = xcalloc(1, sizeof *st);
- 			mdlist = conf_get_ident(dv->devname);
-@@ -294,16 +298,16 @@ int Monitor(struct mddev_dev *devlist,
- 		for (stp = &statelist; (st = *stp) != NULL; ) {
- 			if (st->from_auto && st->err > 5) {
- 				*stp = st->next;
--				free(st->spare_group);
-+				if (st->spare_group)
-+					free(st->spare_group);
-+
- 				free(st);
- 			} else
- 				stp = &st->next;
- 		}
- 	}
--	for (st2 = statelist; st2; st2 = statelist) {
--		statelist = st2->next;
--		free(st2);
--	}
-+
-+	free_statelist(statelist);
- 
- 	if (pidfile)
- 		unlink(pidfile);
-@@ -1056,6 +1060,24 @@ static void link_containers_with_subarrays(struct state *list)
- 				}
- }
- 
-+/**
-+ * free_statelist() - Frees statelist.
-+ * @statelist: statelist to free
-+ */
-+static void free_statelist(struct state *statelist)
-+{
-+	struct state *tmp = NULL;
-+
-+	while (statelist) {
-+		if (statelist->spare_group)
-+			free(statelist->spare_group);
-+
-+		tmp = statelist;
-+		statelist = statelist->next;
-+		free(tmp);
-+	}
-+}
-+
- #ifndef NO_LIBUDEV
- /* function: check_udev_activity
-  * Description: Function waits for udev to finish
--- 
-2.38.1
-

SOURCES/0057-mdadm-added-support-for-Intel-Alderlake-RST-on-VMD-p.patch

@@ -1,64 +0,0 @@
-From ea7a02a3294aae223e1329aed5da7f4aa3ac05c5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Old=C5=99ich=20Jedli=C4=8Dka?= <oldium.pro@gmail.com>
-Date: Wed, 31 Aug 2022 19:57:29 +0200
-Subject: [PATCH 57/83] mdadm: added support for Intel Alderlake RST on VMD
- platform
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Alderlake RST on VMD uses RstVmdV UEFI variable name, so detect it.
-
-Signed-off-by: Oldřich Jedlička <oldium.pro@gmail.com>
-Reviewed-by: Kinga Tanska <kinga.tanska@linux.intel.com>
-Signed-off-by: Jes Sorensen <jsorensen@fb.com>
----
- platform-intel.c | 18 +++++++++++++-----
- 1 file changed, 13 insertions(+), 5 deletions(-)
-
-diff --git a/platform-intel.c b/platform-intel.c
-index 5a8729e7..757f0b1b 100644
---- a/platform-intel.c
-+++ b/platform-intel.c
-@@ -512,7 +512,8 @@ static const struct imsm_orom *find_imsm_hba_orom(struct sys_dev *hba)
- #define AHCI_PROP "RstSataV"
- #define AHCI_SSATA_PROP "RstsSatV"
- #define AHCI_TSATA_PROP "RsttSatV"
--#define VMD_PROP "RstUefiV"
-+#define VROC_VMD_PROP "RstUefiV"
-+#define RST_VMD_PROP "RstVmdV"
- 
- #define VENDOR_GUID \
- 	EFI_GUID(0x193dfefa, 0xa445, 0x4302, 0x99, 0xd8, 0xef, 0x3a, 0xad, 0x1a, 0x04, 0xc6)
-@@ -605,6 +606,7 @@ const struct imsm_orom *find_imsm_efi(struct sys_dev *hba)
- 	struct orom_entry *ret;
- 	static const char * const sata_efivars[] = {AHCI_PROP, AHCI_SSATA_PROP,
- 						    AHCI_TSATA_PROP};
-+	static const char * const vmd_efivars[] = {VROC_VMD_PROP, RST_VMD_PROP};
- 	unsigned long i;
- 
- 	if (check_env("IMSM_TEST_AHCI_EFI") || check_env("IMSM_TEST_SCU_EFI"))
-@@ -636,10 +638,16 @@ const struct imsm_orom *find_imsm_efi(struct sys_dev *hba)
- 
- 		break;
- 	case SYS_DEV_VMD:
--		if (!read_efi_variable(&orom, sizeof(orom), VMD_PROP,
--				       VENDOR_GUID))
--			break;
--		return NULL;
-+		for (i = 0; i < ARRAY_SIZE(vmd_efivars); i++) {
-+			if (!read_efi_variable(&orom, sizeof(orom),
-+						vmd_efivars[i], VENDOR_GUID))
-+				break;
-+		}
-+
-+		if (i == ARRAY_SIZE(vmd_efivars))
-+			return NULL;
-+
-+		break;
- 	default:
- 		return NULL;
- 	}
--- 
-2.38.1
-

SOURCES/0058-mdadm-Add-Documentation-entries-to-systemd-services.patch

@@ -1,111 +0,0 @@
-From ea109700563d93704ebdc540c7770d874369f667 Mon Sep 17 00:00:00 2001
-From: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
-Date: Fri, 9 Sep 2022 15:50:33 +0200
-Subject: [PATCH 58/83] mdadm: Add Documentation entries to systemd services
-
-Add documentation section.
-Copied from Debian.
-
-Cc: Felix Lechner <felix.lechner@lease-up.com>
-Signed-off-by: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
-Acked-by: Coly Li <colyli@suse.de>
-Signed-off-by: Jes Sorensen <jsorensen@fb.com>
----
- systemd/mdadm-grow-continue@.service | 1 +
- systemd/mdadm-last-resort@.service   | 1 +
- systemd/mdcheck_continue.service     | 3 ++-
- systemd/mdcheck_start.service        | 1 +
- systemd/mdmon@.service               | 1 +
- systemd/mdmonitor-oneshot.service    | 1 +
- systemd/mdmonitor.service            | 1 +
- 7 files changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/systemd/mdadm-grow-continue@.service b/systemd/mdadm-grow-continue@.service
-index 9fdc8ec7..64b8254a 100644
---- a/systemd/mdadm-grow-continue@.service
-+++ b/systemd/mdadm-grow-continue@.service
-@@ -8,6 +8,7 @@
- [Unit]
- Description=Manage MD Reshape on /dev/%I
- DefaultDependencies=no
-+Documentation=man:mdadm(8)
- 
- [Service]
- ExecStart=BINDIR/mdadm --grow --continue /dev/%I
-diff --git a/systemd/mdadm-last-resort@.service b/systemd/mdadm-last-resort@.service
-index efeb3f63..e9381125 100644
---- a/systemd/mdadm-last-resort@.service
-+++ b/systemd/mdadm-last-resort@.service
-@@ -2,6 +2,7 @@
- Description=Activate md array %I even though degraded
- DefaultDependencies=no
- ConditionPathExists=!/sys/devices/virtual/block/%i/md/sync_action
-+Documentation=man:mdadm(8)
- 
- [Service]
- Type=oneshot
-diff --git a/systemd/mdcheck_continue.service b/systemd/mdcheck_continue.service
-index 854317f1..f5324905 100644
---- a/systemd/mdcheck_continue.service
-+++ b/systemd/mdcheck_continue.service
-@@ -7,7 +7,8 @@
- 
- [Unit]
- Description=MD array scrubbing - continuation
--ConditionPathExistsGlob = /var/lib/mdcheck/MD_UUID_*
-+ConditionPathExistsGlob=/var/lib/mdcheck/MD_UUID_*
-+Documentation=man:mdadm(8)
- 
- [Service]
- Type=oneshot
-diff --git a/systemd/mdcheck_start.service b/systemd/mdcheck_start.service
-index 3bb3d130..703a6583 100644
---- a/systemd/mdcheck_start.service
-+++ b/systemd/mdcheck_start.service
-@@ -8,6 +8,7 @@
- [Unit]
- Description=MD array scrubbing
- Wants=mdcheck_continue.timer
-+Documentation=man:mdadm(8)
- 
- [Service]
- Type=oneshot
-diff --git a/systemd/mdmon@.service b/systemd/mdmon@.service
-index 77533958..97a1acd9 100644
---- a/systemd/mdmon@.service
-+++ b/systemd/mdmon@.service
-@@ -9,6 +9,7 @@
- Description=MD Metadata Monitor on /dev/%I
- DefaultDependencies=no
- Before=initrd-switch-root.target
-+Documentation=man:mdmon(8)
- 
- [Service]
- # mdmon should never complain due to lack of a platform,
-diff --git a/systemd/mdmonitor-oneshot.service b/systemd/mdmonitor-oneshot.service
-index 373955a2..ba86b44e 100644
---- a/systemd/mdmonitor-oneshot.service
-+++ b/systemd/mdmonitor-oneshot.service
-@@ -7,6 +7,7 @@
- 
- [Unit]
- Description=Reminder for degraded MD arrays
-+Documentation=man:mdadm(8)
- 
- [Service]
- Environment=MDADM_MONITOR_ARGS=--scan
-diff --git a/systemd/mdmonitor.service b/systemd/mdmonitor.service
-index 46f7b880..9c364785 100644
---- a/systemd/mdmonitor.service
-+++ b/systemd/mdmonitor.service
-@@ -8,6 +8,7 @@
- [Unit]
- Description=MD array monitor
- DefaultDependencies=no
-+Documentation=man:mdadm(8)
- 
- [Service]
- Environment=  MDADM_MONITOR_ARGS=--scan
--- 
-2.38.1
-

SOURCES/0059-ReadMe-fix-command-line-help.patch

@@ -1,32 +0,0 @@
-From f7cbd810b639eb946ba1b3bddb1faefb9696de42 Mon Sep 17 00:00:00 2001
-From: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
-Date: Fri, 9 Sep 2022 15:50:34 +0200
-Subject: [PATCH 59/83] ReadMe: fix command-line help
-
-Make command-line help consistent with manual page.
-Copied from Debian.
-
-Cc: Felix Lechner <felix.lechner@lease-up.com>
-Signed-off-by: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
-Acked-by: Coly Li <colyli@suse.de>
-Signed-off-by: Jes Sorensen <jsorensen@fb.com>
----
- ReadMe.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ReadMe.c b/ReadMe.c
-index 7f94847e..50a5e36d 100644
---- a/ReadMe.c
-+++ b/ReadMe.c
-@@ -477,7 +477,7 @@ char Help_assemble[] =
- ;
- 
- char Help_manage[] =
--"Usage: mdadm arraydevice options component devices...\n"
-+"Usage: mdadm [mode] arraydevice [options] <component devices...>\n"
- "\n"
- "This usage is for managing the component devices within an array.\n"
- "The --manage option is not needed and is assumed if the first argument\n"
--- 
-2.38.1
-

SOURCES/0060-mdadm-replace-container-level-checking-with-inline.patch

@@ -1,257 +0,0 @@
-From 6f2af6a48c541f207cb727a31fb86de2cd04fc21 Mon Sep 17 00:00:00 2001
-From: Kinga Tanska <kinga.tanska@intel.com>
-Date: Fri, 2 Sep 2022 08:49:23 +0200
-Subject: [PATCH 60/83] mdadm: replace container level checking with inline
-
-To unify all containers checks in code, is_container() function is
-added and propagated.
-
-Signed-off-by: Kinga Tanska <kinga.tanska@intel.com>
-Acked-by: Coly Li <colyli@suse.de>
-Signed-off-by: Jes Sorensen <jsorensen@fb.com>
----
- Assemble.c    |  7 +++----
- Create.c      |  6 +++---
- Grow.c        |  6 +++---
- Incremental.c |  4 ++--
- mdadm.h       | 14 ++++++++++++++
- super-ddf.c   |  6 +++---
- super-intel.c |  4 ++--
- super0.c      |  2 +-
- super1.c      |  2 +-
- sysfs.c       |  2 +-
- 10 files changed, 33 insertions(+), 20 deletions(-)
-
-diff --git a/Assemble.c b/Assemble.c
-index 1dd82a8c..8b0af0c9 100644
---- a/Assemble.c
-+++ b/Assemble.c
-@@ -1120,7 +1120,7 @@ static int start_array(int mdfd,
- 			       i/2, mddev);
- 	}
- 
--	if (content->array.level == LEVEL_CONTAINER) {
-+	if (is_container(content->array.level)) {
- 		sysfs_rules_apply(mddev, content);
- 		if (c->verbose >= 0) {
- 			pr_err("Container %s has been assembled with %d drive%s",
-@@ -1549,8 +1549,7 @@ try_again:
- 			 */
- 			trustworthy = LOCAL;
- 
--		if (name[0] == 0 &&
--		    content->array.level == LEVEL_CONTAINER) {
-+		if (!name[0] && is_container(content->array.level)) {
- 			name = content->text_version;
- 			trustworthy = METADATA;
- 		}
-@@ -1809,7 +1808,7 @@ try_again:
- 		}
- #endif
- 	}
--	if (c->force && !clean && content->array.level != LEVEL_CONTAINER &&
-+	if (c->force && !clean && !is_container(content->array.level) &&
- 	    !enough(content->array.level, content->array.raid_disks,
- 		    content->array.layout, clean, avail)) {
- 		change += st->ss->update_super(st, content, "force-array",
-diff --git a/Create.c b/Create.c
-index e06ec2ae..953e7372 100644
---- a/Create.c
-+++ b/Create.c
-@@ -487,7 +487,7 @@ int Create(struct supertype *st, char *mddev,
- 			    st->minor_version >= 1)
- 				/* metadata at front */
- 				warn |= check_partitions(fd, dname, 0, 0);
--			else if (s->level == 1 || s->level == LEVEL_CONTAINER ||
-+			else if (s->level == 1 || is_container(s->level) ||
- 				 (s->level == 0 && s->raiddisks == 1))
- 				/* partitions could be meaningful */
- 				warn |= check_partitions(fd, dname, freesize*2, s->size*2);
-@@ -997,7 +997,7 @@ int Create(struct supertype *st, char *mddev,
- 			 * again returns container info.
- 			 */
- 			st->ss->getinfo_super(st, &info_new, NULL);
--			if (st->ss->external && s->level != LEVEL_CONTAINER &&
-+			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,
-@@ -1040,7 +1040,7 @@ int Create(struct supertype *st, char *mddev,
- 	map_unlock(&map);
- 	free(infos);
- 
--	if (s->level == LEVEL_CONTAINER) {
-+	if (is_container(s->level)) {
- 		/* No need to start.  But we should signal udev to
- 		 * create links */
- 		sysfs_uevent(&info, "change");
-diff --git a/Grow.c b/Grow.c
-index 0f07a894..e362403a 100644
---- a/Grow.c
-+++ b/Grow.c
-@@ -2175,7 +2175,7 @@ size_change_error:
- 					devname, s->size);
- 		}
- 		changed = 1;
--	} else if (array.level != LEVEL_CONTAINER) {
-+	} else if (!is_container(array.level)) {
- 		s->size = get_component_size(fd)/2;
- 		if (s->size == 0)
- 			s->size = array.size;
-@@ -2231,7 +2231,7 @@ size_change_error:
- 	info.component_size = s->size*2;
- 	info.new_level = s->level;
- 	info.new_chunk = s->chunk * 1024;
--	if (info.array.level == LEVEL_CONTAINER) {
-+	if (is_container(info.array.level)) {
- 		info.delta_disks = UnSet;
- 		info.array.raid_disks = s->raiddisks;
- 	} else if (s->raiddisks)
-@@ -2344,7 +2344,7 @@ size_change_error:
- 				printf("layout for %s set to %d\n",
- 				       devname, array.layout);
- 		}
--	} else if (array.level == LEVEL_CONTAINER) {
-+	} else if (is_container(array.level)) {
- 		/* This change is to be applied to every array in the
- 		 * container.  This is only needed when the metadata imposes
- 		 * restraints of the various arrays in the container.
-diff --git a/Incremental.c b/Incremental.c
-index 4d0cd9d6..5a5f4c4c 100644
---- a/Incremental.c
-+++ b/Incremental.c
-@@ -244,7 +244,7 @@ int Incremental(struct mddev_dev *devlist, struct context *c,
- 		c->autof = ci->autof;
- 
- 	name_to_use = info.name;
--	if (name_to_use[0] == 0 && info.array.level == LEVEL_CONTAINER) {
-+	if (name_to_use[0] == 0 && is_container(info.array.level)) {
- 		name_to_use = info.text_version;
- 		trustworthy = METADATA;
- 	}
-@@ -472,7 +472,7 @@ int Incremental(struct mddev_dev *devlist, struct context *c,
- 
- 	/* 7/ Is there enough devices to possibly start the array? */
- 	/* 7a/ if not, finish with success. */
--	if (info.array.level == LEVEL_CONTAINER) {
-+	if (is_container(info.array.level)) {
- 		char devnm[32];
- 		/* Try to assemble within the container */
- 		sysfs_uevent(sra, "change");
-diff --git a/mdadm.h b/mdadm.h
-index 941a5f38..3673494e 100644
---- a/mdadm.h
-+++ b/mdadm.h
-@@ -1924,3 +1924,17 @@ enum r0layout {
-  * This is true for native and DDF, IMSM allows 16.
-  */
- #define MD_NAME_MAX 32
-+
-+/**
-+ * is_container() - check if @level is &LEVEL_CONTAINER
-+ * @level: level value
-+ *
-+ * return:
-+ * 1 if level is equal to &LEVEL_CONTAINER, 0 otherwise.
-+ */
-+static inline int is_container(const int level)
-+{
-+	if (level == LEVEL_CONTAINER)
-+		return 1;
-+	return 0;
-+}
-diff --git a/super-ddf.c b/super-ddf.c
-index 949e7d15..9d1e3b94 100644
---- a/super-ddf.c
-+++ b/super-ddf.c
-@@ -3325,7 +3325,7 @@ validate_geometry_ddf_container(struct supertype *st,
- 	int fd;
- 	unsigned long long ldsize;
- 
--	if (level != LEVEL_CONTAINER)
-+	if (!is_container(level))
- 		return 0;
- 	if (!dev)
- 		return 1;
-@@ -3371,7 +3371,7 @@ static int validate_geometry_ddf(struct supertype *st,
- 
- 	if (level == LEVEL_NONE)
- 		level = LEVEL_CONTAINER;
--	if (level == LEVEL_CONTAINER) {
-+	if (is_container(level)) {
- 		/* Must be a fresh device to add to a container */
- 		return validate_geometry_ddf_container(st, level, raiddisks,
- 						       data_offset, dev,
-@@ -3488,7 +3488,7 @@ static int validate_geometry_ddf_bvd(struct supertype *st,
- 	struct dl *dl;
- 	unsigned long long maxsize;
- 	/* ddf/bvd supports lots of things, but not containers */
--	if (level == LEVEL_CONTAINER) {
-+	if (is_container(level)) {
- 		if (verbose)
- 			pr_err("DDF cannot create a container within an container\n");
- 		return 0;
-diff --git a/super-intel.c b/super-intel.c
-index 4d82af3d..b0565610 100644
---- a/super-intel.c
-+++ b/super-intel.c
-@@ -6727,7 +6727,7 @@ static int validate_geometry_imsm_container(struct supertype *st, int level,
- 	struct intel_super *super = NULL;
- 	int rv = 0;
- 
--	if (level != LEVEL_CONTAINER)
-+	if (!is_container(level))
- 		return 0;
- 	if (!dev)
- 		return 1;
-@@ -7692,7 +7692,7 @@ static int validate_geometry_imsm(struct supertype *st, int level, int layout,
- 	 * if given unused devices create a container
- 	 * if given given devices in a container create a member volume
- 	 */
--	if (level == LEVEL_CONTAINER)
-+	if (is_container(level))
- 		/* Must be a fresh device to add to a container */
- 		return validate_geometry_imsm_container(st, level, raiddisks,
- 							data_offset, dev,
-diff --git a/super0.c b/super0.c
-index 37f595ed..93876e2e 100644
---- a/super0.c
-+++ b/super0.c
-@@ -1273,7 +1273,7 @@ static int validate_geometry0(struct supertype *st, int level,
- 	if (get_linux_version() < 3001000)
- 		tbmax = 2;
- 
--	if (level == LEVEL_CONTAINER) {
-+	if (is_container(level)) {
- 		if (verbose)
- 			pr_err("0.90 metadata does not support containers\n");
- 		return 0;
-diff --git a/super1.c b/super1.c
-index 58345e68..0b505a7e 100644
---- a/super1.c
-+++ b/super1.c
-@@ -2830,7 +2830,7 @@ static int validate_geometry1(struct supertype *st, int level,
- 	unsigned long long overhead;
- 	int fd;
- 
--	if (level == LEVEL_CONTAINER) {
-+	if (is_container(level)) {
- 		if (verbose)
- 			pr_err("1.x metadata does not support containers\n");
- 		return 0;
-diff --git a/sysfs.c b/sysfs.c
-index 0d98a65f..ca1d888f 100644
---- a/sysfs.c
-+++ b/sysfs.c
-@@ -763,7 +763,7 @@ int sysfs_add_disk(struct mdinfo *sra, struct mdinfo *sd, int resume)
- 
- 	rv = sysfs_set_num(sra, sd, "offset", sd->data_offset);
- 	rv |= sysfs_set_num(sra, sd, "size", (sd->component_size+1) / 2);
--	if (sra->array.level != LEVEL_CONTAINER) {
-+	if (!is_container(sra->array.level)) {
- 		if (sra->consistency_policy == CONSISTENCY_POLICY_PPL) {
- 			rv |= sysfs_set_num(sra, sd, "ppl_sector", sd->ppl_sector);
- 			rv |= sysfs_set_num(sra, sd, "ppl_size", sd->ppl_size);
--- 
-2.38.1
-

SOURCES/0061-Mdmonitor-Omit-non-md-devices.patch

@@ -1,58 +0,0 @@
-From 8b668d4aa3305af5963162b7499b128bd71f8f29 Mon Sep 17 00:00:00 2001
-From: Lukasz Florczak <lukasz.florczak@linux.intel.com>
-Date: Thu, 22 Sep 2022 08:29:50 +0200
-Subject: [PATCH 61/83] Mdmonitor: Omit non-md devices
-
-Fix segfault commit [1] introduced check whether given device is
-mddevice, but it happend to terminate Mdmonitor if at least one of given
-devices didn't fulfill that condition. In result Mdmonitor service was
-no longer started on boot (with --scan option) when config contained some
-non-existent array entry.
-
-This commit introduces ommiting non-md devices so scan option can still
-be used when config is wrong and allow Mdmonitor service to run on boot.
-
-Giving a list of devices to monitor containing non-existing or
-non-md devices will result in monitoring only confirmed mddevices.
-
-[1] https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?id=e702f392959d1c2ad2089e595b52235ed97b4e18
-
-Signed-off-by: Lukasz Florczak <lukasz.florczak@linux.intel.com>
-Signed-off-by: Jes Sorensen <jsorensen@fb.com>
----
- Monitor.c | 12 ++++--------
- 1 file changed, 4 insertions(+), 8 deletions(-)
-
-diff --git a/Monitor.c b/Monitor.c
-index b4e954c6..7d7dc4d2 100644
---- a/Monitor.c
-+++ b/Monitor.c
-@@ -185,10 +185,8 @@ int Monitor(struct mddev_dev *devlist,
- 				continue;
- 			if (strcasecmp(mdlist->devname, "<ignore>") == 0)
- 				continue;
--			if (!is_mddev(mdlist->devname)) {
--				free_statelist(statelist);
--				return 1;
--			}
-+			if (!is_mddev(mdlist->devname))
-+				continue;
- 
- 			st = xcalloc(1, sizeof *st);
- 			snprintf(st->devname, MD_NAME_MAX + sizeof("/dev/md/"),
-@@ -208,10 +206,8 @@ int Monitor(struct mddev_dev *devlist,
- 		for (dv = devlist; dv; dv = dv->next) {
- 			struct state *st;
- 
--			if (!is_mddev(dv->devname)) {
--				free_statelist(statelist);
--				return 1;
--			}
-+			if (!is_mddev(dv->devname))
-+				continue;
- 
- 			st = xcalloc(1, sizeof *st);
- 			mdlist = conf_get_ident(dv->devname);
--- 
-2.38.1
-