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 <bmarz...@redhat.com>
---
 drivers/md/dm-flakey.c | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/drivers/md/dm-flakey.c b/drivers/md/dm-flakey.c
index 35f1708b62e8..0421f9336680 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;
-- 
2.48.1


Reply via email to