github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-27 17:47:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

md/raid1: move the exceed_read_errors condition out of fix_read_error

Browse Source 
This condition much better fits into the only caller, limiting
fix_read_error to actually fix up data devices after a read error.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Link: https://patch.msgid.link/20260529054308.2720300-3-hch@lst.de
Signed-off-by: Yu Kuai <yukuai@fygo.io>
This commit is contained in:
Christoph Hellwig 2026-05-29 07:43:00 +02:00 committed by Yu Kuai
parent fcba803132
commit 6e3b0b9133
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/md/raid1.c
View File

@ -2418,11 +2418,6 @@ static void fix_read_error(struct r1conf *conf, struct r1bio *r1_bio)
struct mddev *mddev = conf->mddev;
struct md_rdev *rdev = conf->mirrors[read_disk].rdev;
if (exceed_read_errors(mddev, rdev)) {
r1_bio->bios[r1_bio->read_disk] = IO_BLOCKED;
return;
}
while(sectors) {
int s = sectors;
int d = read_disk;
@ -2659,7 +2654,10 @@ static void handle_read_error(struct r1conf *conf, struct r1bio *r1_bio)
md_error(mddev, rdev);
} else {
freeze_array(conf, 1);
fix_read_error(conf, r1_bio);
if (exceed_read_errors(mddev, rdev))
r1_bio->bios[r1_bio->read_disk] = IO_BLOCKED;
else
fix_read_error(conf, r1_bio);
unfreeze_array(conf);
}