summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Smart <jsmart2021@gmail.com>2018-05-11 17:50:24 -0700
committerChristoph Hellwig <hch@lst.de>2018-05-25 16:50:12 +0200
commit90fcaf5d54c57037e9f879f17b58497db7156c3e (patch)
tree14e87104526c89ad0ec673a39a8fc4b879d73135
parent2e050f00a0f0e07467050cb4afae0234941e5bf3 (diff)
downloadop-kernel-dev-90fcaf5d54c57037e9f879f17b58497db7156c3e.zip
op-kernel-dev-90fcaf5d54c57037e9f879f17b58497db7156c3e.tar.gz
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 <james.smart@broadcom.com> Reviewed-by: Hannes Reinecke <hare@suse.com> Signed-off-by: Christoph Hellwig <hch@lst.de>
-rw-r--r--drivers/nvme/host/fc.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c
index 8b66879..ac35a80 100644
--- 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);
OpenPOWER on IntegriCloud