diff options
| author | NeilBrown <neilb@suse.de> | 2011-01-13 23:14:34 +0100 |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2011-01-13 23:14:34 +0100 |
| commit | bf2cb0dab8c97f00a71875d9b13dbac17a2f47ca (patch) | |
| tree | 68587eaff5c7cb85628c1f68aecb19f2a18c8f6e /drivers/md/md.c | |
| parent | md: range check slot number when manually adding a spare. (diff) | |
| download | linux-bf2cb0dab8c97f00a71875d9b13dbac17a2f47ca.tar.xz linux-bf2cb0dab8c97f00a71875d9b13dbac17a2f47ca.zip | |
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 <neilb@suse.de>
Diffstat (limited to 'drivers/md/md.c')
| -rw-r--r-- | drivers/md/md.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c index 665851308818..3194a80f3620 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; |