Monitor/check_array: Use working_disks from sysfs

[thirdparty/mdadm.git] / Monitor.c

diff --git a/Monitor.c b/Monitor.c
index f4040099693583fe0fa9330375379e1cecbf1ad6..5b9584788f5734ae33909640e8b1fc7f922bd08f 100644 (file)
--- a/Monitor.c
+++ b/Monitor.c
@@ -451,6 +451,7 @@ static int check_array(struct state *st, struct mdstat_ent *mdstat,
         * '1' if the array is degraded, or '0' if it is optimal (or dead).
         */
        struct { int state, major, minor; } info[MAX_DISKS];
+       struct mdinfo *sra = NULL;
        mdu_array_info_t array;
        struct mdstat_ent *mse = NULL, *mse2;
        char *dev = st->devname;
@@ -467,41 +468,33 @@ static int check_array(struct state *st, struct mdstat_ent *mdstat,
        retval = 0;
 
        fd = open(dev, O_RDONLY);
-       if (fd < 0) {
-               if (!st->err)
-                       alert("DeviceDisappeared", dev, NULL, ainfo);
-               st->err++;
-               goto out;
-       }
+       if (fd < 0)
+               goto disappeared;
 
-       if (!md_array_active(fd)) {
-               close(fd);
-               if (!st->err)
-                       alert("DeviceDisappeared", dev, NULL, ainfo);
-               st->err++;
-               goto out;
-       }
+       if (!md_array_active(fd))
+               goto disappeared;
 
        fcntl(fd, F_SETFD, FD_CLOEXEC);
-       if (md_get_array_info(fd, &array) < 0) {
-               if (!st->err)
-                       alert("DeviceDisappeared", dev, NULL, ainfo);
-               st->err++;
-               close(fd);
-               goto out;
-       }
+       if (md_get_array_info(fd, &array) < 0)
+               goto disappeared;
+
+       if (st->devnm[0] == 0)
+               strcpy(st->devnm, fd2devnm(fd));
+
+       sra = sysfs_read(-1, st->devnm, GET_LEVEL | GET_DISKS | GET_DEGRADED |
+                        GET_MISMATCH | GET_DEVS | GET_STATE);
+       if (!sra)
+               goto disappeared;
+
        /* It's much easier to list what array levels can't
         * have a device disappear than all of them that can
         */
-       if (array.level == 0 || array.level == -1) {
+       if (sra->array.level == 0 || sra->array.level == -1) {
                if (!st->err && !st->from_config)
                        alert("DeviceDisappeared", dev, " Wrong-Level", ainfo);
                st->err++;
-               close(fd);
                goto out;
        }
-       if (st->devnm[0] == 0)
-               strcpy(st->devnm, fd2devnm(fd));
 
        for (mse2 = mdstat ; mse2 ; mse2=mse2->next)
                if (strcmp(mse2->devnm, st->devnm) == 0) {
@@ -530,11 +523,10 @@ 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 &&
-           st->working == array.working_disks &&
-           st->spare == array.spare_disks &&
+       if (st->utime == array.utime && st->failed == sra->array.failed_disks &&
+           st->working == sra->array.working_disks &&
+           st->spare == sra->array.spare_disks &&
            (mse == NULL  || (mse->percent == st->percent))) {
-               close(fd);
                if ((st->active < st->raid) && st->spare == 0)
                        retval = 1;
                goto out;
@@ -543,8 +535,8 @@ static int check_array(struct state *st, struct mdstat_ent *mdstat,
            mse->pattern && strchr(mse->pattern, '_') /* degraded */)
                alert("DegradedArray", dev, NULL, ainfo);
 
-       if (st->utime == 0 && /* new array */
-           st->expected_spares > 0 && array.spare_disks < st->expected_spares)
+       if (st->utime == 0 && /* new array */ st->expected_spares > 0 &&
+           sra->array.spare_disks < st->expected_spares)
                alert("SparesMissing", dev, NULL, ainfo);
        if (st->percent < 0 && st->percent != RESYNC_UNKNOWN &&
            mse->percent >= 0)
@@ -571,22 +563,18 @@ static int check_array(struct state *st, struct mdstat_ent *mdstat,
                 * If there is a number in /mismatch_cnt,
                 * we should report that.
                 */
-               struct mdinfo *sra =
-                       sysfs_read(-1, st->devnm, GET_MISMATCH);
                if (sra && sra->mismatch_cnt > 0) {
                        char cnt[80];
                        snprintf(cnt, sizeof(cnt),
                                 " mismatches found: %d (on raid level %d)",
-                               sra->mismatch_cnt, array.level);
+                               sra->mismatch_cnt, sra->array.level);
                        alert("RebuildFinished", dev, cnt, ainfo);
                } else
                        alert("RebuildFinished", dev, NULL, ainfo);
-               if (sra)
-                       sysfs_free(sra);
        }
        st->percent = mse->percent;
 
-       remaining_disks = array.nr_disks;
+       remaining_disks = sra->array.nr_disks;
        for (i = 0; i < MAX_DISKS && remaining_disks > 0; i++) {
                mdu_disk_info_t disc;
                disc.number = i;
@@ -614,8 +602,6 @@ static int check_array(struct state *st, struct mdstat_ent *mdstat,
        if (st->metadata == NULL && st->parent_devnm[0] == 0)
                st->metadata = super_by_fd(fd, NULL);
 
-       close(fd);
-
        for (i=0; i<MAX_DISKS; i++) {
                mdu_disk_info_t disc = {0,0,0,0,0};
                int newstate=0;
@@ -650,18 +636,28 @@ static int check_array(struct state *st, struct mdstat_ent *mdstat,
                st->devstate[i] = newstate;
                st->devid[i] = makedev(disc.major, disc.minor);
        }
-       st->active = array.active_disks;
-       st->working = array.working_disks;
-       st->spare = array.spare_disks;
-       st->failed = array.failed_disks;
+       st->active = sra->array.active_disks;
+       st->working = sra->array.working_disks;
+       st->spare = sra->array.spare_disks;
+       st->failed = sra->array.failed_disks;
        st->utime = array.utime;
-       st->raid = array.raid_disks;
+       st->raid = sra->array.raid_disks;
        st->err = 0;
        if ((st->active < st->raid) && st->spare == 0)
                retval = 1;
 
  out:
+       if (sra)
+               sysfs_free(sra);
+       if (fd > 0)
+               close(fd);
        return retval;
+
+ disappeared:
+       if (!st->err)
+               alert("DeviceDisappeared", dev, NULL, ainfo);
+       st->err++;
+       goto out;
 }
 
 static int add_new_arrays(struct mdstat_ent *mdstat, struct state **statelist,