Commit 4319f0aa authored by Benjamin Marzinski's avatar Benjamin Marzinski Committed by Mikulas Patocka
Browse files

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: default avatarBenjamin Marzinski <bmarzins@redhat.com>
Signed-off-by: default avatarMikulas Patocka <mpatocka@redhat.com>
parent 40ed054f

drivers/md/dm-flakey.c

+2 −9
Original line number Diff line number Diff line
@@ -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;