@@ -2370,6 +2370,7 @@ static int nvme_reset_dev(struct nvme_dev *dev)
bool was_suspend = !!(dev->ctrl.ctrl_config & NVME_CC_SHN_NORMAL);
int result = -ENODEV;
enum nvme_ctrl_state new_state = NVME_CTRL_LIVE;
+ bool unfreeze_queue = false;
lockdep_assert_held(&dev->ctrl.reset_lock);
@@ -2456,7 +2457,7 @@ static int nvme_reset_dev(struct nvme_dev *dev)
/* hit this only when allocate tagset fails */
if (nvme_dev_add(dev))
new_state = NVME_CTRL_ADMIN_ONLY;
- nvme_unfreeze(&dev->ctrl);
+ unfreeze_queue = true;
}
result = -ENODEV;
@@ -2471,6 +2472,9 @@ static int nvme_reset_dev(struct nvme_dev *dev)
}
nvme_start_ctrl(&dev->ctrl);
+
+ if (unfreeze_queue)
+ nvme_unfreeze(&dev->ctrl);
return 0;
out:
If it fails to update controller state into LIVE or ADMIN_ONLY, the controller will be removed, so not necessary to unfreeze queue any more. This way will make the following patch easier to not leak the freeze couner. Cc: James Smart <james.smart@broadcom.com> Cc: Jianchao Wang <jianchao.w.wang@oracle.com> Cc: Christoph Hellwig <hch@lst.de> Cc: Sagi Grimberg <sagi@grimberg.me> Cc: linux-nvme@lists.infradead.org Cc: Laurence Oberman <loberman@redhat.com> Signed-off-by: Ming Lei <ming.lei@redhat.com> --- drivers/nvme/host/pci.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)