X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=block%2Fblk-mq.c;h=041f7b7fa0d6def444e9349b6cf748afc8e89b2d;hb=6ed860052906146cb2d9c71e7dc092053bc7f442;hp=6cef42f419a57d43ece64983915f3aefce7fefcf;hpb=b8d4c1f9f48e344fe1d6e6ffae01d4b31bf0aac0;p=linux-2.6-block.git

diff --git a/block/blk-mq.c b/block/blk-mq.c
index 6cef42f419a5..041f7b7fa0d6 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -1547,10 +1547,8 @@ static blk_qc_t blk_mq_make_request(struct request_queue *q, struct bio *bio)
 
 	blk_queue_split(q, &bio);
 
-	if (bio_integrity_enabled(bio) && bio_integrity_prep(bio)) {
-		bio_io_error(bio);
+	if (!bio_integrity_prep(bio))
 		return BLK_QC_T_NONE;
-	}
 
 	if (!is_flush_fua && !blk_queue_nomerges(q) &&
 	    blk_attempt_plug_merge(q, bio, &request_count, &same_queue_rq))