From 5263f0a12f4a7f45f08bc461aee9c9519f331de4 Mon Sep 17 00:00:00 2001 From: Konrad Sztyber Date: Wed, 11 Aug 2021 11:16:38 +0200 Subject: [PATCH] nvme: extract qpair connect fail to a seprate function In the next patch, the qpair is polled from a poll group and needs a disconnect callback, which should also fail the qpair, so it makes sense to have a separate function doing that. Signed-off-by: Konrad Sztyber Change-Id: Ied76431520962b25220027be829a4609afb6bbda Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/9157 Tested-by: SPDK CI Jenkins Community-CI: Broadcom CI Community-CI: Mellanox Build Bot Reviewed-by: Ben Walker Reviewed-by: Aleksey Marchuk --- lib/nvme/nvme_transport.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/lib/nvme/nvme_transport.c b/lib/nvme/nvme_transport.c index 28b957103..6fcefd151 100644 --- a/lib/nvme/nvme_transport.c +++ b/lib/nvme/nvme_transport.c @@ -349,6 +349,17 @@ nvme_transport_ctrlr_delete_io_qpair(struct spdk_nvme_ctrlr *ctrlr, struct spdk_ } } +static void +nvme_transport_connect_qpair_fail(struct spdk_nvme_qpair *qpair) +{ + struct spdk_nvme_ctrlr *ctrlr = qpair->ctrlr; + + /* If the qpair was unable to reconnect, restore the original failure reason */ + qpair->transport_failure_reason = qpair->last_transport_failure_reason; + nvme_transport_ctrlr_disconnect_qpair(ctrlr, qpair); + nvme_qpair_set_state(qpair, NVME_QPAIR_DISCONNECTED); +} + int nvme_transport_ctrlr_connect_qpair(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_qpair *qpair) { @@ -387,12 +398,8 @@ nvme_transport_ctrlr_connect_qpair(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nv } return 0; - err: - /* If the qpair was unable to reconnect, restore the original failure reason. */ - qpair->transport_failure_reason = qpair->last_transport_failure_reason; - nvme_transport_ctrlr_disconnect_qpair(ctrlr, qpair); - nvme_qpair_set_state(qpair, NVME_QPAIR_DISCONNECTED); + nvme_transport_connect_qpair_fail(qpair); return rc; }