From 77c4657140f251badf98eff141fd59daa77931df Mon Sep 17 00:00:00 2001 From: Shuhei Matsumoto Date: Tue, 22 Feb 2022 10:49:21 +0900 Subject: [PATCH] nvme_rdma: Factor out destroying rdma qpair operation Signed-off-by: Shuhei Matsumoto Change-Id: I18e166a726cca69f13e7c5818eba57f478726286 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/11689 Tested-by: SPDK CI Jenkins Community-CI: Broadcom CI Community-CI: Mellanox Build Bot Reviewed-by: Ben Walker Reviewed-by: Aleksey Marchuk Reviewed-by: John Kariuki --- lib/nvme/nvme_rdma.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/lib/nvme/nvme_rdma.c b/lib/nvme/nvme_rdma.c index e212b5b27..6499388a5 100644 --- a/lib/nvme/nvme_rdma.c +++ b/lib/nvme/nvme_rdma.c @@ -1922,13 +1922,9 @@ nvme_rdma_ctrlr_create_qpair(struct spdk_nvme_ctrlr *ctrlr, return qpair; } -static int -nvme_rdma_qpair_disconnected(struct nvme_rdma_qpair *rqpair, int ret) +static void +nvme_rdma_qpair_destroy(struct nvme_rdma_qpair *rqpair) { - if (ret) { - SPDK_DEBUGLOG(nvme, "Target did not respond to qpair disconnect.\n"); - } - if (rqpair->cm_id) { if (rqpair->rdma_qp) { spdk_rdma_qp_destroy(rqpair->rdma_qp); @@ -1943,6 +1939,16 @@ nvme_rdma_qpair_disconnected(struct nvme_rdma_qpair *rqpair, int ret) ibv_destroy_cq(rqpair->cq); rqpair->cq = NULL; } +} + +static int +nvme_rdma_qpair_disconnected(struct nvme_rdma_qpair *rqpair, int ret) +{ + if (ret) { + SPDK_DEBUGLOG(nvme, "Target did not respond to qpair disconnect.\n"); + } + + nvme_rdma_qpair_destroy(rqpair); rqpair->state = NVME_RDMA_QPAIR_STATE_EXITED;