From: Sagi Grimberg <sagi@grimberg.me>
Date: Wed, 29 Mar 2017 17:54:46 +0000 (+0300)
Subject: nvme-fc: increment request retries counter before requeuing
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f2cd54d3eba3a2048edcb91f145336180c55aee5;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

nvme-fc: increment request retries counter before requeuing

This way our max retry limit holds as well.

Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
Reviewed-by: Max Gurtovoy <maxg@mellanox.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@fb.com>
---

diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c
index 7a1d7ea5366e..bae10a95b125 100644
--- a/drivers/nvme/host/fc.c
+++ b/drivers/nvme/host/fc.c
@@ -1935,6 +1935,7 @@ nvme_fc_complete_rq(struct request *rq)
 
 	if (unlikely(rq->errors)) {
 		if (nvme_req_needs_retry(rq, rq->errors)) {
+			rq->retries++;
 			nvme_requeue_req(rq);
 			return;
 		}