Commit 678fe328 authored by Ziye Yang's avatar Ziye Yang Committed by Jim Harris
Browse files

nvmf,rdma: set cm_id = NULL 



Purpose: If the qp creates in a failure state,
we should set cm_id = NULL, then we do not need to
destroy the qp which is not created.

Also this patch add return value check while calling
spdk_nvmf_rdma_qpair_initialize.

Change-Id: I084c186738fcf6079cb36666f68e10b906e77145
Signed-off-by: default avatarZiye Yang <optimistyzy@gmail.com>
Reviewed-on: https://review.gerrithub.io/394016


Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent 489ea86e

lib/nvmf/rdma.c

+6 −1
Original line number Diff line number Diff line
@@ -353,6 +353,7 @@ spdk_nvmf_rdma_qpair_initialize(struct spdk_nvmf_qpair *qpair) 
	if (rc) {

		SPDK_ERRLOG("rdma_create_qp failed: errno %d: %s\n", errno, spdk_strerror(errno));

		rdma_destroy_id(rqpair->cm_id);

		rqpair->cm_id = NULL;

		spdk_nvmf_rdma_qpair_destroy(rqpair);

		return -1;

	}
@@ -1581,7 +1582,11 @@ spdk_nvmf_rdma_poll_group_add(struct spdk_nvmf_transport_poll_group *group, 
	TAILQ_INSERT_TAIL(&poller->qpairs, rqpair, link);

	rqpair->poller = poller;



	spdk_nvmf_rdma_qpair_initialize(qpair);

	rc = spdk_nvmf_rdma_qpair_initialize(qpair);

	if (rc < 0) {

		SPDK_ERRLOG("Failed to initialize nvmf_rdma_qpair with qpair=%p\n", qpair);

		return -1;

	}



	rqpair->mgmt_channel = spdk_get_io_channel(rtransport);

	if (!rqpair->mgmt_channel) {