Commit 3895ca40 authored by Jim Harris's avatar Jim Harris Committed by Changpeng Liu
Browse files

nvme: break out tcp disconnect from destroy 



Signed-off-by: default avatarJim Harris <james.r.harris@intel.com>
Change-Id: Iacce5c98ebfb768bdd5babc39a3ebc6d1dfbc8ea

Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/453935


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
parent e7d8c05b

lib/nvme/nvme_tcp.c

+9 −4
Original line number Diff line number Diff line
@@ -227,6 +227,14 @@ fail: 
	return -ENOMEM;

}



static void

nvme_tcp_qpair_disconnect(struct spdk_nvme_qpair *qpair)

{

	struct nvme_tcp_qpair *tqpair = nvme_tcp_qpair(qpair);



	spdk_sock_close(&tqpair->sock);

}



static int

nvme_tcp_qpair_destroy(struct spdk_nvme_qpair *qpair)

{
@@ -236,14 +244,11 @@ nvme_tcp_qpair_destroy(struct spdk_nvme_qpair *qpair) 
		return -1;

	}



	nvme_tcp_qpair_disconnect(qpair);

	nvme_tcp_qpair_abort_reqs(qpair, 1);

	nvme_qpair_deinit(qpair);



	tqpair = nvme_tcp_qpair(qpair);



	nvme_tcp_free_reqs(tqpair);



	spdk_sock_close(&tqpair->sock);

	free(tqpair);



	return 0;