Skip to content

Commit c82aa1b

Browse files
GuoqingJiang-Linuxliu-song-6
authored andcommitted
md/raid5: move checking badblock before clone bio in raid5_read_one_chunk
We don't need to clone bio if the relevant region has badblock. Signed-off-by: Guoqing Jiang <[email protected]> Signed-off-by: Song Liu <[email protected]>
1 parent 1076481 commit c82aa1b

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

drivers/md/raid5.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5427,6 +5427,13 @@ static int raid5_read_one_chunk(struct mddev *mddev, struct bio *raid_bio)
54275427
atomic_inc(&rdev->nr_pending);
54285428
rcu_read_unlock();
54295429

5430+
if (is_badblock(rdev, sector, bio_sectors(raid_bio), &first_bad,
5431+
&bad_sectors)) {
5432+
bio_put(raid_bio);
5433+
rdev_dec_pending(rdev, mddev);
5434+
return 0;
5435+
}
5436+
54305437
align_bio = bio_clone_fast(raid_bio, GFP_NOIO, &mddev->bio_set);
54315438
bio_set_dev(align_bio, rdev->bdev);
54325439
align_bio->bi_end_io = raid5_align_endio;
@@ -5435,13 +5442,6 @@ static int raid5_read_one_chunk(struct mddev *mddev, struct bio *raid_bio)
54355442

54365443
raid_bio->bi_next = (void *)rdev;
54375444

5438-
if (is_badblock(rdev, sector, bio_sectors(align_bio), &first_bad,
5439-
&bad_sectors)) {
5440-
bio_put(align_bio);
5441-
rdev_dec_pending(rdev, mddev);
5442-
return 0;
5443-
}
5444-
54455445
/* No reshape active, so we can trust rdev->data_offset */
54465446
align_bio->bi_iter.bi_sector += rdev->data_offset;
54475447

0 commit comments

Comments
 (0)