Commit b4e12f57 authored by Chunguang.xu's avatar Chunguang.xu Committed by Keith Busch
Browse files

nvme-tcp: simplify nvme_tcp_teardown_io_queues() 



As nvme_tcp_teardown_io_queues() is the only one caller of
nvme_tcp_destroy_admin_queue(), so we can merge it into
nvme_tcp_teardown_io_queues() to simplify the code.

Signed-off-by: default avatarChunguang.xu <chunguang.xu@shopee.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Signed-off-by: default avatarKeith Busch <kbusch@kernel.org>
parent fdc5664c

drivers/nvme/host/tcp.c

+4 −10
Original line number Diff line number Diff line
@@ -2101,14 +2101,6 @@ static int nvme_tcp_configure_io_queues(struct nvme_ctrl *ctrl, bool new) 
	return ret;

}



static void nvme_tcp_destroy_admin_queue(struct nvme_ctrl *ctrl, bool remove)

{

	nvme_tcp_stop_queue(ctrl, 0);

	if (remove)

		nvme_remove_admin_tag_set(ctrl);

	nvme_tcp_free_admin_queue(ctrl);

}



static int nvme_tcp_configure_admin_queue(struct nvme_ctrl *ctrl, bool new)

{

	int error;
@@ -2163,9 +2155,11 @@ static void nvme_tcp_teardown_admin_queue(struct nvme_ctrl *ctrl, 
	blk_sync_queue(ctrl->admin_q);

	nvme_tcp_stop_queue(ctrl, 0);

	nvme_cancel_admin_tagset(ctrl);

	if (remove)

	if (remove) {

		nvme_unquiesce_admin_queue(ctrl);

	nvme_tcp_destroy_admin_queue(ctrl, remove);

		nvme_remove_admin_tag_set(ctrl);

	}

	nvme_tcp_free_admin_queue(ctrl);

	if (ctrl->tls_pskid) {

		dev_dbg(ctrl->device, "Wipe negotiated TLS_PSK %08x\n",

			ctrl->tls_pskid);