Merge tag 'upstream-4.13-rc1' of git://git.infradead.org/linux-ubifs

[karo-tx-linux.git] / block / blk-core.c

diff --git a/block/blk-core.c b/block/blk-core.c
index af393d5a96807c6c59ce45a031c14042b72b5e6a..970b9c9638c55f4852019f452f64d2a4c66c1a9c 100644 (file)
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -1787,11 +1787,8 @@ static blk_qc_t blk_queue_bio(struct request_queue *q, struct bio *bio)
 
        blk_queue_split(q, &bio);
 
-       if (bio_integrity_enabled(bio) && bio_integrity_prep(bio)) {
-               bio->bi_status = BLK_STS_IOERR;
-               bio_endio(bio);
+       if (!bio_integrity_prep(bio))
                return BLK_QC_T_NONE;
-       }
 
        if (op_is_flush(bio->bi_opf)) {
                spin_lock_irq(q->queue_lock);