2e35d7583b
- Update for latest mdadm-4.1+ patches, this is required by jsc#SLE-10078 and jsc#SLE-9348. Mostly the purpose is for latest Intel IMSM raid support. The following patches also include previous patches with new re-ordered prefix numbers. - Makefile: install mdadm_env.sh to /usr/lib/mdadm (bsc#1111960) 0000-Makefile-install-mdadm_env.sh-to-usr-lib-mdadm.patch - Assemble: keep MD_DISK_FAILFAST and MD_DISK_WRITEMOSTLY flag (jsc#SLE-10078, jsc#SLE-9348) 0001-Assemble-keep-MD_DISK_FAILFAST-and-MD_DISK_WRITEMOST.patch - Document PART-POLICY lines (jsc#SLE-10078, jsc#SLE-9348) 0002-Document-PART-POLICY-lines.patc - policy: support devices with multiple paths. (jsc#SLE-10078, jsc#SLE-9348) 0003-policy-support-devices-with-multiple-paths.patch - mdcheck: add systemd unit files to run mdcheck. (bsc#1115407) 0004-mdcheck-add-systemd-unit-files-to-run-mdcheck.patch - Monitor: add system timer to run --oneshot periodically (bsc#1115407) 0005-Monitor-add-system-timer-to-run-oneshot-periodically.patch - imsm: update metadata correctly while raid10 double (jsc#SLE-10078, jsc#SLE-9348) 0006-imsm-update-metadata-correctly-while-raid10-double-d.patch - Assemble: mask FAILFAST and WRITEMOSTLY flags when finding (jsc#SLE-10078, jsc#SLE-9348) 0007-Assemble-mask-FAILFAST-and-WRITEMOSTLY-flags-when-fi.patch - Grow: avoid overflow in compute_backup_blocks() (jsc#SLE-10078, jsc#SLE-9348) 0008-Grow-avoid-overflow-in-compute_backup_blocks.patch - Grow: report correct new chunk size. (jsc#SLE-10078, jsc#SLE-9348) 0009-Grow-report-correct-new-chunk-size.patch OBS-URL: https://build.opensuse.org/request/show/781064 OBS-URL: https://build.opensuse.org/package/show/Base:System/mdadm?expand=0&rev=181
47 lines
1.4 KiB
Diff
47 lines
1.4 KiB
Diff
From 02af379337c73e751ad97c0fed9123121f8b4289 Mon Sep 17 00:00:00 2001
|
|
From: Jes Sorensen <jsorensen@fb.com>
|
|
Date: Wed, 27 Nov 2019 10:19:54 -0500
|
|
Subject: [PATCH] Remove last traces of HOT_ADD_DISK
|
|
Git-commit: 02af379337c73e751ad97c0fed9123121f8b4289
|
|
Patch-mainline: mdadm-4.1+
|
|
References: jsc#SLE-10078, jsc#SLE-9348
|
|
|
|
This ioctl is no longer used, so remove all references to it.
|
|
|
|
Signed-off-by: Jes Sorensen <jsorensen@fb.com>
|
|
Signed-off-by: Coly Li <colyli@suse.de>
|
|
|
|
---
|
|
Manage.c | 2 --
|
|
md_u.h | 1 -
|
|
2 files changed, 3 deletions(-)
|
|
|
|
diff --git a/Manage.c b/Manage.c
|
|
index ffe55f8..deeba2b 100644
|
|
--- a/Manage.c
|
|
+++ b/Manage.c
|
|
@@ -1289,8 +1289,6 @@ int Manage_subdevs(char *devname, int fd,
|
|
/* Do something to each dev.
|
|
* devmode can be
|
|
* 'a' - add the device
|
|
- * try HOT_ADD_DISK
|
|
- * If that fails EINVAL, try ADD_NEW_DISK
|
|
* '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
|
|
diff --git a/md_u.h b/md_u.h
|
|
index 2d66d52..b30893c 100644
|
|
--- a/md_u.h
|
|
+++ b/md_u.h
|
|
@@ -28,7 +28,6 @@
|
|
#define ADD_NEW_DISK _IOW (MD_MAJOR, 0x21, mdu_disk_info_t)
|
|
#define HOT_REMOVE_DISK _IO (MD_MAJOR, 0x22)
|
|
#define SET_ARRAY_INFO _IOW (MD_MAJOR, 0x23, mdu_array_info_t)
|
|
-#define HOT_ADD_DISK _IO (MD_MAJOR, 0x28)
|
|
#define SET_DISK_FAULTY _IO (MD_MAJOR, 0x29)
|
|
#define SET_BITMAP_FILE _IOW (MD_MAJOR, 0x2b, int)
|
|
|
|
--
|
|
2.25.0
|
|
|