nvme-fc: remove setting DNR on exception conditions

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 <[email protected]>
Reviewed-by: Hannes Reinecke <[email protected]>
Signed-off-by: Christoph Hellwig <[email protected]>

diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c
index 8b66879b4ebf816fba4181b5a38bea0700d60073..ac35a80f5532c17cdd46e7d7cf443cf7f514af63 100644 (file)
--- a/drivers/nvme/host/fc.c
+++ b/drivers/nvme/host/fc.c
@@ -1686,16 +1686,6 @@ done:
                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);