BackPup/Linux
1
0 Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-10-07 05:31:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

MD: fix invalid stored role for a disk - try2

Browse Source 
Commit d595567dc4 (MD: fix invalid stored role for a disk) broke linear
hotadd. Let's only fix the role for disks in raid1/10.
Based on Guoqing's original patch.

Reported-by: kernel test robot <[email protected]>
Cc: Gioh Kim <[email protected]>
Cc: Guoqing Jiang <[email protected]>
Signed-off-by: Shaohua Li <[email protected]>
This commit is contained in:
Shaohua Li committed 2018-10-14 17:05:07 -07:00
1 parent f8f83d8ffe
commit 9e753ba9b9
3 files changed
+2 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

drivers/md/md.c
-4
View File
@@ -1774,10 +1774,6 @@ 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;
}
break;
}
if (sb->devflags & WriteMostly1)
drivers/md/raid1.c
+1
View File
@@ -1734,6 +1734,7 @@ static int raid1_add_disk(struct mddev *mddev, struct md_rdev *rdev)
*/
if (rdev->saved_raid_disk >= 0 &&
rdev->saved_raid_disk >= first &&
rdev->saved_raid_disk < conf->raid_disks &&
conf->mirrors[rdev->saved_raid_disk].rdev == NULL)
first = last = rdev->saved_raid_disk;
drivers/md/raid10.c
+1
View File
@@ -1808,6 +1808,7 @@ static int raid10_add_disk(struct mddev *mddev, struct md_rdev *rdev)
first = last = rdev->raid_disk;
if (rdev->saved_raid_disk >= first &&
rdev->saved_raid_disk < conf->geo.raid_disks &&
conf->mirrors[rdev->saved_raid_disk].rdev == NULL)
mirror = rdev->saved_raid_disk;
else