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

nvme: break out rdma disconnect from destroy 



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

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


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 963e450a

lib/nvme/nvme_rdma.c

+20 −13
Original line number Diff line number Diff line
@@ -1326,24 +1326,14 @@ nvme_rdma_ctrlr_create_qpair(struct spdk_nvme_ctrlr *ctrlr, 
	return qpair;

}



static int

nvme_rdma_qpair_destroy(struct spdk_nvme_qpair *qpair)

static void

nvme_rdma_qpair_disconnect(struct spdk_nvme_qpair *qpair)

{

	struct nvme_rdma_qpair *rqpair;



	if (!qpair) {

		return -1;

	}

	nvme_rdma_qpair_abort_reqs(qpair, 1);

	nvme_qpair_deinit(qpair);



	rqpair = nvme_rdma_qpair(qpair);

	struct nvme_rdma_qpair *rqpair = nvme_rdma_qpair(qpair);



	nvme_rdma_unregister_mem(rqpair);

	nvme_rdma_unregister_reqs(rqpair);

	nvme_rdma_free_reqs(rqpair);

	nvme_rdma_unregister_rsps(rqpair);

	nvme_rdma_free_rsps(rqpair);



	if (rqpair->cm_id) {

		if (rqpair->cm_id->qp) {
@@ -1359,7 +1349,24 @@ nvme_rdma_qpair_destroy(struct spdk_nvme_qpair *qpair) 
	if (rqpair->cm_channel) {

		rdma_destroy_event_channel(rqpair->cm_channel);

	}

}



static int

nvme_rdma_qpair_destroy(struct spdk_nvme_qpair *qpair)

{

	struct nvme_rdma_qpair *rqpair;



	if (!qpair) {

		return -1;

	}

	nvme_rdma_qpair_disconnect(qpair);

	nvme_rdma_qpair_abort_reqs(qpair, 1);

	nvme_qpair_deinit(qpair);



	rqpair = nvme_rdma_qpair(qpair);



	nvme_rdma_free_reqs(rqpair);

	nvme_rdma_free_rsps(rqpair);

	free(rqpair);



	return 0;