nvme-tcp: remove nvme_tcp_destroy_io_queues()
PATCH 1/1 nvme-tcp: remove nvme_tcp_destroy_io_queues()
From: "Chunguang.xu" <[email protected]>
Now when destroying the IO queue we call nvme_tcp_stop_io_queues() twice, nvme_tcp_destroy_io_queues() has an unnecessary call. Here we try to remove nvme_tcp_destroy_io_queues() and merge it into nvme_tcp_teardown_io_queues(), simplify the code and align with nvme-rdma, make it easy to maintaince.
--- drivers/nvme/host/tcp.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-)
drivers/nvme/host/tcp.c +7 -11
@@ -2024,14 +2024,6 @@ static int nvme_tcp_alloc_io_queues(struct nvme_ctrl *ctrl)return __nvme_tcp_alloc_io_queues (ctrl); } -static void nvme_tcp_destroy_io_queues (struct nvme_ctrl *ctrl,bool remove) -{ -nvme_tcp_stop_io_queues (ctrl); -if (remove) -nvme_remove_io_tag_set (ctrl); -nvme_tcp_free_io_queues (ctrl); -} -static int nvme_tcp_configure_io_queues (struct nvme_ctrl *ctrl,bool new) {int ret, nr_queues;
@@ -2176,9 +2168,11 @@ static void nvme_tcp_teardown_io_queues(struct nvme_ctrl *ctrl,nvme_sync_io_queues (ctrl);nvme_tcp_stop_io_queues (ctrl);nvme_cancel_tagset (ctrl); -if (remove) +if (remove) {nvme_unquiesce_io_queues (ctrl); -nvme_tcp_destroy_io_queues (ctrl, remove); +nvme_remove_io_tag_set (ctrl); + } +nvme_tcp_free_io_queues (ctrl); } static void nvme_tcp_reconnect_or_remove(struct nvme_ctrl *ctrl,
@@ -2267,7 +2261,9 @@ static int nvme_tcp_setup_ctrl(struct nvme_ctrl *ctrl, bool new)nvme_sync_io_queues (ctrl);nvme_tcp_stop_io_queues (ctrl);nvme_cancel_tagset (ctrl); -nvme_tcp_destroy_io_queues (ctrl, new); +if (new) +nvme_remove_io_tag_set (ctrl); +nvme_tcp_free_io_queues (ctrl); } destroy_admin:nvme_stop_keep_alive (ctrl);
Signature · 1 line
2.25.1
Looks good:
Quoted 7 lines · brookxu.cn
From: "Chunguang.xu" <[email protected]>
Now when destroying the IO queue we call
nvme_tcp_stop_io_queues()twice,nvme_tcp_destroy_io_queues()has an unnecessary call. Here we try to removenvme_tcp_destroy_io_queues()and merge it intonvme_tcp_teardown_io_queues(), simplify the code and align with nvme-rdma, make it easy to maintaince.
Thanks, applied to nvme-6.13.