|
@@ -414,9 +414,8 @@ static void nvme_loop_del_ctrl_work(struct work_struct *work)
|
|
struct nvme_loop_ctrl *ctrl = container_of(work,
|
|
struct nvme_loop_ctrl *ctrl = container_of(work,
|
|
struct nvme_loop_ctrl, delete_work);
|
|
struct nvme_loop_ctrl, delete_work);
|
|
|
|
|
|
- nvme_remove_namespaces(&ctrl->ctrl);
|
|
|
|
- nvme_loop_shutdown_ctrl(ctrl);
|
|
|
|
nvme_uninit_ctrl(&ctrl->ctrl);
|
|
nvme_uninit_ctrl(&ctrl->ctrl);
|
|
|
|
+ nvme_loop_shutdown_ctrl(ctrl);
|
|
nvme_put_ctrl(&ctrl->ctrl);
|
|
nvme_put_ctrl(&ctrl->ctrl);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -501,7 +500,6 @@ out_free_queues:
|
|
nvme_loop_destroy_admin_queue(ctrl);
|
|
nvme_loop_destroy_admin_queue(ctrl);
|
|
out_disable:
|
|
out_disable:
|
|
dev_warn(ctrl->ctrl.device, "Removing after reset failure\n");
|
|
dev_warn(ctrl->ctrl.device, "Removing after reset failure\n");
|
|
- nvme_remove_namespaces(&ctrl->ctrl);
|
|
|
|
nvme_uninit_ctrl(&ctrl->ctrl);
|
|
nvme_uninit_ctrl(&ctrl->ctrl);
|
|
nvme_put_ctrl(&ctrl->ctrl);
|
|
nvme_put_ctrl(&ctrl->ctrl);
|
|
}
|
|
}
|