ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nvme/rdma: Eliminate _nvme_rdma_ctrlr_create_qpair

Browse Source 
This intermediate function is no longer needed.

Change-Id: I3523cc6d8f3b290165a953d42cca8b76eda762c5
Signed-off-by: Ben Walker <benjamin.walker@intel.com>
This commit is contained in:
Ben Walker 2016-12-15 14:36:19 -07:00
parent 30677dc222
commit bf89b4da10
1 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/nvme/nvme_rdma.c
View File

@ -897,25 +897,6 @@ nvme_rdma_fabric_prop_get_cmd(struct spdk_nvme_ctrlr *ctrlr,
return 0; return 0;
} }
static int
_nvme_rdma_ctrlr_create_qpair(struct spdk_nvme_ctrlr *ctrlr,
struct spdk_nvme_qpair *qpair)
{
int rc;
struct nvme_rdma_qpair *rqpair;
rqpair = nvme_rdma_qpair(qpair);
rc = nvme_rdma_qpair_connect(rqpair);
if (rc < 0) {
SPDK_ERRLOG("Failed to connect through rdma qpair\n");
return rc;
}
return 0;
}
static struct spdk_nvme_qpair * static struct spdk_nvme_qpair *
nvme_rdma_ctrlr_create_qpair(struct spdk_nvme_ctrlr *ctrlr, uint16_t qid, nvme_rdma_ctrlr_create_qpair(struct spdk_nvme_ctrlr *ctrlr, uint16_t qid,
enum spdk_nvme_qprio qprio) enum spdk_nvme_qprio qprio)
@ -946,7 +927,7 @@ nvme_rdma_ctrlr_create_qpair(struct spdk_nvme_ctrlr *ctrlr, uint16_t qid,
return NULL; return NULL;
} }
rc = _nvme_rdma_ctrlr_create_qpair(ctrlr, qpair); rc = nvme_rdma_qpair_connect(rqpair);
if (rc < 0) { if (rc < 0) {
nvme_rdma_qpair_destroy(qpair); nvme_rdma_qpair_destroy(qpair);
return NULL; return NULL;
@ -1323,7 +1304,7 @@ nvme_rdma_ctrlr_delete_io_qpair(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_
int int
nvme_rdma_ctrlr_reinit_io_qpair(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_qpair *qpair) nvme_rdma_ctrlr_reinit_io_qpair(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_qpair *qpair)
{ {
return _nvme_rdma_ctrlr_create_qpair(ctrlr, qpair); return nvme_rdma_qpair_connect(nvme_rdma_qpair(qpair));
} }
int int