From: Nicholas Bellinger <nab@linux-iscsi.org>
Date: Fri, 7 Feb 2014 20:45:39 +0000 (-0700)
Subject: blk-mq: Add bio_integrity setup to blk_mq_make_request
X-Git-Tag: upstream/snapshot3+hdmi~3430^2~16
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=14ec77f352cb00ab8425ec2af03bd7e529eefe24;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

blk-mq: Add bio_integrity setup to blk_mq_make_request

This patch adds the missing bio_integrity_enabled() +
bio_integrity_prep() setup into blk_mq_make_request()
in order to use DIF protection with scsi-mq.

Cc: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
Signed-off-by: Jens Axboe <axboe@fb.com>
---

diff --git a/block/blk-mq.c b/block/blk-mq.c
index f1e63c2..cee9623 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -922,6 +922,11 @@ static void blk_mq_make_request(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 (use_plug && blk_attempt_plug_merge(q, bio, &request_count))
 		return;