nvme: introduce a helper function for controller deletion (a686ed75) · Commits · 戴 / test

This patch does not change any functionality but makes the next patch in this series easier to read. Signed-off-by:

drivers/nvme/host/core.c

+9 −4

Original line number	Diff line number	Diff line
		@@ -151,11 +151,8 @@ int nvme_reset_ctrl_sync(struct nvme_ctrl *ctrl)
		}
		EXPORT_SYMBOL_GPL(nvme_reset_ctrl_sync);

		static void nvme_delete_ctrl_work(struct work_struct *work)
		static void nvme_do_delete_ctrl(struct nvme_ctrl *ctrl)
		{
		struct nvme_ctrl *ctrl =
		container_of(work, struct nvme_ctrl, delete_work);

		dev_info(ctrl->device,
		"Removing ctrl: NQN \"%s\"\n", ctrl->opts->subsysnqn);

		@@ -167,6 +164,14 @@ static void nvme_delete_ctrl_work(struct work_struct *work)
		nvme_put_ctrl(ctrl);
		}

		static void nvme_delete_ctrl_work(struct work_struct *work)
		{
		struct nvme_ctrl *ctrl =
		container_of(work, struct nvme_ctrl, delete_work);

		nvme_do_delete_ctrl(ctrl);
		}

		int nvme_delete_ctrl(struct nvme_ctrl *ctrl)
		{
		if (!nvme_change_ctrl_state(ctrl, NVME_CTRL_DELETING))