The patch titled
md: fix calculation of ->degraded for multipath and raid10
has been removed from the -mm tree. Its filename was
md-fix-calculation-of-degraded-for-multipath-and-raid10.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: md: fix calculation of ->degraded for multipath and raid10
From: NeilBrown <neilb@xxxxxxx>
Two less-used md personalities have bugs in the calculation of ->degraded (the
extent to which the array is degraded).
Signed-off-by: Neil Brown <neilb@xxxxxxx>
Cc: <stable@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/md/multipath.c | 2 +-
drivers/md/raid10.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff -puN drivers/md/multipath.c~md-fix-calculation-of-degraded-for-multipath-and-raid10 drivers/md/multipath.c
--- a/drivers/md/multipath.c~md-fix-calculation-of-degraded-for-multipath-and-raid10
+++ a/drivers/md/multipath.c
@@ -501,7 +501,7 @@ static int multipath_run (mddev_t *mddev
mdname(mddev));
goto out_free_conf;
}
- mddev->degraded = conf->raid_disks = conf->working_disks;
+ mddev->degraded = conf->raid_disks - conf->working_disks;
conf->pool = mempool_create_kzalloc_pool(NR_RESERVED_BUFS,
sizeof(struct multipath_bh));
diff -puN drivers/md/raid10.c~md-fix-calculation-of-degraded-for-multipath-and-raid10 drivers/md/raid10.c
--- a/drivers/md/raid10.c~md-fix-calculation-of-degraded-for-multipath-and-raid10
+++ a/drivers/md/raid10.c
@@ -2079,7 +2079,7 @@ static int run(mddev_t *mddev)
disk = conf->mirrors + i;
if (!disk->rdev ||
- !test_bit(In_sync, &rdev->flags)) {
+ !test_bit(In_sync, &disk->rdev->flags)) {
disk->head_position = 0;
mddev->degraded++;
}
_
Patches currently in -mm which might be from neilb@xxxxxxx are
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
