Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6cd53d14 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

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: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Reviewed-by: default avatarJames Smart <james.smart@broadcom.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent e9bc2587

drivers/nvme/host/core.c

+4 −0
Original line number Diff line number Diff line
@@ -102,7 +102,11 @@ static void nvme_delete_ctrl_work(struct work_struct *work) 
	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)

drivers/nvme/host/fc.c

+0 −13
Original line number Diff line number Diff line
@@ -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

drivers/nvme/host/rdma.c

+0 −4
Original line number Diff line number Diff line
@@ -1757,11 +1757,7 @@ static void nvme_rdma_shutdown_ctrl(struct nvme_rdma_ctrl *ctrl, bool shutdown) 


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)

drivers/nvme/target/loop.c

+0 −4
Original line number Diff line number Diff line
@@ -440,11 +440,7 @@ static void nvme_loop_shutdown_ctrl(struct nvme_loop_ctrl *ctrl) 


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)