diff options
| author | NeilBrown | 2011-01-11 23:03:35 +0100 |
|---|---|---|
| committer | NeilBrown | 2011-01-11 23:03:35 +0100 |
| commit | bf572541ab44240163eaa2d486b06f306a31d45a (patch) | |
| tree | ef9630d692ce3681bf226877056622afd070f1c0 /drivers/md/md.c | |
| parent | Linux 2.6.37 (diff) | |
| download | kernel-qcow2-linux-bf572541ab44240163eaa2d486b06f306a31d45a.tar.gz kernel-qcow2-linux-bf572541ab44240163eaa2d486b06f306a31d45a.tar.xz kernel-qcow2-linux-bf572541ab44240163eaa2d486b06f306a31d45a.zip | |
md: fix regression with re-adding devices to arrays with no metadata
Commit 1a855a0606 (2.6.37-rc4) fixed a problem where devices were
re-added when they shouldn't be but caused a regression in a less
common case that means sometimes devices cannot be re-added when they
should be.
In particular, when re-adding a device to an array without metadata
we should always access the device, but after the above commit we
didn't.
This patch sets the In_sync flag in that case so that the re-add
succeeds.
This patch is suitable for any -stable kernel to which 1a855a0606 was
applied.
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 | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c index 175c424f201f..0da25daea9be 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -5159,9 +5159,10 @@ static int add_new_disk(mddev_t * mddev, mdu_disk_info_t *info) /* set saved_raid_disk if appropriate */ if (!mddev->persistent) { if (info->state & (1<<MD_DISK_SYNC) && - info->raid_disk < mddev->raid_disks) + info->raid_disk < mddev->raid_disks) { rdev->raid_disk = info->raid_disk; - else + set_bit(In_sync, &rdev->flags); + } else rdev->raid_disk = -1; } else super_types[mddev->major_version]. |