|
@@ -686,11 +686,6 @@ static void nvme_rdma_free_ctrl(struct nvme_ctrl *nctrl)
|
|
|
list_del(&ctrl->list);
|
|
|
mutex_unlock(&nvme_rdma_ctrl_mutex);
|
|
|
|
|
|
- if (ctrl->ctrl.tagset) {
|
|
|
- blk_cleanup_queue(ctrl->ctrl.connect_q);
|
|
|
- blk_mq_free_tag_set(&ctrl->tag_set);
|
|
|
- nvme_rdma_dev_put(ctrl->device);
|
|
|
- }
|
|
|
kfree(ctrl->queues);
|
|
|
nvmf_free_options(nctrl->opts);
|
|
|
free_ctrl:
|
|
@@ -1665,6 +1660,13 @@ static void __nvme_rdma_remove_ctrl(struct nvme_rdma_ctrl *ctrl, bool shutdown)
|
|
|
nvme_uninit_ctrl(&ctrl->ctrl);
|
|
|
if (shutdown)
|
|
|
nvme_rdma_shutdown_ctrl(ctrl);
|
|
|
+
|
|
|
+ if (ctrl->ctrl.tagset) {
|
|
|
+ blk_cleanup_queue(ctrl->ctrl.connect_q);
|
|
|
+ blk_mq_free_tag_set(&ctrl->tag_set);
|
|
|
+ nvme_rdma_dev_put(ctrl->device);
|
|
|
+ }
|
|
|
+
|
|
|
nvme_put_ctrl(&ctrl->ctrl);
|
|
|
}
|
|
|
|