From: NeilBrown Date: Tue, 11 Jan 2011 22:03:35 +0000 (+1100) Subject: md: fix regression with re-adding devices to arrays with no metadata X-Git-Tag: v2.6.32.29~48 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6d82749eb6e07f5cade8eb6479f74af06b96ef47;p=karo-tx-linux.git md: fix regression with re-adding devices to arrays with no metadata commit bf572541ab44240163eaa2d486b06f306a31d45a upstream. 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. Signed-off-by: NeilBrown Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/md/md.c b/drivers/md/md.c index 2c66c7ea3200..68bfb68af5ad 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -4802,9 +4802,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<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].