Commit 10db58ef authored by Amir Haroush's avatar Amir Haroush Committed by Jim Harris
Browse files

Revert "ocf: clarify deprecation notice" 



This reverts commit c5224a96.

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

Signed-off-by: default avatarAmir Haroush <amir.haroush@huawei.com>
Signed-off-by: default avatarShai Fultheim <shai.fultheim@huawei.com>
Change-Id: I80ebfe75eaa1a9b96249ed578fcaff6e9576928f
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/17893


Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <smatsumoto@nvidia.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Mellanox Build Bot
parent ff12a5ed

configure

+1 −0
Original line number Diff line number Diff line
@@ -1101,6 +1101,7 @@ if echo -e '#include <uuid/uuid.h>\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

deprecation.md

+2 −5
Original line number Diff line number Diff line
@@ -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

module/bdev/ocf/vbdev_ocf.c

+3 −4
Original line number Diff line number Diff line
@@ -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);