From: Jens Axboe <axboe@kernel.dk>
Date: Tue, 16 Oct 2018 14:33:16 +0000 (-0600)
Subject: scsi: osd: initiator should use mq variant of request ending
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=8d849275dce493837792a70f710f6bd83c8db5c0;p=linux.git

scsi: osd: initiator should use mq variant of request ending

This is currently wrong since it isn't dependent on if we're using mq or
not. At least now it'll be correct when we force mq.

Cc: linux-scsi@vger.kernel.org
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
---

diff --git a/drivers/scsi/osd/osd_initiator.c b/drivers/scsi/osd/osd_initiator.c
index 67b14576fff25..e19fa883376f5 100644
--- a/drivers/scsi/osd/osd_initiator.c
+++ b/drivers/scsi/osd/osd_initiator.c
@@ -445,7 +445,7 @@ static void _put_request(struct request *rq)
 	 *       code paths.
 	 */
 	if (unlikely(rq->bio))
-		blk_end_request(rq, BLK_STS_IOERR, blk_rq_bytes(rq));
+		blk_mq_end_request(rq, BLK_STS_IOERR);
 	else
 		blk_put_request(rq);
 }