Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion drivers/md/raid1.c
Original file line number Diff line number Diff line change
Expand Up @@ -2883,7 +2883,8 @@ static sector_t raid1_sync_request(struct mddev *mddev, sector_t sector_nr,
test_bit(Faulty, &rdev->flags)) {
if (i < conf->raid_disks)
still_degraded = true;
} else if (!test_bit(In_sync, &rdev->flags)) {
} else if (!test_bit(In_sync, &rdev->flags) &&
rdev->recovery_offset <= sector_nr) {
bio->bi_opf = REQ_OP_WRITE;
bio->bi_end_io = end_sync_write;
write_targets ++;
Expand All @@ -2892,6 +2893,9 @@ static sector_t raid1_sync_request(struct mddev *mddev, sector_t sector_nr,
sector_t first_bad = MaxSector;
sector_t bad_sectors;

if (!test_bit(In_sync, &rdev->flags))
good_sectors = min(rdev->recovery_offset - sector_nr,
(u64)good_sectors);
if (is_badblock(rdev, sector_nr, good_sectors,
&first_bad, &bad_sectors)) {
if (first_bad > sector_nr)
Expand Down
Loading