diff --git a/deprecation.md b/deprecation.md index b0f4528ee..0c778744a 100644 --- a/deprecation.md +++ b/deprecation.md @@ -30,13 +30,6 @@ Please see: [UPDATE ON PMDK AND OUR LONG TERM SUPPORT STRATEGY](https://pmem.io/ VTune integration is in now deprecated and will be removed in SPDK 23.05. -### nvme - -#### `nvme_ctrlr_prepare_for_reset` - -Deprecated `spdk_nvme_ctrlr_prepare_for_reset` API, which will be removed in SPDK 22.01. -For PCIe transport, `spdk_nvme_ctrlr_disconnect` should be used before freeing I/O qpairs. - ### nvmf #### `spdk_nvmf_qpair_disconnect` diff --git a/include/spdk/nvme.h b/include/spdk/nvme.h index 15292bb67..4f5abb26b 100644 --- a/include/spdk/nvme.h +++ b/include/spdk/nvme.h @@ -1095,18 +1095,6 @@ void spdk_nvme_ctrlr_set_remove_cb(struct spdk_nvme_ctrlr *ctrlr, */ int spdk_nvme_ctrlr_reset(struct spdk_nvme_ctrlr *ctrlr); -/** - * Inform the driver that the application is preparing to reset the specified NVMe controller. - * (Deprecated, please use spdk_nvme_ctrlr_disconnect() before freeing I/O qpairs instead.) - * - * This function allows the driver to make decisions knowing that a reset is about to happen. - * For example, the pcie transport in this case could skip sending DELETE_CQ and DELETE_SQ - * commands to the controller if an io qpair is freed after this function is called. - * - * \param ctrlr Opaque handle to NVMe controller. - */ -void spdk_nvme_ctrlr_prepare_for_reset(struct spdk_nvme_ctrlr *ctrlr); - /** * Disconnect the given NVMe controller. * diff --git a/lib/nvme/nvme_ctrlr.c b/lib/nvme/nvme_ctrlr.c index 90161fd97..1bdd618f2 100644 --- a/lib/nvme/nvme_ctrlr.c +++ b/lib/nvme/nvme_ctrlr.c @@ -1838,19 +1838,6 @@ spdk_nvme_ctrlr_reset(struct spdk_nvme_ctrlr *ctrlr) return rc; } -SPDK_LOG_DEPRECATION_REGISTER(nvme_ctrlr_prepare_for_reset, - "spdk_nvme_ctrlr_prepare_for_reset() is deprecated", - "SPDK 22.01", 0); - -void -spdk_nvme_ctrlr_prepare_for_reset(struct spdk_nvme_ctrlr *ctrlr) -{ - SPDK_LOG_DEPRECATED(nvme_ctrlr_prepare_for_reset); - nvme_robust_mutex_lock(&ctrlr->ctrlr_lock); - ctrlr->prepare_for_reset = true; - nvme_robust_mutex_unlock(&ctrlr->ctrlr_lock); -} - int spdk_nvme_ctrlr_reset_subsystem(struct spdk_nvme_ctrlr *ctrlr) { diff --git a/lib/nvme/spdk_nvme.map b/lib/nvme/spdk_nvme.map index 5207ac456..ff13f5038 100644 --- a/lib/nvme/spdk_nvme.map +++ b/lib/nvme/spdk_nvme.map @@ -39,7 +39,6 @@ spdk_nvme_ctrlr_set_trid; spdk_nvme_ctrlr_reset_subsystem; spdk_nvme_ctrlr_reset; - spdk_nvme_ctrlr_prepare_for_reset; spdk_nvme_ctrlr_reset_async; spdk_nvme_ctrlr_reset_poll_async; spdk_nvme_ctrlr_disconnect; diff --git a/test/unit/lib/bdev/nvme/bdev_nvme.c/bdev_nvme_ut.c b/test/unit/lib/bdev/nvme/bdev_nvme.c/bdev_nvme_ut.c index b082818fb..7ac946ac0 100644 --- a/test/unit/lib/bdev/nvme/bdev_nvme.c/bdev_nvme_ut.c +++ b/test/unit/lib/bdev/nvme/bdev_nvme.c/bdev_nvme_ut.c @@ -229,8 +229,6 @@ DEFINE_STUB(spdk_accel_submit_crc32cv, int, (struct spdk_io_channel *ch, uint32_ struct iovec *iov, uint32_t iov_cnt, uint32_t seed, spdk_accel_completion_cb cb_fn, void *cb_arg), 0); -DEFINE_STUB_V(spdk_nvme_ctrlr_prepare_for_reset, (struct spdk_nvme_ctrlr *ctrlr)); - struct ut_nvme_req { uint16_t opc; spdk_nvme_cmd_cb cb_fn;