Commit 14e67af3 authored by Jim Harris's avatar Jim Harris Committed by Changpeng Liu
Browse files

nvme: rename reinit_io_qpair to reconnect_qpair 



This better explains what the function is doing,
and makes the name more general so we can use it
for the adminq as well.

Signed-off-by: default avatarJim Harris <james.r.harris@intel.com>
Change-Id: I6b55761cb141a9a79cdef876be47995d8813b312

Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/453480


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
parent 3a1b2ec2

lib/nvme/nvme_ctrlr.c

+1 −1
Original line number Diff line number Diff line
@@ -866,7 +866,7 @@ spdk_nvme_ctrlr_reset(struct spdk_nvme_ctrlr *ctrlr) 
	if (!ctrlr->is_failed) {

		/* Reinitialize qpairs */

		TAILQ_FOREACH(qpair, &ctrlr->active_io_qpairs, tailq) {

			if (nvme_transport_ctrlr_reinit_io_qpair(ctrlr, qpair) != 0) {

			if (nvme_transport_ctrlr_reconnect_qpair(ctrlr, qpair) != 0) {

				nvme_ctrlr_fail(ctrlr, false);

				rc = -1;

			}

lib/nvme/nvme_internal.h

+1 −1
Original line number Diff line number Diff line
@@ -987,7 +987,7 @@ struct spdk_nvme_ctrlr *spdk_nvme_get_ctrlr_by_trid_unsafe( 
	void *nvme_ ## name ## _ctrlr_alloc_cmb_io_buffer(struct spdk_nvme_ctrlr *ctrlr, size_t size); \

	int nvme_ ## name ## _ctrlr_free_cmb_io_buffer(struct spdk_nvme_ctrlr *ctrlr, void *buf, size_t size); \

	int nvme_ ## name ## _ctrlr_delete_io_qpair(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_qpair *qpair); \

	int nvme_ ## name ## _ctrlr_reinit_io_qpair(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_qpair *qpair); \

	int nvme_ ## name ## _ctrlr_reconnect_qpair(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_qpair *qpair); \

	int nvme_ ## name ## _qpair_enable(struct spdk_nvme_qpair *qpair); \

	int nvme_ ## name ## _qpair_disable(struct spdk_nvme_qpair *qpair); \

	int nvme_ ## name ## _qpair_reset(struct spdk_nvme_qpair *qpair); \

lib/nvme/nvme_pcie.c

+6 −2
Original line number Diff line number Diff line
@@ -1676,10 +1676,14 @@ nvme_pcie_ctrlr_create_io_qpair(struct spdk_nvme_ctrlr *ctrlr, uint16_t qid, 
}



int

nvme_pcie_ctrlr_reinit_io_qpair(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_qpair *qpair)

nvme_pcie_ctrlr_reconnect_qpair(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_qpair *qpair)

{

	if (nvme_qpair_is_admin_queue(qpair)) {

		return 0;

	} else {

		return _nvme_pcie_ctrlr_create_io_qpair(ctrlr, qpair, qpair->id);

	}

}



int

nvme_pcie_ctrlr_delete_io_qpair(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_qpair *qpair)

lib/nvme/nvme_rdma.c

+1 −1
Original line number Diff line number Diff line
@@ -1591,7 +1591,7 @@ nvme_rdma_ctrlr_delete_io_qpair(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_ 
}



int

nvme_rdma_ctrlr_reinit_io_qpair(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_qpair *qpair)

nvme_rdma_ctrlr_reconnect_qpair(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_qpair *qpair)

{

	return nvme_rdma_qpair_connect(nvme_rdma_qpair(qpair));

}

lib/nvme/nvme_tcp.c

+1 −1
Original line number Diff line number Diff line
@@ -728,7 +728,7 @@ nvme_tcp_ctrlr_delete_io_qpair(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_q 
}



int

nvme_tcp_ctrlr_reinit_io_qpair(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_qpair *qpair)

nvme_tcp_ctrlr_reconnect_qpair(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_qpair *qpair)

{

	return -1;

}