Commit a5972c62 authored by Seth Howell's avatar Seth Howell Committed by Jim Harris
Browse files

rdma: consolidate common error paths in qpair_init 



Consolidating error paths is common practice in SPDK so do that here to
make the function more uniform and save space.

Change-Id: I98c5d5f7feeb688f1d8b24f4d2d3461a43d00c1d
Signed-off-by: default avatarSeth Howell <seth.howell@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/448191


Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent 97a43680

lib/nvmf/rdma.c

+9 −12
Original line number Diff line number Diff line
@@ -908,19 +908,13 @@ spdk_nvmf_rdma_qpair_initialize(struct spdk_nvmf_qpair *qpair) 


	if (nvmf_rdma_resize_cq(rqpair, device) < 0) {

		SPDK_ERRLOG("Failed to resize the completion queue. Cannot initialize qpair.\n");

		rdma_destroy_id(rqpair->cm_id);

		rqpair->cm_id = NULL;

		spdk_nvmf_rdma_qpair_destroy(rqpair);

		return -1;

		goto error;

	}



	rc = rdma_create_qp(rqpair->cm_id, rqpair->port->device->pd, &ibv_init_attr);

	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;

		goto error;

	}



	rqpair->max_send_depth = spdk_min((uint32_t)(rqpair->max_queue_depth * 2 + 1),
@@ -945,10 +939,7 @@ spdk_nvmf_rdma_qpair_initialize(struct spdk_nvmf_qpair *qpair) 


		if (!rqpair->resources) {

			SPDK_ERRLOG("Unable to allocate resources for receive queue.\n");

			rdma_destroy_id(rqpair->cm_id);

			rqpair->cm_id = NULL;

			spdk_nvmf_rdma_qpair_destroy(rqpair);

			return -1;

			goto error;

		}

	} else {

		rqpair->resources = rqpair->poller->resources;
@@ -959,6 +950,12 @@ spdk_nvmf_rdma_qpair_initialize(struct spdk_nvmf_qpair *qpair) 
	STAILQ_INIT(&rqpair->pending_rdma_write_queue);



	return 0;



error:

	rdma_destroy_id(rqpair->cm_id);

	rqpair->cm_id = NULL;

	spdk_nvmf_rdma_qpair_destroy(rqpair);

	return -1;

}



static int