From: NeilBrown Date: Thu, 13 Jan 2011 22:14:34 +0000 (+1100) Subject: md: Fix removal of extra drives when converting RAID6 to RAID5 X-Git-Tag: 2.1b_release~5693^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bf2cb0dab8c97f00a71875d9b13dbac17a2f47ca;p=platform%2Fkernel%2Fkernel-mfld-blackbay.git md: Fix removal of extra drives when converting RAID6 to RAID5 When a RAID6 is converted to a RAID5, the extra drive should be discarded. However it isn't due to a typo in a comparison. This bug was introduced in commit e93f68a1fc6 in 2.6.35-rc4 and is suitable for any -stable since than. As the extra drive is not removed, the 'degraded' counter is wrong and so the RAID5 will not respond correctly to a subsequent failure. Cc: stable@kernel.org Signed-off-by: NeilBrown --- diff --git a/drivers/md/md.c b/drivers/md/md.c index 6658513..3194a80 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -3126,7 +3126,7 @@ level_store(mddev_t *mddev, const char *buf, size_t len) char nm[20]; if (rdev->raid_disk < 0) continue; - if (rdev->new_raid_disk > mddev->raid_disks) + if (rdev->new_raid_disk >= mddev->raid_disks) rdev->new_raid_disk = -1; if (rdev->new_raid_disk == rdev->raid_disk) continue;