850cf2857b
- SLE15 continues to use mdadm-4.0, synchronize mdadm package from
SLE12-SP3 to SLE15, re-order all patches.
- Rename the following patches, they are deleted and re-add in next
part of patches
0001-Generic-support-for-consistency-policy-and-PPL.patch
0002-Detail-show-consistency-policy.patch
0002-The-mdcheck-script-now-adds-messages-to-the-system.patch
0003-imsm-PPL-support.patch
0004-super1-PPL-support.patch
0005-Add-ppl-and-no-ppl-options-for-update.patch
0006-Grow-support-consistency-policy-change.patch
0007-udev-md-raid-assembly.rules-Skip-non-ready-devices.patch
0008-Retry-HOT_REMOVE_DISK-a-few-times.patch
0009-Introduce-sys_hot_remove_disk.patch
0010-Add-force-flag-to-hot_remove_disk.patch
0011-Detail-handle-non-existent-arrays-better.patch
- Synchronize patches from mdadm of SLE12-SP3, the above renamed
patches are re-add here,
0001-Makefile-Fix-date-to-be-output-in-ISO-format.patch
0002-imsm-fix-missing-error-message-during-migration.patch
0003-Fix-oddity-where-mdadm-did-not-recognise-a-relative-.patch
0004-mdadm-check-the-nodes-when-operate-clustered-array.patch
0005-examine-tidy-up-some-code.patch
0006-mdadm-add-man-page-for-symlinks.patch
0007-mdadm-add-checking-clustered-bitmap-in-assemble-mode.patch
0008-mdadm-Add-Wimplicit-fallthrough-0-in-Makefile.patch
0009-mdadm-Specify-enough-length-when-write-to-buffer.patch
0010-mdadm-it-doesn-t-make-sense-to-set-bitmap-twice.patch
0011-mdadm-Monitor-Fix-NULL-pointer-dereference-when-stat.patch
0012-Replace-snprintf-with-strncpy-at-some-places-to-avoi.patch
OBS-URL: https://build.opensuse.org/request/show/517978
OBS-URL: https://build.opensuse.org/package/show/Base:System/mdadm?expand=0&rev=150
46 lines
1.6 KiB
Diff
46 lines
1.6 KiB
Diff
From aa3131183661955de112fa7d9824207de63d9fa5 Mon Sep 17 00:00:00 2001
|
|
From: Gioh Kim <gi-oh.kim@profitbricks.com>
|
|
Date: Wed, 29 Mar 2017 11:40:33 +0200
|
|
Subject: [PATCH] super1: replace hard-coded values with bit definitions
|
|
|
|
Some hard-coded values for disk status are replaced
|
|
with bit definitions.
|
|
|
|
Signed-off-by: Gioh Kim <gi-oh.kim@profitbricks.com>
|
|
Signed-off-by: Jes Sorensen <Jes.Sorensen@gmail.com>
|
|
---
|
|
super1.c | 7 ++++---
|
|
1 file changed, 4 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/super1.c b/super1.c
|
|
index e76f777..6f91611 100644
|
|
--- a/super1.c
|
|
+++ b/super1.c
|
|
@@ -1040,7 +1040,7 @@ static void getinfo_super1(struct supertype *st, struct mdinfo *info, char *map)
|
|
info->disk.state = 0; /* spare: not active, not sync, not faulty */
|
|
break;
|
|
case MD_DISK_ROLE_FAULTY:
|
|
- info->disk.state = 1; /* faulty */
|
|
+ info->disk.state = (1 << MD_DISK_FAULTY); /* faulty */
|
|
break;
|
|
case MD_DISK_ROLE_JOURNAL:
|
|
info->disk.state = (1 << MD_DISK_JOURNAL);
|
|
@@ -1600,11 +1600,12 @@ static int add_to_super1(struct supertype *st, mdu_disk_info_t *dk,
|
|
}
|
|
|
|
dk_state = dk->state & ~(1<<MD_DISK_FAILFAST);
|
|
- if ((dk_state & 6) == 6) /* active, sync */
|
|
+ if ((dk_state & (1<<MD_DISK_ACTIVE)) &&
|
|
+ (dk_state & (1<<MD_DISK_SYNC)))/* active, sync */
|
|
*rp = __cpu_to_le16(dk->raid_disk);
|
|
else if (dk_state & (1<<MD_DISK_JOURNAL))
|
|
*rp = MD_DISK_ROLE_JOURNAL;
|
|
- else if ((dk_state & ~2) == 0) /* active or idle -> spare */
|
|
+ else if ((dk_state & ~(1<<MD_DISK_ACTIVE)) == 0) /* active or idle -> spare */
|
|
*rp = MD_DISK_ROLE_SPARE;
|
|
else
|
|
*rp = MD_DISK_ROLE_FAULTY;
|
|
--
|
|
2.10.2
|
|
|