From: Hannes Reinecke <hare@suse.de>
Date: Wed, 30 Sep 2020 08:02:53 +0000 (+0200)
Subject: scsi: block: Return status code in blk_mq_end_request()
X-Git-Tag: v5.11-rc1~108^2~190
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e21ee5a6b9c9d30fd07ce5bd3e4a5668a03af6d9;p=thirdparty%2Flinux.git

scsi: block: Return status code in blk_mq_end_request()

blk_mq_end_request() will use the block status returned from queue_rq() as
argument, except in one instance in blk_mq_dispatch_rq_list(), where the
generic BLK_STS_IOERR is used.

Link: https://lore.kernel.org/r/20200930080256.90964-2-hare@suse.de
Reviewed-by: Ewan D. Milne <emilne@redhat.com>
Signed-off-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
---

diff --git a/block/blk-mq.c b/block/blk-mq.c
index 55bcee5dc0320..1b25ec2fe9bef 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -1404,7 +1404,7 @@ bool blk_mq_dispatch_rq_list(struct blk_mq_hw_ctx *hctx, struct list_head *list,
 			break;
 		default:
 			errors++;
-			blk_mq_end_request(rq, BLK_STS_IOERR);
+			blk_mq_end_request(rq, ret);
 		}
 	} while (!list_empty(list));
 out: