Commit c26c655d authored by Ben Walker's avatar Ben Walker Committed by Jim Harris
Browse files

nvme/rdma: Eliminate nvme_rdma_ctrlr_construct_admin_qpair 



Just call the regular qpair create function instead.

Change-Id: Ic35b1eb6fcdf0d82733ea573a493f583dd63d5bd
Signed-off-by: default avatarBen Walker <benjamin.walker@intel.com>
parent 3ad0c336

lib/nvme/nvme_rdma.c

+7 −37
Original line number Diff line number Diff line
@@ -676,18 +676,10 @@ nvme_rdma_qpair_fabric_connect(struct nvme_rdma_qpair *rqpair) 
	strncpy((char *)nvmf_data->hostnqn, ctrlr->opts.hostnqn, sizeof(nvmf_data->hostnqn));

	strncpy((char *)nvmf_data->subnqn, ctrlr->trid.subnqn, sizeof(nvmf_data->subnqn));



	if (nvme_qpair_is_admin_queue(&rqpair->qpair)) {

		rc = spdk_nvme_ctrlr_cmd_admin_raw(ctrlr,

						   (struct spdk_nvme_cmd *)&cmd,

						   nvmf_data, sizeof(*nvmf_data),

						   nvme_completion_poll_cb, &status);

	} else {

	rc = spdk_nvme_ctrlr_cmd_io_raw(ctrlr, &rqpair->qpair,

					(struct spdk_nvme_cmd *)&cmd,

					nvmf_data, sizeof(*nvmf_data),

					nvme_completion_poll_cb, &status);

	}



	if (rc < 0) {

		SPDK_ERRLOG("spdk_nvme_rdma_req_fabric_connect failed\n");

		rc = -1;
@@ -933,7 +925,6 @@ nvme_rdma_ctrlr_create_qpair(struct spdk_nvme_ctrlr *ctrlr, uint16_t qid, 
	/* At this time, queue is not initialized,  so use the passing parameter qid */

	if (!qid) {

		num_entries = SPDK_NVMF_MIN_ADMIN_QUEUE_ENTRIES;

		ctrlr->adminq = qpair;

	} else {

		num_entries = ctrlr->opts.io_queue_size;

	}
@@ -982,27 +973,6 @@ nvme_rdma_qpair_destroy(struct spdk_nvme_qpair *qpair) 
	return 0;

}



static int

nvme_rdma_ctrlr_construct_admin_qpair(struct spdk_nvme_ctrlr *ctrlr)

{

	struct spdk_nvme_qpair *qpair;

	int rc;



	qpair = nvme_rdma_ctrlr_create_qpair(ctrlr, 0, 0);

	if (!qpair) {

		SPDK_ERRLOG("failed to create admin qpair\n");

		rc = -1;

		goto error;

	}



	SPDK_TRACELOG(SPDK_TRACE_DEBUG, "successfully create admin qpair\n");

	return 0;



error:

	nvme_rdma_qpair_destroy(qpair);

	return rc;

}



struct spdk_nvme_qpair *

nvme_rdma_ctrlr_create_io_qpair(struct spdk_nvme_ctrlr *ctrlr, uint16_t qid,

				enum spdk_nvme_qprio qprio)
@@ -1195,9 +1165,9 @@ struct spdk_nvme_ctrlr *nvme_rdma_ctrlr_construct(const struct spdk_nvme_transpo 
		return NULL;

	}



	rc = nvme_rdma_ctrlr_construct_admin_qpair(&rctrlr->ctrlr);

	if (rc != 0) {

		SPDK_ERRLOG("create admin qpair failed\n");

	rctrlr->ctrlr.adminq = nvme_rdma_ctrlr_create_qpair(&rctrlr->ctrlr, 0, 0);

	if (!rctrlr->ctrlr.adminq) {

		SPDK_ERRLOG("failed to create admin qpair\n");

		return NULL;

	}