From: Christoph Hellwig <hch@lst.de>
Date: Sun, 29 Oct 2017 10:44:31 +0200
Subject: nvme: consolidate common code from ->reset_work
Patch-mainline: v4.15-rc1
Git-commit: 6cd53d14aaa006b5543f06fbf5e1680ce61c6c6e
References: FATE#323952, FATE#322506
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>
Acked-by: Johannes Thumshirn <jthumshirn@suse.de>
---
drivers/nvme/host/core.c | 4 ++++
drivers/nvme/host/fc.c | 13 -------------
drivers/nvme/host/rdma.c | 4 ----
drivers/nvme/target/loop.c | 4 ----
4 files changed, 4 insertions(+), 21 deletions(-)
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -102,7 +102,11 @@ static void nvme_delete_ctrl_work(struct
struct nvme_ctrl *ctrl =
container_of(work, struct nvme_ctrl, delete_work);
+ nvme_stop_ctrl(ctrl);
+ nvme_remove_namespaces(ctrl);
ctrl->ops->delete_ctrl(ctrl);
+ nvme_uninit_ctrl(ctrl);
+ nvme_put_ctrl(ctrl);
}
int nvme_delete_ctrl(struct nvme_ctrl *ctrl)
--- a/drivers/nvme/host/fc.c
+++ b/drivers/nvme/host/fc.c
@@ -2640,24 +2640,11 @@ nvme_fc_delete_ctrl(struct nvme_ctrl *nc
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
--- a/drivers/nvme/host/rdma.c
+++ b/drivers/nvme/host/rdma.c
@@ -1768,11 +1768,7 @@ static void nvme_rdma_shutdown_ctrl(stru
static void nvme_rdma_delete_ctrl(struct nvme_ctrl *ctrl)
{
- nvme_stop_ctrl(ctrl);
- nvme_remove_namespaces(ctrl);
nvme_rdma_shutdown_ctrl(to_rdma_ctrl(ctrl), true);
- nvme_uninit_ctrl(ctrl);
- nvme_put_ctrl(ctrl);
}
static void nvme_rdma_reset_ctrl_work(struct work_struct *work)
--- a/drivers/nvme/target/loop.c
+++ b/drivers/nvme/target/loop.c
@@ -440,11 +440,7 @@ static void nvme_loop_shutdown_ctrl(stru
static void nvme_loop_delete_ctrl_host(struct nvme_ctrl *ctrl)
{
- nvme_stop_ctrl(ctrl);
- nvme_remove_namespaces(ctrl);
nvme_loop_shutdown_ctrl(to_loop_ctrl(ctrl));
- nvme_uninit_ctrl(ctrl);
- nvme_put_ctrl(ctrl);
}
static void nvme_loop_delete_ctrl(struct nvmet_ctrl *nctrl)