Home Home > GIT Browse > openSUSE-15.0
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2018-01-12 15:54:05 +0100
committerTakashi Iwai <tiwai@suse.de>2018-01-12 15:54:05 +0100
commit721d75bd00d64135f8a1e2c299cb1bb68f2d11b7 (patch)
treed305e16cc2f76d23772af68d38922152e663d92e
parentbd28db6fe862160679733584d24251454de194c8 (diff)
parentd70c9e56504467a03e9fd939c95d420751b51fbc (diff)
Merge branch 'users/hare/SLE15/for-next' into SLE15
-rw-r--r--drivers/nvme/host/fc.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c
index 794e66e4aa20..aa916a475aa7 100644
--- a/drivers/nvme/host/fc.c
+++ b/drivers/nvme/host/fc.c
@@ -2921,6 +2921,9 @@ nvme_fc_delete_association(struct nvme_fc_ctrl *ctrl)
__nvme_fc_delete_hw_queue(ctrl, &ctrl->queues[0], 0);
nvme_fc_free_queue(&ctrl->queues[0]);
+ /* re-enable the admin_q so anything new can fast fail */
+ blk_mq_unquiesce_queue(ctrl->ctrl.admin_q);
+
nvme_fc_ctlr_inactive_on_rport(ctrl);
}
@@ -2935,6 +2938,9 @@ 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