]> git.ipfire.org Git - thirdparty/mdadm.git/commitdiff
Monitor/check_array: Get 'failed_disks' from sysfs
authorJes Sorensen <jsorensen@fb.com>
Tue, 9 May 2017 20:54:19 +0000 (16:54 -0400)
committerJes Sorensen <jsorensen@fb.com>
Tue, 9 May 2017 20:54:19 +0000 (16:54 -0400)
Signed-off-by: Jes Sorensen <jsorensen@fb.com>
Monitor.c

index b94fd7c5be5bb0ed7d24186bc9763fc0b01777c6..9456efdb9a9c5e3808abd9ce0d89ccd0496a875a 100644 (file)
--- a/Monitor.c
+++ b/Monitor.c
@@ -481,7 +481,8 @@ static int check_array(struct state *st, struct mdstat_ent *mdstat,
        if (st->devnm[0] == 0)
                strcpy(st->devnm, fd2devnm(fd));
 
-       sra = sysfs_read(-1, st->devnm, GET_LEVEL | GET_MISMATCH);
+       sra = sysfs_read(-1, st->devnm, GET_LEVEL | GET_DEGRADED |
+                        GET_MISMATCH);
        if (!sra)
                goto disappeared;
 
@@ -522,7 +523,7 @@ static int check_array(struct state *st, struct mdstat_ent *mdstat,
                alert("NewArray", st->devname, NULL, ainfo);
        }
 
-       if (st->utime == array.utime && st->failed == array.failed_disks &&
+       if (st->utime == array.utime && st->failed == sra->array.failed_disks &&
            st->working == array.working_disks &&
            st->spare == array.spare_disks &&
            (mse == NULL  || (mse->percent == st->percent))) {
@@ -638,7 +639,7 @@ static int check_array(struct state *st, struct mdstat_ent *mdstat,
        st->active = array.active_disks;
        st->working = array.working_disks;
        st->spare = array.spare_disks;
-       st->failed = array.failed_disks;
+       st->failed = sra->array.failed_disks;
        st->utime = array.utime;
        st->raid = array.raid_disks;
        st->err = 0;