|
Daniel Wagner |
5f7f32 |
From: Chao Leng <lengchao@huawei.com>
|
|
Daniel Wagner |
5f7f32 |
Date: Thu, 21 Jan 2021 11:32:40 +0800
|
|
Daniel Wagner |
5f7f32 |
Subject: nvme-tcp: use cancel tagset helper for tear down
|
|
Daniel Wagner |
5f7f32 |
Patch-mainline: v5.12-rc1
|
|
Daniel Wagner |
5f7f32 |
Git-commit: 563c81586d0ab2841487a61fb34d6e9cd5efded7
|
|
Daniel Wagner |
5f7f32 |
References: bsc#1183976
|
|
Daniel Wagner |
5f7f32 |
|
|
Daniel Wagner |
5f7f32 |
Use nvme_cancel_tagset and nvme_cancel_admin_tagset to clean code for
|
|
Daniel Wagner |
5f7f32 |
tear down process.
|
|
Daniel Wagner |
5f7f32 |
|
|
Daniel Wagner |
5f7f32 |
Signed-off-by: Chao Leng <lengchao@huawei.com>
|
|
Daniel Wagner |
5f7f32 |
Signed-off-by: Christoph Hellwig <hch@lst.de>
|
|
Daniel Wagner |
5f7f32 |
Acked-by: Daniel Wagner <dwagner@suse.de>
|
|
Daniel Wagner |
5f7f32 |
---
|
|
Daniel Wagner |
5f7f32 |
drivers/nvme/host/tcp.c | 12 ++----------
|
|
Daniel Wagner |
5f7f32 |
1 file changed, 2 insertions(+), 10 deletions(-)
|
|
Daniel Wagner |
5f7f32 |
|
|
Daniel Wagner |
5f7f32 |
--- a/drivers/nvme/host/tcp.c
|
|
Daniel Wagner |
5f7f32 |
+++ b/drivers/nvme/host/tcp.c
|
|
Daniel Wagner |
5f7f32 |
@@ -1933,11 +1933,7 @@ static void nvme_tcp_teardown_admin_queu
|
|
Daniel Wagner |
5f7f32 |
blk_mq_quiesce_queue(ctrl->admin_q);
|
|
Daniel Wagner |
5f7f32 |
blk_sync_queue(ctrl->admin_q);
|
|
Daniel Wagner |
5f7f32 |
nvme_tcp_stop_queue(ctrl, 0);
|
|
Daniel Wagner |
5f7f32 |
- if (ctrl->admin_tagset) {
|
|
Daniel Wagner |
5f7f32 |
- blk_mq_tagset_busy_iter(ctrl->admin_tagset,
|
|
Daniel Wagner |
5f7f32 |
- nvme_cancel_request, ctrl);
|
|
Daniel Wagner |
5f7f32 |
- blk_mq_tagset_wait_completed_request(ctrl->admin_tagset);
|
|
Daniel Wagner |
5f7f32 |
- }
|
|
Daniel Wagner |
5f7f32 |
+ nvme_cancel_admin_tagset(ctrl);
|
|
Daniel Wagner |
5f7f32 |
if (remove)
|
|
Daniel Wagner |
5f7f32 |
blk_mq_unquiesce_queue(ctrl->admin_q);
|
|
Daniel Wagner |
5f7f32 |
nvme_tcp_destroy_admin_queue(ctrl, remove);
|
|
Daniel Wagner |
5f7f32 |
@@ -1953,11 +1949,7 @@ static void nvme_tcp_teardown_io_queues(
|
|
Daniel Wagner |
5f7f32 |
nvme_stop_queues(ctrl);
|
|
Daniel Wagner |
5f7f32 |
nvme_sync_io_queues(ctrl);
|
|
Daniel Wagner |
5f7f32 |
nvme_tcp_stop_io_queues(ctrl);
|
|
Daniel Wagner |
5f7f32 |
- if (ctrl->tagset) {
|
|
Daniel Wagner |
5f7f32 |
- blk_mq_tagset_busy_iter(ctrl->tagset,
|
|
Daniel Wagner |
5f7f32 |
- nvme_cancel_request, ctrl);
|
|
Daniel Wagner |
5f7f32 |
- blk_mq_tagset_wait_completed_request(ctrl->tagset);
|
|
Daniel Wagner |
5f7f32 |
- }
|
|
Daniel Wagner |
5f7f32 |
+ nvme_cancel_tagset(ctrl);
|
|
Daniel Wagner |
5f7f32 |
if (remove)
|
|
Daniel Wagner |
5f7f32 |
nvme_start_queues(ctrl);
|
|
Daniel Wagner |
5f7f32 |
nvme_tcp_destroy_io_queues(ctrl, remove);
|