From: Yu Kuai <yukuai3@xxxxxxxxxx>
Faulty rdev should never be accessed anymore, hence there is no point to
wait for bad block to be acknowledged in this case while handling write
request.
Signed-off-by: Yu Kuai <yukuai3@xxxxxxxxxx>
---
drivers/md/raid1.c | 17 ++++-------------
1 file changed, 4 insertions(+), 13 deletions(-)
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index aa30c3240c85..f08d7f607d8b 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -1419,25 +1419,16 @@ static bool wait_blocked_rdev(struct mddev *mddev, struct bio *bio)
if (!rdev)
continue;
- if (test_bit(Blocked, &rdev->flags)) {
- if (bio->bi_opf & REQ_NOWAIT)
- return false;
-
- mddev_add_trace_msg(rdev->mddev, "raid1 wait rdev %d blocked",
- rdev->raid_disk);
- atomic_inc(&rdev->nr_pending);
- md_wait_for_blocked_rdev(rdev, rdev->mddev);
- goto retry;
- }
-
/* don't write here until the bad block is acknowledged */
if (test_bit(WriteErrorSeen, &rdev->flags) &&
rdev_has_badblock(rdev, bio->bi_iter.bi_sector,
- bio_sectors(bio)) < 0) {
+ bio_sectors(bio)) < 0)
+ set_bit(BlockedBadBlocks, &rdev->flags);
+
+ if (rdev_blocked(rdev)) {
if (bio->bi_opf & REQ_NOWAIT)
return false;
- set_bit(BlockedBadBlocks, &rdev->flags);
mddev_add_trace_msg(rdev->mddev, "raid1 wait rdev %d blocked",
rdev->raid_disk);
atomic_inc(&rdev->nr_pending);
--
2.39.2
