diff options
| author | Christoph Hellwig | 2017-10-29 09:44:31 +0100 |
|---|---|---|
| committer | Christoph Hellwig | 2017-11-01 16:28:06 +0100 |
| commit | 6cd53d14aaa006b5543f06fbf5e1680ce61c6c6e (patch) | |
| tree | 015c68a3118f143e8114fdb25432186164d0b03f /drivers/nvme/host/fc.c | |
| parent | nvme-rdma: remove nvme_rdma_remove_ctrl (diff) | |
| download | kernel-qcow2-linux-6cd53d14aaa006b5543f06fbf5e1680ce61c6c6e.tar.gz kernel-qcow2-linux-6cd53d14aaa006b5543f06fbf5e1680ce61c6c6e.tar.xz kernel-qcow2-linux-6cd53d14aaa006b5543f06fbf5e1680ce61c6c6e.zip | |
nvme: consolidate common code from ->reset_work
No change in behavior except that the FC code cancels two work items a
little later now.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Reviewed-by: James Smart <james.smart@broadcom.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'drivers/nvme/host/fc.c')
| -rw-r--r-- | drivers/nvme/host/fc.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c index a7bdb17de29d..e447b532b9ee 100644 --- a/drivers/nvme/host/fc.c +++ b/drivers/nvme/host/fc.c @@ -2640,24 +2640,11 @@ nvme_fc_delete_ctrl(struct nvme_ctrl *nctrl) cancel_work_sync(&ctrl->ctrl.reset_work); cancel_delayed_work_sync(&ctrl->connect_work); - nvme_stop_ctrl(&ctrl->ctrl); - nvme_remove_namespaces(&ctrl->ctrl); /* * kill the association on the link side. this will block * waiting for io to terminate */ nvme_fc_delete_association(ctrl); - - /* - * tear down the controller - * After the last reference on the nvme ctrl is removed, - * the transport nvme_fc_nvme_ctrl_freed() callback will be - * invoked. From there, the transport will tear down it's - * logical queues and association. - */ - nvme_uninit_ctrl(&ctrl->ctrl); - - nvme_put_ctrl(&ctrl->ctrl); } static void |