[PATCH V3 3/8] md/raid5: move checking badblock before clone bio in raid5_read_one_chunk
flat view
STALE1954d
From: Guoqing Jiang <hidden>
Date: 2021-05-25 09:47:05
Subsystem:
software raid (multiple disks) support, the rest · Maintainers:
Song Liu, Yu Kuai, Linus Torvalds
Revision v3 of 4 in this series.
Revisions (4)
- v1 [diff vs current]
- v2 [diff vs current]
- v2 [diff vs current]
- v3 current
We don't need to clone bio if the relevant region has badblock. Signed-off-by: Guoqing Jiang <redacted> --- drivers/md/raid5.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index 58e9dbc0f683..5a05277f4be7 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c@@ -5427,6 +5427,13 @@ static int raid5_read_one_chunk(struct mddev *mddev, struct bio *raid_bio) atomic_inc(&rdev->nr_pending); rcu_read_unlock(); + if (is_badblock(rdev, sector, bio_sectors(raid_bio), &first_bad, + &bad_sectors)) { + bio_put(raid_bio); + rdev_dec_pending(rdev, mddev); + return 0; + } + align_bio = bio_clone_fast(raid_bio, GFP_NOIO, &mddev->bio_set); bio_set_dev(align_bio, rdev->bdev); 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) raid_bio->bi_next = (void *)rdev; - if (is_badblock(rdev, sector, bio_sectors(align_bio), &first_bad, - &bad_sectors)) { - bio_put(align_bio); - rdev_dec_pending(rdev, mddev); - return 0; - } - /* No reshape active, so we can trust rdev->data_offset */ align_bio->bi_iter.bi_sector += rdev->data_offset;
--
2.25.1