diff --git a/lib/bdev/ocf/ctx.c b/lib/bdev/ocf/ctx.c index 7d27403c1..6a1661e97 100644 --- a/lib/bdev/ocf/ctx.c +++ b/lib/bdev/ocf/ctx.c @@ -491,7 +491,7 @@ static const struct ocf_ctx_config vbdev_ocf_ctx_cfg = { }, .logger = { - .printf = vbdev_ocf_ctx_log_printf, + .print = vbdev_ocf_ctx_log_printf, .dump_stack = NULL, }, diff --git a/lib/bdev/ocf/env/ocf_env.h b/lib/bdev/ocf/env/ocf_env.h index 3471a7cd2..86dd9ce0d 100644 --- a/lib/bdev/ocf/env/ocf_env.h +++ b/lib/bdev/ocf/env/ocf_env.h @@ -145,6 +145,17 @@ static inline void *env_vzalloc(size_t size) SPDK_MALLOC_DMA); } +static inline void *env_secure_alloc(size_t size) +{ + return spdk_zmalloc(size, 0, NULL, SPDK_ENV_LCORE_ID_ANY, + SPDK_MALLOC_DMA); +} + +static inline void env_secure_free(const void *ptr, size_t size) +{ + return spdk_free((void *)ptr); +} + static inline void env_vfree(const void *ptr) { return spdk_free((void *)ptr); diff --git a/lib/bdev/ocf/volume.c b/lib/bdev/ocf/volume.c index 331441c4f..72a432843 100644 --- a/lib/bdev/ocf/volume.c +++ b/lib/bdev/ocf/volume.c @@ -44,7 +44,7 @@ #include "vbdev_ocf.h" static int -vbdev_ocf_volume_open(ocf_volume_t volume) +vbdev_ocf_volume_open(ocf_volume_t volume, void *opts) { struct vbdev_ocf_base **priv = ocf_volume_get_priv(volume); struct vbdev_ocf_base *base = vbdev_ocf_get_base_by_name(ocf_volume_get_uuid(volume)->data); diff --git a/ocf b/ocf index 08a5b9d2a..9f927de84 160000 --- a/ocf +++ b/ocf @@ -1 +1 @@ -Subproject commit 08a5b9d2a4dcc894abb88d90117858237c3a39a1 +Subproject commit 9f927de841e82d07fda63c5ad3536620b536f5e0