From: Benjamin Marzinski Date: Tue, 22 Apr 2025 23:47:37 +0000 (-0400) Subject: dm-flakey: remove useless ERROR_READS check in flakey_end_io X-Git-Tag: v6.16-rc1~56^2~14 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4319f0aaa2354f14037f04456ed635983b379695;p=thirdparty%2Fkernel%2Flinux.git dm-flakey: remove useless ERROR_READS check in flakey_end_io If ERROR_READS is set, flakey_map returns DM_MAPIO_KILL for read bios and flakey_end_io is never called, so there's no point in checking it there. Also clean up an incorrect comment about when read IOs are errored out. Signed-off-by: Benjamin Marzinski Signed-off-by: Mikulas Patocka --- diff --git a/drivers/md/dm-flakey.c b/drivers/md/dm-flakey.c index 35f1708b62e80..0421f93366801 100644 --- a/drivers/md/dm-flakey.c +++ b/drivers/md/dm-flakey.c @@ -511,8 +511,8 @@ static int flakey_map(struct dm_target *ti, struct bio *bio) pb->bio_submitted = true; /* - * Error reads if neither corrupt_bio_byte or drop_writes or error_writes are set. - * Otherwise, flakey_end_io() will decide if the reads should be modified. + * If ERROR_READS isn't set flakey_end_io() will decide if the + * reads should be modified. */ if (bio_data_dir(bio) == READ) { if (test_bit(ERROR_READS, &fc->flags)) @@ -590,13 +590,6 @@ static int flakey_end_io(struct dm_target *ti, struct bio *bio, if (rem < fc->random_read_corrupt) corrupt_bio_random(bio); } - if (test_bit(ERROR_READS, &fc->flags)) { - /* - * Error read during the down_interval if drop_writes - * and error_writes were not configured. - */ - *error = BLK_STS_IOERR; - } } return DM_ENDIO_DONE;