1c8fb911e6
- 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
50 lines
1.6 KiB
Diff
50 lines
1.6 KiB
Diff
From 91c97c5432028875db5f8abeddb5cb5f31902001 Mon Sep 17 00:00:00 2001
|
|
From: Mariusz Tkaczyk <mariusz.tkaczyk@intel.com>
|
|
Date: Mon, 15 Jul 2019 09:25:35 +0200
|
|
Subject: [PATCH] imsm: close removed drive fd.
|
|
Git-commit: 91c97c5432028875db5f8abeddb5cb5f31902001
|
|
Patch-mainline: mdadm-4.1+
|
|
References: jsc#SLE-10078, jsc#SLE-9348
|
|
|
|
When member drive fails, managemon prepares metadata update and adds
|
|
the drive to disk_mgmt_list with DISK_REMOVE flag. It fills only
|
|
minor and major. It is enough to recognize the device later.
|
|
|
|
Monitor thread while processing this update will remove the drive from
|
|
super only if it is a spare. It never removes failed member from
|
|
disks list. As a result, it still keeps opened descriptor to
|
|
non-existing device.
|
|
|
|
If removed drive is not a spare fill fd in disk_cfg structure
|
|
(prepared by managemon), monitor will close fd during freeing it.
|
|
|
|
Also set this drive fd to -1 in super to avoid double closing because
|
|
monitor will close the fd (if needed) while replacing removed drive
|
|
in array.
|
|
|
|
Signed-off-by: Mariusz Tkaczyk <mariusz.tkaczyk@intel.com>
|
|
Signed-off-by: Jes Sorensen <jsorensen@fb.com>
|
|
Signed-off-by: Coly Li <colyli@suse.de>
|
|
|
|
---
|
|
super-intel.c | 3 +++
|
|
1 file changed, 3 insertions(+)
|
|
|
|
diff --git a/super-intel.c b/super-intel.c
|
|
index d7e8a65..a103a3f 100644
|
|
--- a/super-intel.c
|
|
+++ b/super-intel.c
|
|
@@ -9200,6 +9200,9 @@ static int add_remove_disk_update(struct intel_super *super)
|
|
remove_disk_super(super,
|
|
disk_cfg->major,
|
|
disk_cfg->minor);
|
|
+ } else {
|
|
+ disk_cfg->fd = disk->fd;
|
|
+ disk->fd = -1;
|
|
}
|
|
}
|
|
/* release allocate disk structure */
|
|
--
|
|
2.25.0
|
|
|