From a34f905a743ecb1a992271e4ad82ed900db8b1fe Mon Sep 17 00:00:00 2001
From: Piotr Pelplinski <piotr.pelplinski@intel.com>
Date: Thu, 18 Apr 2019 15:36:27 +0200
Subject: [PATCH] OCF: Update ocf submodule to version OCF v19.3.1

This patch updates submodule and appropiate functions.

Signed-off-by: Piotr Pelplinski <piotr.pelplinski@intel.com>
Change-Id: I8cd7707058745cdc3e91f7d821bf215ff9287c86
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/451463
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
---
 lib/bdev/ocf/ctx.c         |  2 +-
 lib/bdev/ocf/env/ocf_env.h | 11 +++++++++++
 lib/bdev/ocf/volume.c      |  2 +-
 ocf                        |  2 +-
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/lib/bdev/ocf/ctx.c b/lib/bdev/ocf/ctx.c
index 7d27403c1a..6a1661e972 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 3471a7cd28..86dd9ce0d1 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 331441c4fe..72a4328434 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 08a5b9d2a4..9f927de841 160000
--- a/ocf
+++ b/ocf
@@ -1 +1 @@
-Subproject commit 08a5b9d2a4dcc894abb88d90117858237c3a39a1
+Subproject commit 9f927de841e82d07fda63c5ad3536620b536f5e0