forked from pool/mdadm
90d4e6869d
- Update mdadm to latest upstream state upto commit
582945c2d3bb. (jsc#PED-7542)
1) The testing changes are not included here.
2) Code clean up, and more helper routines added for Manage.c,
Monitor.c, mdadm.c, ReadMe.c, super-intel.c, super0.c, super1.c,
Create.c, Incremental.c and so on.
3) Man page update for mdadm.8.in.
4) Several memory leak and double free fixes.
5) Check /etc/initrd-release for whether systemd running on an initrd.
- Manage: Block unsafe member failing
0062-Manage-Block-unsafe-member-failing.patch
- Mdmonitor: Split alert() into separate functions
0063-Mdmonitor-Split-alert-into-separate-functions.patch
- Monitor: block if monitor modes are combined.
0064-Monitor-block-if-monitor-modes-are-combined.patch
- Update mdadm Monitor manual.
0065-Update-mdadm-Monitor-manual.patch
- mdadm: create ident_init()
0066-mdadm-create-ident_init.patch
- mdadm: Add option validation for --update-subarray
0067-mdadm-Add-option-validation-for-update-subarray.patch
- Fix --update-subarray on active volume
0068-Fix-update-subarray-on-active-volume.patch
- Add code specific update options to enum.
0069-Add-code-specific-update-options-to-enum.patch
- super-ddf: Remove update_super_ddf.
0070-super-ddf-Remove-update_super_ddf.patch
- super0: refactor the code for enum
0071-super0-refactor-the-code-for-enum.patch
- super1: refactor the code for enum
OBS-URL: https://build.opensuse.org/request/show/1137473
OBS-URL: https://build.opensuse.org/package/show/Base:System/mdadm?expand=0&rev=231
92 lines
2.6 KiB
Diff
92 lines
2.6 KiB
Diff
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] 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 a142f8b..b1d0e63 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.35.3
|
|
|