From 37028231dbd504e2e90383278b9f50a0cb066857 Mon Sep 17 00:00:00 2001
From: Rafal Stefanowski <rafal.stefanowski@intel.com>
Date: Mon, 15 Feb 2021 11:25:42 +0100
Subject: [PATCH] bdev/ocf: OCF 20.12.1 requirements

OCF now includes on its own only small part of env, that is crucial for
compiling headers for casadm - an OCL management tool. The idea behind
this is to reduce the amount of included stuff when it is not needed.

Signed-off-by: Rafal Stefanowski <rafal.stefanowski@intel.com>
Change-Id: I58fef2be3ccb1cce743093ed973ba54cdbb605e1
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/6413
Community-CI: Broadcom CI
Community-CI: Mellanox Build Bot
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
---
 module/bdev/ocf/ctx.c    | 1 -
 module/bdev/ocf/ctx.h    | 1 +
 module/bdev/ocf/data.h   | 1 +
 module/bdev/ocf/volume.h | 1 -
 4 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/bdev/ocf/ctx.c b/module/bdev/ocf/ctx.c
index ed9991752..e41da05bb 100644
--- a/module/bdev/ocf/ctx.c
+++ b/module/bdev/ocf/ctx.c
@@ -37,7 +37,6 @@
 #include "spdk/log.h"
 
 #include "ctx.h"
-#include "ocf_env.h"
 #include "data.h"
 
 ocf_ctx_t vbdev_ocf_ctx;
diff --git a/module/bdev/ocf/ctx.h b/module/bdev/ocf/ctx.h
index 446ac8d8f..4419ef5e5 100644
--- a/module/bdev/ocf/ctx.h
+++ b/module/bdev/ocf/ctx.h
@@ -35,6 +35,7 @@
 #define VBDEV_OCF_CTX_H
 
 #include <ocf/ocf.h>
+#include "ocf_env.h"
 #include "spdk/thread.h"
 
 extern ocf_ctx_t vbdev_ocf_ctx;
diff --git a/module/bdev/ocf/data.h b/module/bdev/ocf/data.h
index 7ed5adcef..56e8398e0 100644
--- a/module/bdev/ocf/data.h
+++ b/module/bdev/ocf/data.h
@@ -34,6 +34,7 @@
 #ifndef VBDEV_OCF_DATA_H
 #define VBDEV_OCF_DATA_H
 
+#include "ocf_env.h"
 #include "spdk/bdev_module.h"
 
 struct bdev_ocf_data {
diff --git a/module/bdev/ocf/volume.h b/module/bdev/ocf/volume.h
index 6ae7488b5..20b4bff72 100644
--- a/module/bdev/ocf/volume.h
+++ b/module/bdev/ocf/volume.h
@@ -36,7 +36,6 @@
 
 #include <ocf/ocf.h>
 
-#include "ocf_env.h"
 #include "ctx.h"
 #include "data.h"