You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
45 lines
1.2 KiB
45 lines
1.2 KiB
6 years ago
|
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: [RHEL7.5 PATCH 046/169] 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.7.4
|
||
|
|
|