[PATCH] md/raid5: fix inverted condition in rdev_set_badblocks call
From: zhanghao
Date: Sat Oct 17 2026 - 03:44:14 EST
Commit fd4d44c14ff6 ("md: mark rdev Faulty when badblocks setting fails")
attempted to unify badblock handling but introduced a logic inversion in
raid5_end_read_request().
The original check was:
if (!(set_bad && In_sync && rdev_set_badblocks(...)))
md_error(...);
which records badblocks when `set_bad && In_sync`, and calls md_error()
either when recording fails or when the rdev is not In_sync. The new
condition `if (!(set_bad && In_sync))` skips rdev_set_badblocks() exactly
during recovery/reshape (In_sync is set), so failed badblock updates no
longer trigger md_error() and the rdev is not marked Faulty. This allows
reconstruction to continue on a disk with a saturated badblock table,
potentially propagating corrupted data to the replacement disk.
Fix the condition to match the intended behavior: call rdev_set_badblocks()
when `set_bad && In_sync`, and let the callee handle md_error() on failure.
Fixes: fd4d44c14ff6 ("md: mark rdev Faulty when badblocks setting fails")
Cc: stable@xxxxxxxxxxxxxxx
Signed-off-by: zhanghao <zh_exit@xxxxxxx>
---
drivers/md/raid5.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index d52adf81065a..dcfb1bfa9ebf 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -2866,7 +2866,7 @@ static void raid5_end_read_request(struct bio * bi)
else {
clear_bit(R5_ReadError, &sh->dev[i].flags);
clear_bit(R5_ReWrite, &sh->dev[i].flags);
- if (!(set_bad && test_bit(In_sync, &rdev->flags)))
+ if (set_bad && test_bit(In_sync, &rdev->flags))
rdev_set_badblocks(rdev, sh->sector,
RAID5_STRIPE_SECTORS(conf), 0);
}
--
2.43.0