]> git.ipfire.org Git - thirdparty/mdadm.git/commitdiff
Merge https://github.com/makelinux/mdadm
authorNeilBrown <neilb@suse.com>
Mon, 21 Dec 2015 01:57:06 +0000 (12:57 +1100)
committerNeilBrown <neilb@suse.com>
Mon, 21 Dec 2015 01:57:06 +0000 (12:57 +1100)
Fixes https://github.com/neilbrown/mdadm/issues/17

Detail.c

index ef2aabd47e8a1f8d6e30300789d7cf6b007d71ee..5bd2dc641ff7d9618f3b500930e7c679c080eb94 100644 (file)
--- a/Detail.c
+++ b/Detail.c
@@ -340,7 +340,8 @@ int Detail(char *dev, struct context *c)
                    (disks[d*2+1].state & (1<<MD_DISK_SYNC))) {
                        avail_disks ++;
                        avail[d] = 1;
-               }
+               } else
+                       rv |= !! c->test;
        }
 
        if (c->brief) {
@@ -676,9 +677,6 @@ This is pretty boring
                        }
                }
                if (disk.state == 0) spares++;
-               if (c->test && d < array.raid_disks
-                   && !(disk.state & (1<<MD_DISK_SYNC)))
-                       rv |= 1;
                dv=map_dev_preferred(disk.major, disk.minor, 0, c->prefer);
                if (dv != NULL) {
                        if (c->brief)