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
106 lines
3.9 KiB
Diff
106 lines
3.9 KiB
Diff
From 36a707824eb1dafbb990f5daf1cbbe0e37dbbefb Mon Sep 17 00:00:00 2001
|
|
From: Kinga Tanska <kinga.tanska@intel.com>
|
|
Date: Thu, 5 Jan 2023 06:31:25 +0100
|
|
Subject: [PATCH] manage: move comment with function description
|
|
|
|
Move the function description from the function body to outside
|
|
to obey kernel coding style.
|
|
|
|
Signed-off-by: Kinga Tanska <kinga.tanska@intel.com>
|
|
Acked-by: Coly Li <colyli@suse.de>
|
|
Signed-off-by: Jes Sorensen <jes@trained-monkey.org>
|
|
---
|
|
Manage.c | 72 ++++++++++++++++++++++++++++++++++----------------------
|
|
1 file changed, 44 insertions(+), 28 deletions(-)
|
|
|
|
diff --git a/Manage.c b/Manage.c
|
|
index 6184d3f..fde6aba 100644
|
|
--- a/Manage.c
|
|
+++ b/Manage.c
|
|
@@ -1327,38 +1327,54 @@ bool is_remove_safe(mdu_array_info_t *array, const int fd, char *devname, const
|
|
return is_enough;
|
|
}
|
|
|
|
+/**
|
|
+ * Manage_subdevs() - Execute operation depending on devmode.
|
|
+ *
|
|
+ * @devname: name of the device.
|
|
+ * @fd: file descriptor.
|
|
+ * @devlist: list of sub-devices to manage.
|
|
+ * @verbose: verbose level.
|
|
+ * @test: test flag.
|
|
+ * @update: type of update.
|
|
+ * @force: force flag.
|
|
+ *
|
|
+ * This function executes operation defined by devmode
|
|
+ * for each dev from devlist.
|
|
+ * Devmode can be:
|
|
+ * 'a' - add the device
|
|
+ * 'S' - add the device as a spare - don't try re-add
|
|
+ * 'j' - add the device as a journal device
|
|
+ * 'A' - re-add the device
|
|
+ * 'r' - remove the device: HOT_REMOVE_DISK
|
|
+ * device can be 'faulty' or 'detached' in which case all
|
|
+ * matching devices are removed.
|
|
+ * '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.
|
|
+ * -----
|
|
+ * 'w' - 'W' will be changed to 'w' when it is paired with
|
|
+ * a 'R' device. If a 'W' is found while walking the list
|
|
+ * it must be unpaired, and is an error.
|
|
+ * 'M' - this is created by a 'missing' target. It is a slight
|
|
+ * variant on 'A'
|
|
+ * 'F' - Another variant of 'A', where the device was faulty
|
|
+ * so must be removed from the array first.
|
|
+ * 'c' - confirm the device as found (for clustered environments)
|
|
+ *
|
|
+ * For 'f' and 'r', the device can also be a kernel-internal
|
|
+ * name such as 'sdb'.
|
|
+ *
|
|
+ * Return: 0 on success, otherwise 1 or 2.
|
|
+ */
|
|
int Manage_subdevs(char *devname, int fd,
|
|
struct mddev_dev *devlist, int verbose, int test,
|
|
enum update_opt update, int force)
|
|
{
|
|
- /* Do something to each dev.
|
|
- * devmode can be
|
|
- * 'a' - add the device
|
|
- * 'S' - add the device as a spare - don't try re-add
|
|
- * 'j' - add the device as a journal device
|
|
- * 'A' - re-add the device
|
|
- * 'r' - remove the device: HOT_REMOVE_DISK
|
|
- * device can be 'faulty' or 'detached' in which case all
|
|
- * matching devices are removed.
|
|
- * 'f' - set the device faulty SET_DISK_FAULTY
|
|
- * device can be 'detached' in which case any device that
|
|
- * is inaccessible will be marked faulty.
|
|
- * 'R' - mark this device as wanting replacement.
|
|
- * 'W' - this device is added if necessary and activated as
|
|
- * a replacement for a previous 'R' device.
|
|
- * -----
|
|
- * 'w' - 'W' will be changed to 'w' when it is paired with
|
|
- * a 'R' device. If a 'W' is found while walking the list
|
|
- * it must be unpaired, and is an error.
|
|
- * 'M' - this is created by a 'missing' target. It is a slight
|
|
- * variant on 'A'
|
|
- * 'F' - Another variant of 'A', where the device was faulty
|
|
- * so must be removed from the array first.
|
|
- * 'c' - confirm the device as found (for clustered environments)
|
|
- *
|
|
- * For 'f' and 'r', the device can also be a kernel-internal
|
|
- * name such as 'sdb'.
|
|
- */
|
|
mdu_array_info_t array;
|
|
unsigned long long array_size;
|
|
struct mddev_dev *dv;
|
|
--
|
|
2.35.3
|
|
|