[Devel] [PATCH RHEL7 COMMIT] Revert "blk-mq: fail the request in case issue failure"

[Konstantin Khorenko]

The commit is pushed to "branch-rh7-3.10.0-957.12.2.vz7.96.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-957.12.2.vz7.96.12
------>
commit 107896dd4fae45649ca53d66ad53a3a955380bfd
Author: Konstantin Khorenko <khorenko at virtuozzo.com>
Date:   Mon Jun 3 13:15:53 2019 +0300

    Revert "blk-mq: fail the request in case issue failure"
    
    This reverts RedHat patch
    - [block] blk-mq: fail the request in case issue failure (Ming Lei)
      [1599682]
    
    https://pmc.acronis.com/browse/VSTOR-23501
    
    Signed-off-by: Konstantin Khorenko <khorenko at virtuozzo.com>
    
    Original comment:
    
     From d794ce622101e33abf1183f70147114d939dba0a Mon Sep 17 00:00:00 2001
     From: Ming Lei <ming.lei at redhat.com>
     Date: Mon, 23 Jul 2018 03:09:39 -0400
     Subject: [block] blk-mq: fail the request in case issue failure
    
     Message-id: <20180723030939.21196-1-ming.lei at redhat.com>
     Patchwork-id: 225216
     O-Subject: [RHEL7.6] blk-mq: fail the request in case issue failure
     Bugzilla: 1599682
     RH-Acked-by: Jeff Moyer <jmoyer at redhat.com>
     RH-Acked-by: Ewan Milne <emilne at redhat.com>
    
     BZ: 1599682
     BREW: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=17303014
    
     commit 8824f62246bef288173a6624a363352f0d4d3b09
     Author: Ming Lei <ming.lei at redhat.com>
     Date:   Sun Jul 22 14:10:15 2018 +0800
    
         blk-mq: fail the request in case issue failure
    
         Inside blk_mq_try_issue_list_directly(), if the request is issued as
         failed, we shouldn't try to do it again, otherwise the warning in
         blk_mq_start_request() will be triggered. This change is aligned to
         behaviour of other ways of request issue & dispatch.
    
         Fixes: 6ce3dd6eec1 ("blk-mq: issue directly if hw queue isn't busy in case of 'none'")
         Cc: Kashyap Desai <kashyap.desai at broadcom.com>
         Cc: Laurence Oberman <loberman at redhat.com>
         Cc: Omar Sandoval <osandov at fb.com>
         Cc: Christoph Hellwig <hch at lst.de>
         Cc: Bart Van Assche <bart.vanassche at wdc.com>
         Cc: Hannes Reinecke <hare at suse.de>
         Cc: Kashyap Desai <kashyap.desai at broadcom.com>
         Cc: kernel test robot <rong.a.chen at intel.com>
         Cc: LKP <lkp at 01.org>
         Reported-by: kernel test robot <rong.a.chen at intel.com>
         Signed-off-by: Ming Lei <ming.lei at redhat.com>
         Signed-off-by: Jens Axboe <axboe at kernel.dk>
    
     Rename BLK_STS_* as BLK_MQ_RQ_QUEUE_*, and this commit is backported from
     block tree.
     Signed-off-by: Ming Lei <ming.lei at redhat.com>
    
     Signed-off-by: Bruno E. O. Meneguele <bmeneg at redhat.com>
    
     https://access.redhat.com/labs/psb/versions/kernel-3.10.0-957.el7/patches/block-blk-mq-fail-the-request-in-case-issue-failure
---
 block/blk-mq.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/block/blk-mq.c b/block/blk-mq.c
index 3dd6f1d72cee..ab36454564be 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -1788,12 +1788,8 @@ void blk_mq_try_issue_list_directly(struct blk_mq_hw_ctx *hctx,
 		list_del_init(&rq->queuelist);
 		ret = blk_mq_request_issue_directly(rq);
 		if (ret != BLK_MQ_RQ_QUEUE_OK) {
-			if (ret == BLK_MQ_RQ_QUEUE_BUSY ||
-					ret == BLK_MQ_RQ_QUEUE_DEV_BUSY) {
-				list_add(&rq->queuelist, list);
-				break;
-			}
-			blk_mq_end_request(rq, ret);
+			list_add(&rq->queuelist, list);
+			break;
 		}
 	}
 }