6591f980b1
- 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
45 lines
1.2 KiB
Diff
45 lines
1.2 KiB
Diff
From 13428e2e76e8149336282d514908ced424f878a2 Mon Sep 17 00:00:00 2001
|
|
From: Gioh Kim <gi-oh.kim@profitbricks.com>
|
|
Date: Thu, 30 Mar 2017 18:58:13 +0200
|
|
Subject: [PATCH] mdadm.c: fix compile error "switch condition has boolean
|
|
value"
|
|
|
|
Remove a boolean expression in switch condition
|
|
to prevent compile error of some compilers,
|
|
for example, gcc version 5.2.1 20151010 (Ubuntu 5.2.1-22ubuntu2).
|
|
|
|
Signed-off-by: Gioh Kim <gi-oh.kim@profitbricks.com>
|
|
Signed-off-by: Jes Sorensen <Jes.Sorensen@gmail.com>
|
|
---
|
|
mdadm.c | 14 ++++++--------
|
|
1 file changed, 6 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/mdadm.c b/mdadm.c
|
|
index 0f32773..d6b5437 100644
|
|
--- a/mdadm.c
|
|
+++ b/mdadm.c
|
|
@@ -1965,14 +1965,12 @@ static int misc_list(struct mddev_dev *devlist,
|
|
rv |= SetAction(dv->devname, c->action);
|
|
continue;
|
|
}
|
|
- switch(dv->devname[0] == '/') {
|
|
- case 0:
|
|
- mdfd = open_dev(dv->devname);
|
|
- if (mdfd >= 0)
|
|
- break;
|
|
- case 1:
|
|
- mdfd = open_mddev(dv->devname, 1);
|
|
- }
|
|
+
|
|
+ if (dv->devname[0] != '/')
|
|
+ mdfd = open_dev(dv->devname);
|
|
+ if (dv->devname[0] == '/' || mdfd < 0)
|
|
+ mdfd = open_mddev(dv->devname, 1);
|
|
+
|
|
if (mdfd >= 0) {
|
|
switch(dv->disposition) {
|
|
case 'R':
|
|
--
|
|
2.12.0
|
|
|