From: James Smart <jsmart2021@gmail.com>

Date: Fri, 11 May 2018 17:50:24 -0700

Subject: [PATCH] nvme-fc: remove setting DNR on exception conditions

References: bsc#1098706

Git-commit: 90fcaf5d54c57037e9f879f17b58497db7156c3e

Patch-mainline: v4.18-rc1

Current code will set DNR if the controller is deleting or there is

an error during controller init. None of this is necessary.

Remove the code that sets DNR

Signed-off-by: James Smart <james.smart@broadcom.com>

Reviewed-by: Hannes Reinecke <hare@suse.com>

Signed-off-by: Christoph Hellwig <hch@lst.de>

Signed-off-by: Hannes Reinecke <hare@suse.de>

---

 drivers/nvme/host/fc.c | 10 ----------

 1 file changed, 10 deletions(-)

diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c

index 3f7be5067bfd..f57b9871b802 100644

--- a/drivers/nvme/host/fc.c

+++ b/drivers/nvme/host/fc.c

@@ -1690,16 +1690,6 @@ nvme_fc_fcpio_done(struct nvmefc_fcp_req *req)

 		goto check_error;

 	}

-	/*

-	 * Force failures of commands if we're killing the controller

-	 * or have an error on a command used to create an new association

-	 */

-	if (status &&

-	    (blk_queue_dying(rq->q) ||

-	     ctrl->ctrl.state == NVME_CTRL_NEW ||

-	     ctrl->ctrl.state == NVME_CTRL_CONNECTING))

-		status |= cpu_to_le16(NVME_SC_DNR << 1);

-

 	__nvme_fc_fcpop_chk_teardowns(ctrl, op, opstate);

 	nvme_end_request(rq, status, result);

-- 

2.12.3