forked from pool/mdadm
702c57405a
run "mdadm --monitor" from systemd instead of init.d sciprt (bnc#849523) - remove mdadmd due to above. - udev-rules-try-mdadm-I-on-change-events.patch (bnc#851993) - policy-NULL-path-isn-t-really-acceptable-use-the-dev.patch - DDF-really-ignore-DDF-metadata-on-partitions.patch - Assemble-avoid-infinite-loop-when-auto-assembling-pa.patch - DDF-fix-detection-of-failed-devices-during-assembly.patch - Grow-fix-problems-with-prematurely-aborting-of-resha.patch - IMSM-don-t-crash-when-creating-an-array-with-missing.patch - mdmon-don-t-complain-about-notifying-parent-when-the.patch - systemd-mdmon-set-IMSM_NO_PLATFORM-1.patch - mdmon-.service-remove-over-ride-of-Standard-IO.patch Various upstream bug fixes. OBS-URL: https://build.opensuse.org/package/show/Base:System/mdadm?expand=0&rev=101
80 lines
3.1 KiB
Diff
80 lines
3.1 KiB
Diff
From f0e876ce03a63f150bb87b2734c139bc8bb285b2 Mon Sep 17 00:00:00 2001
|
|
From: NeilBrown <neilb@suse.de>
|
|
Date: Mon, 20 Jan 2014 15:27:29 +1100
|
|
Subject: [PATCH 08/13] DDF: fix detection of failed devices during assembly.
|
|
|
|
When we call "getinfo_super", we report the working/failed status
|
|
of the particular device, and also (via the 'map') the working/failed
|
|
status of every other device that this metadata is aware of.
|
|
|
|
It is important that the way we calculate "working or failed" is
|
|
consistent.
|
|
As it is, getinfo_super_ddf() will report a spare as "working", but
|
|
every other device will see it as "failed", which leads to failure to
|
|
assemble arrays with spares.
|
|
|
|
For getinfo_super_ddf (i.e. for the container), a device is assumed
|
|
"working" unless flagged as DDF_Failed.
|
|
For getinfo_super_ddf_bvd (for a member array), a device is assumed
|
|
"failed" unless DDF_Online is set, and DDF_Failed is not set.
|
|
|
|
Reported-by: "David F." <df7729@gmail.com>
|
|
Signed-off-by: NeilBrown <neilb@suse.de>
|
|
---
|
|
super-ddf.c | 18 ++++++++++++++----
|
|
1 file changed, 14 insertions(+), 4 deletions(-)
|
|
|
|
--- mdadm-3.3.orig/super-ddf.c
|
|
+++ mdadm-3.3/super-ddf.c
|
|
@@ -1914,6 +1914,7 @@ static void getinfo_super_ddf(struct sup
|
|
info->disk.major = 0;
|
|
info->disk.minor = 0;
|
|
if (ddf->dlist) {
|
|
+ struct phys_disk_entry *pde = NULL;
|
|
info->disk.number = be32_to_cpu(ddf->dlist->disk.refnum);
|
|
info->disk.raid_disk = find_phys(ddf, ddf->dlist->disk.refnum);
|
|
|
|
@@ -1921,12 +1922,19 @@ static void getinfo_super_ddf(struct sup
|
|
entries[info->disk.raid_disk].
|
|
config_size);
|
|
info->component_size = ddf->dlist->size - info->data_offset;
|
|
+ if (info->disk.raid_disk >= 0)
|
|
+ pde = ddf->phys->entries + info->disk.raid_disk;
|
|
+ if (pde &&
|
|
+ !(be16_to_cpu(pde->state) & DDF_Failed))
|
|
+ info->disk.state = (1 << MD_DISK_SYNC) | (1 << MD_DISK_ACTIVE);
|
|
+ else
|
|
+ info->disk.state = 1 << MD_DISK_FAULTY;
|
|
} else {
|
|
info->disk.number = -1;
|
|
info->disk.raid_disk = -1;
|
|
// info->disk.raid_disk = find refnum in the table and use index;
|
|
+ info->disk.state = (1 << MD_DISK_SYNC) | (1 << MD_DISK_ACTIVE);
|
|
}
|
|
- info->disk.state = (1 << MD_DISK_SYNC) | (1 << MD_DISK_ACTIVE);
|
|
|
|
info->recovery_start = MaxSector;
|
|
info->reshape_active = 0;
|
|
@@ -1944,8 +1952,6 @@ static void getinfo_super_ddf(struct sup
|
|
int i;
|
|
for (i = 0 ; i < map_disks; i++) {
|
|
if (i < info->array.raid_disks &&
|
|
- (be16_to_cpu(ddf->phys->entries[i].state)
|
|
- & DDF_Online) &&
|
|
!(be16_to_cpu(ddf->phys->entries[i].state)
|
|
& DDF_Failed))
|
|
map[i] = 1;
|
|
@@ -2018,7 +2024,11 @@ static void getinfo_super_ddf_bvd(struct
|
|
info->disk.raid_disk = cd + conf->sec_elmnt_seq
|
|
* be16_to_cpu(conf->prim_elmnt_count);
|
|
info->disk.number = dl->pdnum;
|
|
- info->disk.state = (1<<MD_DISK_SYNC)|(1<<MD_DISK_ACTIVE);
|
|
+ info->disk.state = 0;
|
|
+ if (info->disk.number >= 0 &&
|
|
+ (be16_to_cpu(ddf->phys->entries[info->disk.number].state) & DDF_Online) &&
|
|
+ !(be16_to_cpu(ddf->phys->entries[info->disk.number].state) & DDF_Failed))
|
|
+ info->disk.state = (1<<MD_DISK_SYNC)|(1<<MD_DISK_ACTIVE);
|
|
}
|
|
|
|
info->container_member = ddf->currentconf->vcnum;
|