Commit c4189d68 authored by Chao Leng's avatar Chao Leng Committed by Christoph Hellwig
Browse files

nvme-rdma: use cancel tagset helper for tear down 



Use nvme_cancel_tagset and nvme_cancel_admin_tagset to clean code for
tear down process.

Signed-off-by: default avatarChao Leng <lengchao@huawei.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 70a99574

drivers/nvme/host/rdma.c

+2 −10
Original line number Diff line number Diff line
@@ -1025,11 +1025,7 @@ static void nvme_rdma_teardown_admin_queue(struct nvme_rdma_ctrl *ctrl, 
	blk_mq_quiesce_queue(ctrl->ctrl.admin_q);

	blk_sync_queue(ctrl->ctrl.admin_q);

	nvme_rdma_stop_queue(&ctrl->queues[0]);

	if (ctrl->ctrl.admin_tagset) {

		blk_mq_tagset_busy_iter(ctrl->ctrl.admin_tagset,

			nvme_cancel_request, &ctrl->ctrl);

		blk_mq_tagset_wait_completed_request(ctrl->ctrl.admin_tagset);

	}

	nvme_cancel_admin_tagset(&ctrl->ctrl);

	if (remove)

		blk_mq_unquiesce_queue(ctrl->ctrl.admin_q);

	nvme_rdma_destroy_admin_queue(ctrl, remove);
@@ -1043,11 +1039,7 @@ static void nvme_rdma_teardown_io_queues(struct nvme_rdma_ctrl *ctrl, 
		nvme_stop_queues(&ctrl->ctrl);

		nvme_sync_io_queues(&ctrl->ctrl);

		nvme_rdma_stop_io_queues(ctrl);

		if (ctrl->ctrl.tagset) {

			blk_mq_tagset_busy_iter(ctrl->ctrl.tagset,

				nvme_cancel_request, &ctrl->ctrl);

			blk_mq_tagset_wait_completed_request(ctrl->ctrl.tagset);

		}

		nvme_cancel_tagset(&ctrl->ctrl);

		if (remove)

			nvme_start_queues(&ctrl->ctrl);

		nvme_rdma_destroy_io_queues(ctrl, remove);