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

nvme: remove qpair_disable 



This transport function is a complete nop now, so
remove it.

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

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


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

lib/nvme/nvme_ctrlr.c

+0 −6
Original line number Diff line number Diff line
@@ -849,12 +849,6 @@ spdk_nvme_ctrlr_reset(struct spdk_nvme_ctrlr *ctrlr) 
		nvme_qpair_complete_error_reqs(qpair);

	}



	/* Disable all queues before disabling the controller hardware. */

	nvme_qpair_disable(ctrlr->adminq);

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

		nvme_qpair_disable(qpair);

	}



	/* Doorbell buffer config is invalid during reset */

	nvme_ctrlr_free_doorbell_buffer(ctrlr);

lib/nvme/nvme_internal.h

+0 −1
Original line number Diff line number Diff line
@@ -992,7 +992,6 @@ struct spdk_nvme_ctrlr *spdk_nvme_get_ctrlr_by_trid_unsafe( 
	int nvme_ ## name ## _ctrlr_delete_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); \

	void nvme_ ## name ## _qpair_abort_reqs(struct spdk_nvme_qpair *qpair, uint32_t dnr); \

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

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

	int nvme_ ## name ## _qpair_submit_request(struct spdk_nvme_qpair *qpair, struct nvme_request *req); \

	int32_t nvme_ ## name ## _qpair_process_completions(struct spdk_nvme_qpair *qpair, uint32_t max_completions); \

lib/nvme/nvme_pcie.c

+0 −22
Original line number Diff line number Diff line
@@ -1416,28 +1416,6 @@ nvme_pcie_qpair_abort_reqs(struct spdk_nvme_qpair *qpair, uint32_t dnr) 
	nvme_pcie_qpair_abort_trackers(qpair, dnr);

}



static void

nvme_pcie_admin_qpair_disable(struct spdk_nvme_qpair *qpair)

{

}



static void

nvme_pcie_io_qpair_disable(struct spdk_nvme_qpair *qpair)

{

}



int

nvme_pcie_qpair_disable(struct spdk_nvme_qpair *qpair)

{

	if (nvme_qpair_is_io_queue(qpair)) {

		nvme_pcie_io_qpair_disable(qpair);

	} else {

		nvme_pcie_admin_qpair_disable(qpair);

	}



	return 0;

}



static int

nvme_pcie_ctrlr_cmd_create_io_cq(struct spdk_nvme_ctrlr *ctrlr,

				 struct spdk_nvme_qpair *io_que, spdk_nvme_cmd_cb cb_fn,

lib/nvme/nvme_qpair.c

+0 −1
Original line number Diff line number Diff line
@@ -618,7 +618,6 @@ void 
nvme_qpair_disable(struct spdk_nvme_qpair *qpair)

{

	qpair->is_enabled = false;

	nvme_transport_qpair_disable(qpair);

}



static void

lib/nvme/nvme_rdma.c

+0 −7
Original line number Diff line number Diff line
@@ -1598,13 +1598,6 @@ nvme_rdma_ctrlr_reconnect_qpair(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_ 
	return nvme_rdma_qpair_connect(nvme_rdma_qpair(qpair));

}



int

nvme_rdma_qpair_disable(struct spdk_nvme_qpair *qpair)

{

	/* Currently, doing nothing here */

	return 0;

}



int

nvme_rdma_qpair_reset(struct spdk_nvme_qpair *qpair)

{