|
 |
b7f731 |
From 48bc2ade86db576036375184774a3ebadf6a22e3 Mon Sep 17 00:00:00 2001
|
|
|
b7f731 |
From: Jes Sorensen <jsorensen@fb.com>
|
|
|
b7f731 |
Date: Tue, 9 May 2017 16:52:44 -0400
|
|
|
b7f731 |
Subject: [RHEL7.5 PATCH 129/169] Monitor/check_array: Obtain RAID level
|
|
|
b7f731 |
from syfs
|
|
|
b7f731 |
|
|
|
b7f731 |
Signed-off-by: Jes Sorensen <jsorensen@fb.com>
|
|
|
b7f731 |
---
|
|
|
b7f731 |
Monitor.c | 6 +++---
|
|
|
b7f731 |
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
b7f731 |
|
|
|
b7f731 |
diff --git a/Monitor.c b/Monitor.c
|
|
|
b7f731 |
index 75aea91..b94fd7c 100644
|
|
|
b7f731 |
--- a/Monitor.c
|
|
|
b7f731 |
+++ b/Monitor.c
|
|
|
b7f731 |
@@ -481,14 +481,14 @@ static int check_array(struct state *st, struct mdstat_ent *mdstat,
|
|
|
b7f731 |
if (st->devnm[0] == 0)
|
|
|
b7f731 |
strcpy(st->devnm, fd2devnm(fd));
|
|
|
b7f731 |
|
|
|
b7f731 |
- sra = sysfs_read(-1, st->devnm, GET_MISMATCH);
|
|
|
b7f731 |
+ sra = sysfs_read(-1, st->devnm, GET_LEVEL | GET_MISMATCH);
|
|
|
b7f731 |
if (!sra)
|
|
|
b7f731 |
goto disappeared;
|
|
|
b7f731 |
|
|
|
b7f731 |
/* It's much easier to list what array levels can't
|
|
|
b7f731 |
* have a device disappear than all of them that can
|
|
|
b7f731 |
*/
|
|
|
b7f731 |
- if (array.level == 0 || array.level == -1) {
|
|
|
b7f731 |
+ if (sra->array.level == 0 || sra->array.level == -1) {
|
|
|
b7f731 |
if (!st->err && !st->from_config)
|
|
|
b7f731 |
alert("DeviceDisappeared", dev, " Wrong-Level", ainfo);
|
|
|
b7f731 |
st->err++;
|
|
|
b7f731 |
@@ -566,7 +566,7 @@ static int check_array(struct state *st, struct mdstat_ent *mdstat,
|
|
|
b7f731 |
char cnt[80];
|
|
|
b7f731 |
snprintf(cnt, sizeof(cnt),
|
|
|
b7f731 |
" mismatches found: %d (on raid level %d)",
|
|
|
b7f731 |
- sra->mismatch_cnt, array.level);
|
|
|
b7f731 |
+ sra->mismatch_cnt, sra->array.level);
|
|
|
b7f731 |
alert("RebuildFinished", dev, cnt, ainfo);
|
|
|
b7f731 |
} else
|
|
|
b7f731 |
alert("RebuildFinished", dev, NULL, ainfo);
|
|
|
b7f731 |
--
|
|
|
b7f731 |
2.7.4
|
|
|
b7f731 |
|