diff options
| author | James Smart <jsmart2021@gmail.com> | 2018-06-20 16:44:12 +0200 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2018-06-21 09:31:28 +0200 |
| commit | 02d62a8bc48e92171c46540722e2d52ce77d87af (patch) | |
| tree | 9177599fc90e3aef77f2741c70ba57ab56d6b2e7 | |
| parent | nvmet: reset keep alive timer in controller enable (diff) | |
| download | linux-02d62a8bc48e92171c46540722e2d52ce77d87af.tar.xz linux-02d62a8bc48e92171c46540722e2d52ce77d87af.zip | |
nvme-fc: release io queues to allow fast fail
Rather than leaving io queues quiesced after tearing down an association,
restart them. This allows ios to be replayed, with fastfail ios terminating
and non-fastfail getting into loops of retry.
This follows rdma's lead.
Signed-off-by: James Smart <james.smart@broadcom.com>
Reviewed-by: Sagi Grimberg <sagi@grimber.me>
Signed-off-by: Christoph Hellwig <hch@lst.de>
| -rw-r--r-- | drivers/nvme/host/fc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c index b528a2f5826c..41d45a1b5c62 100644 --- a/drivers/nvme/host/fc.c +++ b/drivers/nvme/host/fc.c @@ -2790,6 +2790,9 @@ nvme_fc_delete_association(struct nvme_fc_ctrl *ctrl) /* re-enable the admin_q so anything new can fast fail */ blk_mq_unquiesce_queue(ctrl->ctrl.admin_q); + /* resume the io queues so that things will fast fail */ + nvme_start_queues(&ctrl->ctrl); + nvme_fc_ctlr_inactive_on_rport(ctrl); } @@ -2804,9 +2807,6 @@ nvme_fc_delete_ctrl(struct nvme_ctrl *nctrl) * waiting for io to terminate */ nvme_fc_delete_association(ctrl); - - /* resume the io queues so that things will fast fail */ - nvme_start_queues(nctrl); } static void |