From: NeilBrown <neilb@suse.com>
Date: Mon, 21 Dec 2015 01:57:06 +0000 (+1100)
Subject: Merge https://github.com/makelinux/mdadm
X-Git-Tag: mdadm-3.4~24
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9da5a4897d392b4489689f548ea2b865e6f4b6e2;hp=-c;p=thirdparty%2Fmdadm.git

Merge https://github.com/makelinux/mdadm

Fixes https://github.com/neilbrown/mdadm/issues/17
---

9da5a4897d392b4489689f548ea2b865e6f4b6e2
diff --combined Detail.c
index ef2aabd4,7eb6bd5e..5bd2dc64
--- a/Detail.c
+++ b/Detail.c
@@@ -299,8 -299,7 +299,8 @@@ int Detail(char *dev, struct context *c
  	for (d = 0; d < max_disks * 2; d++) {
  		disks[d].state = (1<<MD_DISK_REMOVED);
  		disks[d].major = disks[d].minor = 0;
 -		disks[d].number = disks[d].raid_disk = d;
 +		disks[d].number = -1;
 +		disks[d].raid_disk = d/2;
  	}
  
  	next = array.raid_disks*2;
@@@ -340,7 -339,8 +340,8 @@@
  		    (disks[d*2+1].state & (1<<MD_DISK_SYNC))) {
  			avail_disks ++;
  			avail[d] = 1;
- 		}
+ 		} else
+ 			rv |= !! c->test;
  	}
  
  	if (c->brief) {
@@@ -623,9 -623,6 +624,9 @@@ This is pretty borin
  			else if (disk.raid_disk < 0)
  				printf("   %5d   %5d    %5d        -     ",
  				       disk.number, disk.major, disk.minor);
 +			else if (disk.number < 0)
 +				printf("       -   %5d    %5d    %5d     ",
 +				       disk.major, disk.minor, disk.raid_disk);
  			else
  				printf("   %5d   %5d    %5d    %5d     ",
  				       disk.number, disk.major, disk.minor, disk.raid_disk);
@@@ -676,9 -673,6 +677,6 @@@
  			}
  		}
  		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)