ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "ocf: clarify deprecation notice"

Browse Source 
This reverts commit c5224a96ae.

OCF deprecation notice has removed as
Huawei is picking up support for the OCF project.

Signed-off-by: Amir Haroush <amir.haroush@huawei.com>
Signed-off-by: Shai Fultheim <shai.fultheim@huawei.com>
Change-Id: I80ebfe75eaa1a9b96249ed578fcaff6e9576928f
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/17893
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Shuhei Matsumoto <smatsumoto@nvidia.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Mellanox Build Bot
This commit is contained in:
Amir Haroush 2023-05-01 16:29:35 +03:00 committed by David Ko
parent 57fd506c57
commit 90e1d2b02c
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure vendored
View File

@ -1101,6 +1101,7 @@ if echo -e '#include <uuid/uuid.h>\nint main(void) { uuid_generate_sha1(NULL, NU
fi fi
if [[ "${CONFIG[OCF]}" = "y" ]]; then 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 OCF_PATH is a file, assume it is a library and use it to compile with
if [ -f ${CONFIG[OCF_PATH]} ]; then if [ -f ${CONFIG[OCF_PATH]} ]; then
CONFIG[CUSTOMOCF]=y CONFIG[CUSTOMOCF]=y

7
deprecation.md
View File

@ -34,11 +34,8 @@ VTune integration is in now deprecated and will be removed in SPDK 23.05.
#### `bdev_ocf` #### `bdev_ocf`
The Open CAS Framework (OCF) integration via bdev module and env_ocf is currently marked The Open CAS Framework (OCF) integration via bdev module and env_ocf is now deprecated
deprecated due to discontinued support from Intel. However, Huawei is working to pick up and will be removed in SPDK 23.05.
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.
### nvme ### nvme

7
module/bdev/ocf/vbdev_ocf.c
View File

@ -1286,10 +1286,7 @@ error_free:
return rc; return rc;
} }
/* This deprecation is likely to be removed, and the ocf support will remain SPDK_LOG_DEPRECATION_REGISTER(bdev_ocf, "bdev_ocf support", "SPDK 23.05", 0);
* in SPDK. See deprecation.md for more details.
*/
SPDK_LOG_DEPRECATION_REGISTER(bdev_ocf, "bdev_ocf support", "SPDK 23.09", 0);
/* Read configuration file at the start of SPDK application /* Read configuration file at the start of SPDK application
* This adds vbdevs to global list if some mentioned in config */ * This adds vbdevs to global list if some mentioned in config */
@ -1298,6 +1295,8 @@ vbdev_ocf_init(void)
{ {
int status; int status;
SPDK_LOG_DEPRECATED(bdev_ocf);
status = vbdev_ocf_ctx_init(); status = vbdev_ocf_ctx_init();
if (status) { if (status) {
SPDK_ERRLOG("OCF ctx initialization failed with=%d\n", status); SPDK_ERRLOG("OCF ctx initialization failed with=%d\n", status);