diff mbox series

osd: initiator should use mq variant of request ending

Message ID 33c8e59a-4c56-8998-7782-a970a0c5b9b4@kernel.dk (mailing list archive)
State Accepted
Headers show
Series osd: initiator should use mq variant of request ending | expand

Commit Message

Jens Axboe Oct. 16, 2018, 2:33 p.m. UTC
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>
---
 drivers/scsi/osd/osd_initiator.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Martin K. Petersen Oct. 16, 2018, 9:49 p.m. UTC | #1
Jens,

> 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.

Applied to 4.20/scsi-queue, thanks!
diff mbox series

Patch

diff --git a/drivers/scsi/osd/osd_initiator.c b/drivers/scsi/osd/osd_initiator.c
index 67b14576fff2..e19fa883376f 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);
 }