Report which device failed in a Fail message.

Signed-off-by: Neil Brown <neilb@suse.de>

diff --git a/ChangeLog b/ChangeLog
index 57a8e8283d8864e4cf8b284a53b3bfc3b99cddc5..8b358c977f882872444ff4557027c2056906bae0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,8 @@ Changes Prior to this release
     -   Allow scanning of devices listed in /proc/partitions even
        if they don't appear in /dev.
     -   Support --assume-clean in --create mode as well as --build
+    -   --monitor now reports which device failed in a 'Fail' message
+          This broke with 2.6
 
 Changes Prior to 2.1 release
     -   Fix assembling of raid10 array when devices are missing.

diff --git a/Monitor.c b/Monitor.c
index 16a39b491f89732868ee330c624bdad12e02603a..2b30df1dc648840932112c8ac652840b5a7ebb1f 100644 (file)
--- a/Monitor.c
+++ b/Monitor.c
@@ -313,6 +313,9 @@ int Monitor(mddev_dev_t devlist,
                                        case 'U': newstate = 6 /* ACTIVE/SYNC */; break;
                                        case '_': newstate = 0; break;
                                        }
+                               if (dv == NULL && st->devid[i])
+                                       dv = map_dev(major(st->devid[i]),
+                                                    minor(st->devid[i]));
                                change = newstate ^ st->devstate[i];
                                if (st->utime && change && !st->err) {
                                        if (i < (unsigned)array.raid_disks &&