diff --git a/lib/nvme/nvme_ctrlr.c b/lib/nvme/nvme_ctrlr.c index 54e13e2c9..e9438ccdf 100644 --- a/lib/nvme/nvme_ctrlr.c +++ b/lib/nvme/nvme_ctrlr.c @@ -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); diff --git a/lib/nvme/nvme_internal.h b/lib/nvme/nvme_internal.h index 95e0deee4..3071814d2 100644 --- a/lib/nvme/nvme_internal.h +++ b/lib/nvme/nvme_internal.h @@ -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); \ diff --git a/lib/nvme/nvme_pcie.c b/lib/nvme/nvme_pcie.c index a914617ae..732635ece 100644 --- a/lib/nvme/nvme_pcie.c +++ b/lib/nvme/nvme_pcie.c @@ -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, diff --git a/lib/nvme/nvme_qpair.c b/lib/nvme/nvme_qpair.c index 7bcb7ac2e..be697af7a 100644 --- a/lib/nvme/nvme_qpair.c +++ b/lib/nvme/nvme_qpair.c @@ -618,7 +618,6 @@ void nvme_qpair_disable(struct spdk_nvme_qpair *qpair) { qpair->is_enabled = false; - nvme_transport_qpair_disable(qpair); } static void diff --git a/lib/nvme/nvme_rdma.c b/lib/nvme/nvme_rdma.c index 662fa9d1f..9589ba70e 100644 --- a/lib/nvme/nvme_rdma.c +++ b/lib/nvme/nvme_rdma.c @@ -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) { diff --git a/lib/nvme/nvme_tcp.c b/lib/nvme/nvme_tcp.c index 9c48ae418..4b8887498 100644 --- a/lib/nvme/nvme_tcp.c +++ b/lib/nvme/nvme_tcp.c @@ -735,12 +735,6 @@ nvme_tcp_ctrlr_reconnect_qpair(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_q return -1; } -int -nvme_tcp_qpair_disable(struct spdk_nvme_qpair *qpair) -{ - return 0; -} - int nvme_tcp_qpair_reset(struct spdk_nvme_qpair *qpair) { diff --git a/lib/nvme/nvme_transport.c b/lib/nvme/nvme_transport.c index f4417d70e..063f56f3f 100644 --- a/lib/nvme/nvme_transport.c +++ b/lib/nvme/nvme_transport.c @@ -192,12 +192,6 @@ nvme_transport_qpair_abort_reqs(struct spdk_nvme_qpair *qpair, uint32_t dnr) NVME_TRANSPORT_CALL(qpair->trtype, qpair_abort_reqs, (qpair, dnr)); } -int -nvme_transport_qpair_disable(struct spdk_nvme_qpair *qpair) -{ - NVME_TRANSPORT_CALL(qpair->trtype, qpair_disable, (qpair)); -} - int nvme_transport_qpair_reset(struct spdk_nvme_qpair *qpair) { diff --git a/test/unit/lib/nvme/nvme_qpair.c/nvme_qpair_ut.c b/test/unit/lib/nvme/nvme_qpair.c/nvme_qpair_ut.c index 93d5052c9..9034df6f1 100644 --- a/test/unit/lib/nvme/nvme_qpair.c/nvme_qpair_ut.c +++ b/test/unit/lib/nvme/nvme_qpair.c/nvme_qpair_ut.c @@ -56,12 +56,6 @@ nvme_request_remove_child(struct nvme_request *parent, TAILQ_REMOVE(&parent->children, child, child_tailq); } -int -nvme_transport_qpair_disable(struct spdk_nvme_qpair *qpair) -{ - return 0; -} - void nvme_transport_qpair_abort_reqs(struct spdk_nvme_qpair *qpair, uint32_t dnr) {