diff options
| author | Sagi Grimberg <sagi@grimberg.me> | 2016-07-24 08:32:08 +0200 |
|---|---|---|
| committer | Sagi Grimberg <sagi@grimberg.me> | 2016-08-03 15:25:19 +0200 |
| commit | a159c64d936eb0d1da29d8ad384183d8984899c9 (patch) | |
| tree | 3df0082b6a728199990442ba89d2f6ce0aef8ff9 /drivers/nvme | |
| parent | nvme-rdma: Free the I/O tags when we delete the controller (diff) | |
| download | linux-a159c64d936eb0d1da29d8ad384183d8984899c9.tar.xz linux-a159c64d936eb0d1da29d8ad384183d8984899c9.zip | |
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>
Diffstat (limited to 'drivers/nvme')
| -rw-r--r-- | drivers/nvme/target/loop.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/nvme/target/loop.c b/drivers/nvme/target/loop.c index 94e782987cc9..7affd40a6b33 100644 --- a/drivers/nvme/target/loop.c +++ b/drivers/nvme/target/loop.c @@ -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, delete_work); - nvme_remove_namespaces(&ctrl->ctrl); - nvme_loop_shutdown_ctrl(ctrl); nvme_uninit_ctrl(&ctrl->ctrl); + nvme_loop_shutdown_ctrl(ctrl); nvme_put_ctrl(&ctrl->ctrl); } @@ -501,7 +500,6 @@ out_free_queues: nvme_loop_destroy_admin_queue(ctrl); out_disable: dev_warn(ctrl->ctrl.device, "Removing after reset failure\n"); - nvme_remove_namespaces(&ctrl->ctrl); nvme_uninit_ctrl(&ctrl->ctrl); nvme_put_ctrl(&ctrl->ctrl); } |