diff --git a/configure b/configure index 307c9f70d..f58f22a2c 100755 --- a/configure +++ b/configure @@ -97,7 +97,7 @@ function usage() { echo " --without-iscsi-initiator No path required." echo " --with-vtune=DIR Required to profile I/O under Intel VTune Amplifier XE. (Deprecated)" echo " --without-vtune example: /opt/intel/vtune_amplifier_xe_version" - echo " --with-ocf[=DIR] Build OCF library and bdev module. (Deprecated)" + echo " --with-ocf[=DIR] Build OCF library and bdev module." echo " --without-ocf If argument is directory, interpret it as root of OCF repo" echo " If argument is file, interpret it as compiled OCF lib" echo " If no argument is specified, OCF git submodule is used by default" @@ -1101,7 +1101,6 @@ if echo -e '#include \nint main(void) { uuid_generate_sha1(NULL, NU fi if [[ "${CONFIG[OCF]}" = "y" ]]; then - echo "WARNING: OCF - bdev_ocf is deprecated." # If OCF_PATH is a file, assume it is a library and use it to compile with if [ -f ${CONFIG[OCF_PATH]} ]; then CONFIG[CUSTOMOCF]=y diff --git a/deprecation.md b/deprecation.md index 3b0a2cf4f..b0f4528ee 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. -### OCF - -#### `bdev_ocf` - -The Open CAS Framework (OCF) integration via bdev module and env_ocf is now deprecated -and will be removed in SPDK 23.05. - ### nvme #### `nvme_ctrlr_prepare_for_reset` diff --git a/module/bdev/ocf/vbdev_ocf.c b/module/bdev/ocf/vbdev_ocf.c index 94ef12d64..daa6cac23 100644 --- a/module/bdev/ocf/vbdev_ocf.c +++ b/module/bdev/ocf/vbdev_ocf.c @@ -1286,8 +1286,6 @@ error_free: return rc; } -SPDK_LOG_DEPRECATION_REGISTER(bdev_ocf, "bdev_ocf support", "SPDK 23.05", 0); - /* Read configuration file at the start of SPDK application * This adds vbdevs to global list if some mentioned in config */ static int @@ -1295,8 +1293,6 @@ vbdev_ocf_init(void) { int status; - SPDK_LOG_DEPRECATED(bdev_ocf); - status = vbdev_ocf_ctx_init(); if (status) { SPDK_ERRLOG("OCF ctx initialization failed with=%d\n", status);