diff --git a/configure b/configure index a07190114..5935ff50e 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." + echo " --with-ocf[=DIR] Build OCF library and bdev module. (Deprecated)" 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" @@ -1110,6 +1110,7 @@ if echo -e '#include \nint main(void) { arc4random(); return 0; }\n' \ 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 9f864d2b6..81bd82d34 100644 --- a/deprecation.md +++ b/deprecation.md @@ -42,6 +42,13 @@ without the benefits of persistency. 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 50dc77448..0c12856f0 100644 --- a/module/bdev/ocf/vbdev_ocf.c +++ b/module/bdev/ocf/vbdev_ocf.c @@ -1256,6 +1256,8 @@ 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 @@ -1263,6 +1265,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);