1 files changed, 5 insertions, 3 deletions

diff --git a/block/blk-core.c b/block/blk-core.c
index c973249d68cd..277134cb5d32 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -1474,6 +1474,11 @@ void blk_queue_bio(struct request_queue *q, struct bio *bio)
          */
         blk_queue_bounce(q, &bio);
 
+        if (bio_integrity_enabled(bio) && bio_integrity_prep(bio)) {
+                bio_endio(bio, -EIO);
+                return;
+        }
+
         if (bio->bi_rw & (REQ_FLUSH | REQ_FUA)) {
                 spin_lock_irq(q->queue_lock);
                 where = ELEVATOR_INSERT_FLUSH;
@@ -1714,9 +1719,6 @@ generic_make_request_checks(struct bio *bio)
          */
         blk_partition_remap(bio);
 
-        if (bio_integrity_enabled(bio) && bio_integrity_prep(bio))
-                goto end_io;
-
         if (bio_check_eod(bio, nr_sectors))
                 goto end_io;