diff options
| author | NeilBrown <neilb@suse.de> | 2011-01-31 11:57:43 +1100 |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2011-01-31 11:57:43 +1100 |
| commit | 469518a3455c79619e9231aeffeffa2e2989f738 (patch) | |
| tree | ae92280e8be9df25fd20fea87efcbe72bd855ae9 | |
| parent | 87a8dec91e15954f0cf86be6c21741d991d83621 (diff) | |
| download | op-kernel-dev-469518a3455c79619e9231aeffeffa2e2989f738.zip op-kernel-dev-469518a3455c79619e9231aeffeffa2e2989f738.tar.gz | |
md: fix the test for finding spares in raid5_start_reshape.
As spares can be added to the array before the reshape is started,
we need to find and count them when checking there are enough.
The array could have been degraded, so we need to check all devices,
no just those out side of the range of devices in the array before
the reshape.
So instead of checking the index, check the In_sync flag as that
reliably tells if the device is a spare or this purpose.
Signed-off-by: NeilBrown <neilb@suse.de>
| -rw-r--r-- | drivers/md/raid5.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index fa55193..a6d2c3d 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c @@ -5526,8 +5526,8 @@ static int raid5_start_reshape(mddev_t *mddev) return -ENOSPC; list_for_each_entry(rdev, &mddev->disks, same_set) - if ((rdev->raid_disk < 0 || rdev->raid_disk >= conf->raid_disks) - && !test_bit(Faulty, &rdev->flags)) + if (!test_bit(In_sync, &rdev->flags) + && !test_bit(Faulty, &rdev->flags)) spares++; if (spares - mddev->degraded < mddev->delta_disks - conf->max_degraded) |
