Commit e41f8c02 authored by Sagi Grimberg's avatar Sagi Grimberg Committed by Jens Axboe
Browse files

nvme-loop: use nvme core helpers to cancel all requests in a tagset 



A helper now exist, no need to open-code the same functionality.

Signed-off-by: default avatarSagi Grimberg <sagi@grimberg.me>
Reviewed-by: default avatarChaitanya Kulkarni <kch@nvidia.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent b10907b8

drivers/nvme/target/loop.c

+2 −6
Original line number Diff line number Diff line
@@ -424,9 +424,7 @@ static void nvme_loop_shutdown_ctrl(struct nvme_loop_ctrl *ctrl) 
{

	if (ctrl->ctrl.queue_count > 1) {

		nvme_stop_queues(&ctrl->ctrl);

		blk_mq_tagset_busy_iter(&ctrl->tag_set,

					nvme_cancel_request, &ctrl->ctrl);

		blk_mq_tagset_wait_completed_request(&ctrl->tag_set);

		nvme_cancel_tagset(&ctrl->ctrl);

		nvme_loop_destroy_io_queues(ctrl);

	}
@@ -434,9 +432,7 @@ static void nvme_loop_shutdown_ctrl(struct nvme_loop_ctrl *ctrl) 
	if (ctrl->ctrl.state == NVME_CTRL_LIVE)

		nvme_shutdown_ctrl(&ctrl->ctrl);



	blk_mq_tagset_busy_iter(&ctrl->admin_tag_set,

				nvme_cancel_request, &ctrl->ctrl);

	blk_mq_tagset_wait_completed_request(&ctrl->admin_tag_set);

	nvme_cancel_admin_tagset(&ctrl->ctrl);

	nvme_loop_destroy_admin_queue(ctrl);

}