From: Li Nan Date: Sat, 27 May 2023 10:18:51 +0000 (+0800) Subject: md/raid10: clean up md_add_new_disk() X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=4d8a5754a694062f349b8bf66856561e3840c7e5;p=linux.git md/raid10: clean up md_add_new_disk() Commit 1a855a060665 ("md: fix bug with re-adding of partially recovered device.") only add device which is set to In_sync. But it let devices without metadata cannot be added when they should be. Commit bf572541ab44 ("md: fix regression with re-adding devices to arrays with no metadata") fix the above issue, it set device without metadata to In_sync when add new disk. However, after commit f466722ca614 ("md: Change handling of save_raid_disk and metadata update during recovery.") deletes changes of the first patch, setting In_sync for devcie without metadata is meanless because the flag will be cleared soon and will not be used during this period. Clean it up. Signed-off-by: Li Nan Reviewed-by: Yu Kuai Signed-off-by: Song Liu Link: https://lore.kernel.org/r/20230527101851.3266500-2-linan666@huaweicloud.com --- diff --git a/drivers/md/md.c b/drivers/md/md.c index a6ede3d1c99e3..0aec2954e1613 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -6746,7 +6746,6 @@ int md_add_new_disk(struct mddev *mddev, struct mdu_disk_info_s *info) if (info->state & (1<raid_disk < mddev->raid_disks) { rdev->raid_disk = info->raid_disk; - set_bit(In_sync, &rdev->flags); clear_bit(Bitmap_sync, &rdev->flags); } else rdev->raid_disk = -1;