From 10db58ef774ec7f33a99e64ac5ff60e175702390 Mon Sep 17 00:00:00 2001 From: Amir Haroush Date: Mon, 1 May 2023 16:29:35 +0300 Subject: [PATCH] Revert "ocf: clarify deprecation notice" This reverts commit c5224a96ae5d68954845a11b812b3d020b4e8015. OCF deprecation notice has removed as Huawei is picking up support for the OCF project. Signed-off-by: Amir Haroush Signed-off-by: Shai Fultheim Change-Id: I80ebfe75eaa1a9b96249ed578fcaff6e9576928f Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/17893 Reviewed-by: Jim Harris Reviewed-by: Shuhei Matsumoto Tested-by: SPDK CI Jenkins Community-CI: Mellanox Build Bot --- configure | 1 + deprecation.md | 7 ++----- module/bdev/ocf/vbdev_ocf.c | 7 +++---- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/configure b/configure index bb69b85dd..307c9f70d 100755 --- a/configure +++ b/configure @@ -1101,6 +1101,7 @@ 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 6f0a083f4..3b0a2cf4f 100644 --- a/deprecation.md +++ b/deprecation.md @@ -34,11 +34,8 @@ VTune integration is in now deprecated and will be removed in SPDK 23.05. #### `bdev_ocf` -The Open CAS Framework (OCF) integration via bdev module and env_ocf is currently marked -deprecated due to discontinued support from Intel. However, Huawei is working to pick up -support for these components, and the OCF project in general. This code will definitely -remain in SPDK 23.05 release, in fact it is likely deprecation notice will be removed by -then. +The Open CAS Framework (OCF) integration via bdev module and env_ocf is now deprecated +and will be removed in SPDK 23.05. ### nvme diff --git a/module/bdev/ocf/vbdev_ocf.c b/module/bdev/ocf/vbdev_ocf.c index abb36f74c..94ef12d64 100644 --- a/module/bdev/ocf/vbdev_ocf.c +++ b/module/bdev/ocf/vbdev_ocf.c @@ -1286,10 +1286,7 @@ error_free: return rc; } -/* This deprecation is likely to be removed, and the ocf support will remain - * in SPDK. See deprecation.md for more details. - */ -SPDK_LOG_DEPRECATION_REGISTER(bdev_ocf, "bdev_ocf support", "SPDK 23.09", 0); +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 */ @@ -1298,6 +1295,8 @@ 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);