Commit 5263f0a1 authored by Konrad Sztyber's avatar Konrad Sztyber Committed by Tomasz Zawadzki
Browse files

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: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Change-Id: Ied76431520962b25220027be829a4609afb6bbda
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/9157


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Community-CI: Mellanox Build Bot
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
parent 771f65bb

lib/nvme/nvme_transport.c

+12 −5
Original line number Diff line number Diff line
@@ -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;

}