Commit d595567d authored by Shaohua Li's avatar Shaohua Li

MD: fix invalid stored role for a disk

If we change the number of array's device after device is removed from array,
then add the device back to array, we can see that device is added as active
role instead of spare which we expected.

Please see the below link for details:

This is caused by that we prefer to use device's previous role which is
recorded by saved_raid_disk, but we should respect the new number of
conf->raid_disks since it could be changed after device is removed.
Reported-by: default avatarGioh Kim <>
Tested-by: default avatarGioh Kim <>
Acked-by: default avatarGuoqing Jiang <>
Signed-off-by: default avatarShaohua Li <>
parent ee37d731
......@@ -1774,6 +1774,10 @@ static int super_1_validate(struct mddev *mddev, struct md_rdev *rdev)
} else
set_bit(In_sync, &rdev->flags);
rdev->raid_disk = role;
if (role >= mddev->raid_disks) {
rdev->saved_raid_disk = -1;
rdev->raid_disk = -1;
if (sb->devflags & WriteMostly1)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment