From 0badf81e6201cb64c926f5da651711ed03075429 Mon Sep 17 00:00:00 2001 From: Jim Harris Date: Thu, 10 Feb 2022 12:29:52 +0000 Subject: [PATCH] bdev: remove deprecated spdk_bdev_module_finish_done() For reference, this was deprecated in Aug 2020, commit ID 511fe1553. Signed-off-by: Jim Harris Change-Id: Ic0a16af9113b8b136271a2ce6a071bbc379261c4 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/11545 Tested-by: SPDK CI Jenkins Community-CI: Broadcom CI Community-CI: Mellanox Build Bot Reviewed-by: Changpeng Liu Reviewed-by: Aleksey Marchuk --- CHANGELOG.md | 4 ++++ deprecation.md | 5 ----- include/spdk/bdev_module.h | 1 - lib/bdev/bdev.c | 8 -------- lib/bdev/spdk_bdev.map | 1 - 5 files changed, 4 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e1d267bdb..145f4106b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## v22.05: (Upcoming Release) +### bdev + +Removed deprecated spdk_bdev_module_finish_done(). Use spdk_bdev_module_fini_done() instead. + ### bdev_nvme Added `bdev_nvme_add_error_injection` and `bdev_nvme_remove_error_injection` RPCs to add and diff --git a/deprecation.md b/deprecation.md index 5c028ee5a..6125a3597 100644 --- a/deprecation.md +++ b/deprecation.md @@ -14,11 +14,6 @@ ABI cannot be removed without providing deprecation notice for at least single S ## Deprecation Notices {#deprecation-notices} -### bdev - -Deprecated `spdk_bdev_module_finish_done()` API, which will be removed in SPDK 22.01. -Bdev modules should use `spdk_bdev_module_fini_done()` instead. - ### nvme Deprecated `spdk_nvme_ctrlr_reset_async` and `spdk_nvme_ctrlr_reset_poll_async` APIs, diff --git a/include/spdk/bdev_module.h b/include/spdk/bdev_module.h index 57399bcd8..d26b7e395 100644 --- a/include/spdk/bdev_module.h +++ b/include/spdk/bdev_module.h @@ -843,7 +843,6 @@ void spdk_bdev_module_init_done(struct spdk_bdev_module *module); * */ void spdk_bdev_module_fini_done(void); -void spdk_bdev_module_finish_done(void); /* Deprecated */ /** * Indicate that the module fini start has completed. diff --git a/lib/bdev/bdev.c b/lib/bdev/bdev.c index 070cd1b00..0b63770b2 100644 --- a/lib/bdev/bdev.c +++ b/lib/bdev/bdev.c @@ -1635,14 +1635,6 @@ spdk_bdev_module_fini_done(void) } } -/* Deprecated */ -void -spdk_bdev_module_finish_done(void) -{ - SPDK_NOTICELOG("spdk_bdev_module_finish_done() is deprecated, please use spdk_bdev_module_fini_done().\n"); - spdk_bdev_module_fini_done(); -} - static void bdev_finish_unregister_bdevs_iter(void *cb_arg, int bdeverrno) { diff --git a/lib/bdev/spdk_bdev.map b/lib/bdev/spdk_bdev.map index d6930d352..a3fc74fb4 100644 --- a/lib/bdev/spdk_bdev.map +++ b/lib/bdev/spdk_bdev.map @@ -105,7 +105,6 @@ spdk_bdev_module_examine_done; spdk_bdev_module_init_done; spdk_bdev_module_fini_done; - spdk_bdev_module_finish_done; spdk_bdev_module_fini_start_done; spdk_bdev_module_claim_bdev; spdk_bdev_module_release_bdev;