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

Commit 794a4cb3 authored by Sagi Grimberg's avatar Sagi Grimberg Committed by Christoph Hellwig
Browse files

nvme: remove the .stop_ctrl callout 



It is used now just to flush error recovery and reconnect work items in
the RDMA and TCP transports, which can simply be moved to the
corresponding teardown routines.

Signed-off-by: default avatarSagi Grimberg <sagi@grimberg.me>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 6e02318e

drivers/nvme/host/core.c

+0 −2
Original line number Diff line number Diff line
@@ -3639,8 +3639,6 @@ void nvme_stop_ctrl(struct nvme_ctrl *ctrl) 
	nvme_stop_keep_alive(ctrl);

	flush_work(&ctrl->async_event_work);

	cancel_work_sync(&ctrl->fw_act_work);

	if (ctrl->ops->stop_ctrl)

		ctrl->ops->stop_ctrl(ctrl);

}

EXPORT_SYMBOL_GPL(nvme_stop_ctrl);

drivers/nvme/host/nvme.h

+0 −1
Original line number Diff line number Diff line
@@ -363,7 +363,6 @@ struct nvme_ctrl_ops { 
	void (*submit_async_event)(struct nvme_ctrl *ctrl);

	void (*delete_ctrl)(struct nvme_ctrl *ctrl);

	int (*get_address)(struct nvme_ctrl *ctrl, char *buf, int size);

	void (*stop_ctrl)(struct nvme_ctrl *ctrl);

};



#ifdef CONFIG_FAULT_INJECTION_DEBUG_FS

drivers/nvme/host/rdma.c

+3 −9
Original line number Diff line number Diff line
@@ -942,14 +942,6 @@ static void nvme_rdma_teardown_io_queues(struct nvme_rdma_ctrl *ctrl, 
	}

}



static void nvme_rdma_stop_ctrl(struct nvme_ctrl *nctrl)

{

	struct nvme_rdma_ctrl *ctrl = to_rdma_ctrl(nctrl);



	cancel_work_sync(&ctrl->err_work);

	cancel_delayed_work_sync(&ctrl->reconnect_work);

}



static void nvme_rdma_free_ctrl(struct nvme_ctrl *nctrl)

{

	struct nvme_rdma_ctrl *ctrl = to_rdma_ctrl(nctrl);
@@ -1854,6 +1846,9 @@ static const struct blk_mq_ops nvme_rdma_admin_mq_ops = { 


static void nvme_rdma_shutdown_ctrl(struct nvme_rdma_ctrl *ctrl, bool shutdown)

{

	cancel_work_sync(&ctrl->err_work);

	cancel_delayed_work_sync(&ctrl->reconnect_work);



	nvme_rdma_teardown_io_queues(ctrl, shutdown);

	if (shutdown)

		nvme_shutdown_ctrl(&ctrl->ctrl);
@@ -1902,7 +1897,6 @@ static const struct nvme_ctrl_ops nvme_rdma_ctrl_ops = { 
	.submit_async_event	= nvme_rdma_submit_async_event,

	.delete_ctrl		= nvme_rdma_delete_ctrl,

	.get_address		= nvmf_get_address,

	.stop_ctrl		= nvme_rdma_stop_ctrl,

};



/*

drivers/nvme/host/tcp.c

+3 −7
Original line number Diff line number Diff line
@@ -1822,6 +1822,9 @@ static void nvme_tcp_error_recovery_work(struct work_struct *work) 


static void nvme_tcp_teardown_ctrl(struct nvme_ctrl *ctrl, bool shutdown)

{

	cancel_work_sync(&to_tcp_ctrl(ctrl)->err_work);

	cancel_delayed_work_sync(&to_tcp_ctrl(ctrl)->connect_work);



	nvme_tcp_teardown_io_queues(ctrl, shutdown);

	if (shutdown)

		nvme_shutdown_ctrl(ctrl);
@@ -1859,12 +1862,6 @@ static void nvme_reset_ctrl_work(struct work_struct *work) 
	nvme_tcp_reconnect_or_remove(ctrl);

}



static void nvme_tcp_stop_ctrl(struct nvme_ctrl *ctrl)

{

	cancel_work_sync(&to_tcp_ctrl(ctrl)->err_work);

	cancel_delayed_work_sync(&to_tcp_ctrl(ctrl)->connect_work);

}



static void nvme_tcp_free_ctrl(struct nvme_ctrl *nctrl)

{

	struct nvme_tcp_ctrl *ctrl = to_tcp_ctrl(nctrl);
@@ -2115,7 +2112,6 @@ static const struct nvme_ctrl_ops nvme_tcp_ctrl_ops = { 
	.submit_async_event	= nvme_tcp_submit_async_event,

	.delete_ctrl		= nvme_tcp_delete_ctrl,

	.get_address		= nvmf_get_address,

	.stop_ctrl		= nvme_tcp_stop_ctrl,

};



static bool