nvme-loop: Remove duplicate call to nvme_remove_namespaces
nvme_uninit_ctrl already does that for us. Note that we reordered nvme_loop_shutdown_ctrl with nvme_uninit_ctrl but its safe because we want controller uninit to happen before we shutdown the transport resources. Signed-off-by: Sagi Grimberg <sagi@grimberg.me> Reviewed-by: Christoph Hellwig <hch@lst.de>
This commit is contained in:
Родитель
a34ca17a97
Коммит
a159c64d93
|
@ -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);
|
||||||
}
|
}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче