block: skip bio_check_eod for partition-remapped bios

When an already remapped bio is resubmitted (e.g. by blk_queue_split),
bio_check_eod will compare the remapped bi_sector against the size
of the partition, leading to spurious I/O failures.

Skip the EOD check in this case.

Fixes: 309dca309fc3 ("block: store a block_device pointer in struct bio")
Reported-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/block/blk-core.c b/block/blk-core.c
index 88f6089044326433a137e6915deb6b1f424c2ca5..5e752840b41a1fa80b7146fc7b6f2b9c0a336ec3 100644 (file)
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -815,11 +815,12 @@ static noinline_for_stack bool submit_bio_checks(struct bio *bio)
                goto end_io;
        if (unlikely(bio_check_ro(bio)))
                goto end_io;
-       if (unlikely(bio_check_eod(bio)))
-               goto end_io;
-       if (bio->bi_bdev->bd_partno && !bio_flagged(bio, BIO_REMAPPED) &&
-           unlikely(blk_partition_remap(bio)))
-               goto end_io;
+       if (!bio_flagged(bio, BIO_REMAPPED)) {
+               if (unlikely(bio_check_eod(bio)))
+                       goto end_io;
+               if (bdev->bd_partno && unlikely(blk_partition_remap(bio)))
+                       goto end_io;
+       }
 
        /*
         * Filter flush bio's early so that bio based drivers without flush