|
 |
2c1b57 |
From cb91230c87e02bf885759e9218abea629ab9f4b9 Mon Sep 17 00:00:00 2001
|
|
|
2c1b57 |
From: Tomasz Majchrzak <tomasz.majchrzak@intel.com>
|
|
|
2c1b57 |
Date: Mon, 19 Jun 2017 11:19:53 +0200
|
|
|
2c1b57 |
Subject: [RHEL7.5 PATCH 158/169] Monitor: don't assume mdadm parameter is
|
|
|
2c1b57 |
a block device
|
|
|
2c1b57 |
|
|
|
2c1b57 |
If symlink (e.g. /dev/md/raid) is passed as a parameter to mdadm --wait,
|
|
|
2c1b57 |
it fails as it's not able to find a corresponding entry in /proc/mdstat
|
|
|
2c1b57 |
output. Get parameter file major:minor and look for block device name in
|
|
|
2c1b57 |
sysfs. This commit is partial revert of commit 9e04ac1c43e6
|
|
|
2c1b57 |
("mdadm/util: unify stat checking blkdev into function").
|
|
|
2c1b57 |
|
|
|
2c1b57 |
Signed-off-by: Tomasz Majchrzak <tomasz.majchrzak@intel.com>
|
|
|
2c1b57 |
Signed-off-by: Jes Sorensen <jsorensen@fb.com>
|
|
|
2c1b57 |
---
|
|
|
2c1b57 |
Monitor.c | 13 +++++++++++--
|
|
|
2c1b57 |
1 file changed, 11 insertions(+), 2 deletions(-)
|
|
|
2c1b57 |
|
|
|
2c1b57 |
diff --git a/Monitor.c b/Monitor.c
|
|
|
2c1b57 |
index bef2f1b..48c451c 100644
|
|
|
2c1b57 |
--- a/Monitor.c
|
|
|
2c1b57 |
+++ b/Monitor.c
|
|
|
2c1b57 |
@@ -982,12 +982,21 @@ static void link_containers_with_subarrays(struct state *list)
|
|
|
2c1b57 |
int Wait(char *dev)
|
|
|
2c1b57 |
{
|
|
|
2c1b57 |
char devnm[32];
|
|
|
2c1b57 |
+ dev_t rdev;
|
|
|
2c1b57 |
+ char *tmp;
|
|
|
2c1b57 |
int rv = 1;
|
|
|
2c1b57 |
int frozen_remaining = 3;
|
|
|
2c1b57 |
|
|
|
2c1b57 |
- if (!stat_is_blkdev(dev, NULL))
|
|
|
2c1b57 |
+ if (!stat_is_blkdev(dev, &rdev))
|
|
|
2c1b57 |
+ return 2;
|
|
|
2c1b57 |
+
|
|
|
2c1b57 |
+ tmp = devid2devnm(rdev);
|
|
|
2c1b57 |
+ if (!tmp) {
|
|
|
2c1b57 |
+ pr_err("Cannot get md device name.\n");
|
|
|
2c1b57 |
return 2;
|
|
|
2c1b57 |
- strcpy(devnm, dev);
|
|
|
2c1b57 |
+ }
|
|
|
2c1b57 |
+
|
|
|
2c1b57 |
+ strcpy(devnm, tmp);
|
|
|
2c1b57 |
|
|
|
2c1b57 |
while(1) {
|
|
|
2c1b57 |
struct mdstat_ent *ms = mdstat_read(1, 0);
|
|
|
2c1b57 |
--
|
|
|
2c1b57 |
2.7.4
|
|
|
2c1b57 |
|