Fix spare migration and other problems with --monitor.

2.6 broke --monitor in various ways, including spare migration
stopped working.  This fixes it.

2 files changed, 3 insertions, 0 deletions

diff --git a/Monitor.c b/Monitor.c
index ece6abb..9293637 100644
--- a/Monitor.c
+++ b/Monitor.c
@@ -328,6 +328,7 @@ int Monitor(mddev_dev_t devlist,
 			for (i=0; i<MaxDisks && i <= array.raid_disks + array.nr_disks;
 			     i++) {
 				mdu_disk_info_t disc;
+				disc.number = i;
 				if (ioctl(fd, GET_DISK_INFO, &disc) >= 0) {
 					info[i].state = disc.state;
 					info[i].major = disc.major;
diff --git a/mdadm.8 b/mdadm.8
index ce88d04..25a6758 100644
--- a/mdadm.8
+++ b/mdadm.8
@@ -972,6 +972,8 @@ the right thing, then the array can be successfully assembled using
 .TP
 .BR \-X ", " \-\-examine\-bitmap
 Report information about a bitmap file.
+The argument is either an external bitmap file or an array component
+in case of an internal bitmap.
 
 .TP
 .BR \-R ", " \-\-run