OSDN Git Service

nvme-fc: remove setting DNR on exception conditions
authorJames Smart <jsmart2021@gmail.com>
Sat, 12 May 2018 00:50:24 +0000 (17:50 -0700)
committerChristoph Hellwig <hch@lst.de>
Fri, 25 May 2018 14:50:12 +0000 (16:50 +0200)
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>
drivers/nvme/host/fc.c

index 8b66879..ac35a80 100644 (file)
@@ -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);