On Mon, 17 Jan 2011 10:11:28 +1100 NeilBrown <neilb@xxxxxxx> wrote:
> On Fri, 14 Jan 2011 14:00:00 +0100 Adam Kwolek <adam.kwolek@xxxxxxxxx> wrote:
>
> > Manually added spares are not used due to fact that they not added to md configuration.
> > Counters are updated only.
> >
> > Signed-off-by: Adam Kwolek <adam.kwolek@xxxxxxxxx>
> > ---
> >
> > drivers/md/raid5.c | 6 ++++--
> > 1 files changed, 4 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
> > index a2087c7..59c4150 100644
> > --- a/drivers/md/raid5.c
> > +++ b/drivers/md/raid5.c
> > @@ -5592,8 +5592,10 @@ static int raid5_start_reshape(mddev_t *mddev)
> > } else if (rdev->raid_disk >= conf->previous_raid_disks
> > && !test_bit(Faulty, &rdev->flags)) {
> > /* This is a spare that was manually added */
> > - set_bit(In_sync, &rdev->flags);
> > - added_devices++;
> > + if (raid5_add_disk(mddev, rdev) == 0) {
> > + set_bit(In_sync, &rdev->flags);
> > + added_devices++;
> > + }
> > }
> >
> > /* When a reshape changes the number of devices, ->degraded
>
> This should not be needed.
> When a device is manually added, the desired slot number is written to
> ..../md/dev-XXX/slot
>
> This calls slot_store (in md.c) which call mddev->pers->hot_add_disk which
> for raid5 is raid5_add_disk.
> So you shouldn't need to call raid5_add_disk again.
>
ahhh... I see. raid5_add_disk doesn't do the right thing in that case. It
actually indexes beyond the end of an array, which is bad.
We possibly do need the raid5_add_disk where you had put it. I'll have a
think and see what is best.
Thanks,
NeilBrown
--
To unsubscribe from this list: send the line "unsubscribe linux-raid" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
