The patch titled md: fix up maintenance of ->degraded in multipath has been added to the -mm tree. Its filename is md-fix-up-maintenance-of-degraded-in-multipath.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: md: fix up maintenance of ->degraded in multipath From: NeilBrown <neilb@xxxxxxx> A recent fix which made sure ->degraded was initialised properly exposed a second bug - ->degraded wasn't been updated when drives failed or were hot-added. Signed-off-by: Neil Brown <neilb@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- drivers/md/multipath.c | 2 ++ 1 file changed, 2 insertions(+) diff -puN drivers/md/multipath.c~md-fix-up-maintenance-of-degraded-in-multipath drivers/md/multipath.c --- a/drivers/md/multipath.c~md-fix-up-maintenance-of-degraded-in-multipath +++ a/drivers/md/multipath.c @@ -277,6 +277,7 @@ static void multipath_error (mddev_t *md set_bit(Faulty, &rdev->flags); set_bit(MD_CHANGE_DEVS, &mddev->flags); conf->working_disks--; + mddev->degraded++; printk(KERN_ALERT "multipath: IO failure on %s," " disabling IO path. \n Operation continuing" " on %d IO paths.\n", @@ -336,6 +337,7 @@ static int multipath_add_disk(mddev_t *m blk_queue_max_sectors(mddev->queue, PAGE_SIZE>>9); conf->working_disks++; + mddev->degraded--; rdev->raid_disk = path; set_bit(In_sync, &rdev->flags); rcu_assign_pointer(p->rdev, rdev); _ Patches currently in -mm which might be from neilb@xxxxxxx are origin.patch md-fix-calculation-of-degraded-for-multipath-and-raid10.patch md-add-another-compat_ioctl-for-md.patch md-endian-annotation-for-v1-superblock-access.patch md-endian-annotations-for-the-bitmap-superblock.patch md-fix-bug-where-spares-dont-always-get-rebuilt-properly-when-they-become-live.patch md-simplify-checking-of-available-size-when-resizing-an-array.patch md-fix-up-maintenance-of-degraded-in-multipath.patch md-fix-printk-format-warnings-seen-on-powerpc64.patch lockdep-annotate-nfs-nfsd-in-kernel-sockets.patch lockdep-annotate-nfs-nfsd-in-kernel-sockets-tidy.patch remove-lock_key-approach-to-managing-nested-bd_mutex-locks.patch simplify-some-aspects-of-bd_mutex-nesting.patch use-mutex_lock_nested-for-bd_mutex-to-avoid-lockdep-warning.patch avoid-lockdep-warning-in-md.patch lockdep-annotate-nfsd4-recover-code.patch md-conditionalize-some-code.patch md-dm-reduce-stack-usage-with-stacked-block-devices.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html