forked from Minki/linux
nvme-tcp: 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: Chao Leng <lengchao@huawei.com> Signed-off-by: Christoph Hellwig <hch@lst.de>
This commit is contained in:
parent
c4189d680e
commit
563c81586d
@ -1907,11 +1907,7 @@ static void nvme_tcp_teardown_admin_queue(struct nvme_ctrl *ctrl,
|
|||||||
blk_mq_quiesce_queue(ctrl->admin_q);
|
blk_mq_quiesce_queue(ctrl->admin_q);
|
||||||
blk_sync_queue(ctrl->admin_q);
|
blk_sync_queue(ctrl->admin_q);
|
||||||
nvme_tcp_stop_queue(ctrl, 0);
|
nvme_tcp_stop_queue(ctrl, 0);
|
||||||
if (ctrl->admin_tagset) {
|
nvme_cancel_admin_tagset(ctrl);
|
||||||
blk_mq_tagset_busy_iter(ctrl->admin_tagset,
|
|
||||||
nvme_cancel_request, ctrl);
|
|
||||||
blk_mq_tagset_wait_completed_request(ctrl->admin_tagset);
|
|
||||||
}
|
|
||||||
if (remove)
|
if (remove)
|
||||||
blk_mq_unquiesce_queue(ctrl->admin_q);
|
blk_mq_unquiesce_queue(ctrl->admin_q);
|
||||||
nvme_tcp_destroy_admin_queue(ctrl, remove);
|
nvme_tcp_destroy_admin_queue(ctrl, remove);
|
||||||
@ -1927,11 +1923,7 @@ static void nvme_tcp_teardown_io_queues(struct nvme_ctrl *ctrl,
|
|||||||
nvme_stop_queues(ctrl);
|
nvme_stop_queues(ctrl);
|
||||||
nvme_sync_io_queues(ctrl);
|
nvme_sync_io_queues(ctrl);
|
||||||
nvme_tcp_stop_io_queues(ctrl);
|
nvme_tcp_stop_io_queues(ctrl);
|
||||||
if (ctrl->tagset) {
|
nvme_cancel_tagset(ctrl);
|
||||||
blk_mq_tagset_busy_iter(ctrl->tagset,
|
|
||||||
nvme_cancel_request, ctrl);
|
|
||||||
blk_mq_tagset_wait_completed_request(ctrl->tagset);
|
|
||||||
}
|
|
||||||
if (remove)
|
if (remove)
|
||||||
nvme_start_queues(ctrl);
|
nvme_start_queues(ctrl);
|
||||||
nvme_tcp_destroy_io_queues(ctrl, remove);
|
nvme_tcp_destroy_io_queues(ctrl, remove);
|
||||||
|
Loading…
Reference in New Issue
Block a user