From d2af0bafda2aa2075eba860d1b153bb1483111d8 Mon Sep 17 00:00:00 2001
From: Adam Rutkowski <adam.j.rutkowski@intel.com>
Date: Mon, 23 Nov 2020 15:39:00 -0600
Subject: [PATCH 01/13] Remove redundant locks from metadata flush/load all

Locks acquired in ocf_metadata_flush(/load)_all are
acquired only for the duration of queueing asynch
service for flush/load, no actual metadata accesses
are performed there.

Also flush/load all are always performed with metadata
marked as deinitialized (metadata reference counter freezed),
so no I/O is reading nor writing the metadata. The only source
of potential concurrent metadata accesses are other management
operations, which should be synchronized using management lock.

Signed-off-by: Adam Rutkowski <adam.j.rutkowski@intel.com>
---
 src/metadata/metadata.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/metadata/metadata.c b/src/metadata/metadata.c
index 66f7c84..395f8c6 100644
--- a/src/metadata/metadata.c
+++ b/src/metadata/metadata.c
@@ -120,17 +120,13 @@ ocf_cache_line_t ocf_metadata_get_cachelines_count(ocf_cache_t cache)
 void ocf_metadata_flush_all(ocf_cache_t cache,
 		ocf_metadata_end_t cmpl, void *priv)
 {
-	ocf_metadata_start_shared_access(&cache->metadata.lock);
 	cache->metadata.iface.flush_all(cache, cmpl, priv);
-	ocf_metadata_end_shared_access(&cache->metadata.lock);
 }
 
 void ocf_metadata_load_all(ocf_cache_t cache,
 		ocf_metadata_end_t cmpl, void *priv)
 {
-	ocf_metadata_start_exclusive_access(&cache->metadata.lock);
 	cache->metadata.iface.load_all(cache, cmpl, priv);
-	ocf_metadata_end_exclusive_access(&cache->metadata.lock);
 }
 
 void ocf_metadata_load_recovery(ocf_cache_t cache,

From d796e1f400f9510e33aae3f5bba02f2db931ece0 Mon Sep 17 00:00:00 2001
From: Adam Rutkowski <adam.j.rutkowski@intel.com>
Date: Mon, 23 Nov 2020 21:35:38 -0600
Subject: [PATCH 02/13] Remove metadata layout abstraction

Signed-off-by: Adam Rutkowski <adam.j.rutkowski@intel.com>
---
 src/metadata/metadata_collision.h | 16 ++----
 src/metadata/metadata_hash.c      | 91 ++++++++++++++++++++++++++-----
 src/metadata/metadata_structs.h   | 51 +----------------
 3 files changed, 83 insertions(+), 75 deletions(-)

diff --git a/src/metadata/metadata_collision.h b/src/metadata/metadata_collision.h
index 2ed0500..f6be960 100644
--- a/src/metadata/metadata_collision.h
+++ b/src/metadata/metadata_collision.h
@@ -38,19 +38,11 @@ struct ocf_metadata_map {
 		/*!<  Entry status structure e.g. valid, dirty...*/
 } __attribute__((packed));
 
-static inline ocf_cache_line_t ocf_metadata_map_lg2phy(
-		struct ocf_cache *cache, ocf_cache_line_t coll_idx)
-{
-	return cache->metadata.iface.layout_iface->lg2phy(cache,
-		    coll_idx);
-}
+ocf_cache_line_t ocf_metadata_map_lg2phy(
+		struct ocf_cache *cache, ocf_cache_line_t coll_idx);
 
-static inline ocf_cache_line_t ocf_metadata_map_phy2lg(
-		struct ocf_cache *cache, ocf_cache_line_t cache_line)
-{
-	return cache->metadata.iface.layout_iface->phy2lg(cache,
-		    cache_line);
-}
+ocf_cache_line_t ocf_metadata_map_phy2lg(
+		struct ocf_cache *cache, ocf_cache_line_t cache_line);
 
 static inline void ocf_metadata_set_collision_info(
 		struct ocf_cache *cache, ocf_cache_line_t line,
diff --git a/src/metadata/metadata_hash.c b/src/metadata/metadata_hash.c
index 1e72bbf..2f217a5 100644
--- a/src/metadata/metadata_hash.c
+++ b/src/metadata/metadata_hash.c
@@ -2455,6 +2455,34 @@ static ocf_cache_line_t ocf_metadata_hash_map_phy2lg_seq(
 	return cache_line;
 }
 
+/**
+ * This function is mapping collision index to appropriate cache line
+ * (logical cache line to physical one mapping).
+ *
+ * It is necessary because we want to generate sequential workload with
+ * data to cache device.
+ *	Our collision list, for example, looks:
+ *			0 3 6 9
+ *			1 4 7 10
+ *			2 5 8
+ *	All collision index in each column is on the same page
+ *	on cache device. We don't want send request x times to the same
+ *	page. To don't do it we use collision index by row, but in this
+ *	case we can't use collision index directly as cache line,
+ *	because we will generate non sequential workload (we will write
+ *	pages: 0 -> 3 -> 6 ...). To map collision index in correct way
+ *	we use this function.
+ *
+ *	After use this function, collision index in the above array
+ *	corresponds with below cache line:
+ *			0 1 2 3
+ *			4 5 6 7
+ *			8 9 10
+ *
+ * @param cache - cache instance
+ * @param idx - index in collision list
+ * @return mapped cache line
+ */
 static ocf_cache_line_t ocf_metadata_hash_map_lg2phy_striping(
 		struct ocf_cache *cache, ocf_cache_line_t coll_idx)
 {
@@ -2480,6 +2508,14 @@ static ocf_cache_line_t ocf_metadata_hash_map_lg2phy_striping(
 	return cache_line;
 }
 
+/**
+ * @brief Map physical cache line on cache device to logical one
+ * @note This function is the inverse of map_coll_idx_to_cache_line
+ *
+ * @param cache Cache instance
+ * @param phy Physical cache line of cache device
+ * @return Logical cache line
+ */
 static ocf_cache_line_t ocf_metadata_hash_map_phy2lg_striping(
 		struct ocf_cache *cache, ocf_cache_line_t cache_line)
 {
@@ -2514,6 +2550,45 @@ static ocf_cache_line_t ocf_metadata_hash_map_phy2lg_striping(
 	return coll_idx;
 }
 
+ocf_cache_line_t ocf_metadata_map_lg2phy(
+		struct ocf_cache *cache, ocf_cache_line_t coll_idx)
+{
+	struct ocf_metadata_iface *iface = (struct ocf_metadata_iface *)
+			&cache->metadata.iface;
+
+	switch (iface->layout) {
+	case ocf_metadata_layout_striping:
+		return ocf_metadata_hash_map_lg2phy_striping(
+				cache, coll_idx);
+	case ocf_metadata_layout_seq:
+		return ocf_metadata_hash_map_lg2phy_seq(
+				cache, coll_idx);
+	default:
+		ENV_BUG();
+		return 0;
+	}
+}
+
+ocf_cache_line_t ocf_metadata_map_phy2lg(
+		struct ocf_cache *cache, ocf_cache_line_t cache_line)
+{
+	struct ocf_metadata_iface *iface = (struct ocf_metadata_iface *)
+			&cache->metadata.iface;
+
+	switch (iface->layout) {
+	case ocf_metadata_layout_striping:
+		return ocf_metadata_hash_map_phy2lg_striping(
+				cache, cache_line);
+	case ocf_metadata_layout_seq:
+		return ocf_metadata_hash_map_phy2lg_seq(
+				cache, cache_line);
+	default:
+		ENV_BUG();
+		return 0;
+	}
+}
+
+
 static void ocf_metadata_hash_set_collision_info(
 		struct ocf_cache *cache, ocf_cache_line_t line,
 		ocf_cache_line_t next, ocf_cache_line_t prev)
@@ -2720,7 +2795,7 @@ static const struct ocf_metadata_iface metadata_hash_iface = {
 	.init_hash_table = ocf_metadata_hash_init_hash_table,
 	.init_collision = ocf_metadata_hash_init_collision,
 
-	.layout_iface = NULL,
+	.layout = ocf_metadata_layout_default,
 	.pages = ocf_metadata_hash_pages,
 	.cachelines = ocf_metadata_hash_cachelines,
 	.size_of = ocf_metadata_hash_size_of,
@@ -2803,18 +2878,6 @@ static const struct ocf_metadata_iface metadata_hash_iface = {
 
 #include "metadata_bit.h"
 
-static const struct ocf_metadata_layout_iface layout_ifaces[ocf_metadata_layout_max] = {
-	[ocf_metadata_layout_striping] = {
-		.lg2phy = ocf_metadata_hash_map_lg2phy_striping,
-		.phy2lg = ocf_metadata_hash_map_phy2lg_striping
-	},
-	[ocf_metadata_layout_seq] = {
-		.lg2phy = ocf_metadata_hash_map_lg2phy_seq,
-		.phy2lg = ocf_metadata_hash_map_phy2lg_seq
-	}
-};
-
-
 static void ocf_metadata_hash_init_iface(struct ocf_cache *cache,
 		ocf_metadata_layout_t layout)
 {
@@ -2826,7 +2889,7 @@ static void ocf_metadata_hash_init_iface(struct ocf_cache *cache,
 	/* Initialize metadata location interface*/
 	if (cache->device->init_mode == ocf_init_mode_metadata_volatile)
 		layout = ocf_metadata_layout_seq;
-	iface->layout_iface = &layout_ifaces[layout];
+	iface->layout = layout;
 
 	/* Initialize bit status function */
 
diff --git a/src/metadata/metadata_structs.h b/src/metadata/metadata_structs.h
index a592051..bf5c312 100644
--- a/src/metadata/metadata_structs.h
+++ b/src/metadata/metadata_structs.h
@@ -26,53 +26,6 @@ enum ocf_metadata_shutdown_status {
 	ocf_metadata_detached = 2, /*!< Cache device detached */
 };
 
-/*
- * Metadata cache line location on pages interface
- */
-struct ocf_metadata_layout_iface {
-	/**
-	 * This function is mapping collision index to appropriate cache line
-	 * (logical cache line to physical one mapping).
-	 *
-	 * It is necessary because we want to generate sequential workload with
-	 * data to cache device.
-	 *	Our collision list, for example, looks:
-	 *			0 3 6 9
-	 *			1 4 7 10
-	 *			2 5 8
-	 *	All collision index in each column is on the same page
-	 *	on cache device. We don't want send request x times to the same
-	 *	page. To don't do it we use collision index by row, but in this
-	 *	case we can't use collision index directly as cache line,
-	 *	because we will generate non sequential workload (we will write
-	 *	pages: 0 -> 3 -> 6 ...). To map collision index in correct way
-	 *	we use this function.
-	 *
-	 *	After use this function, collision index in the above array
-	 *	corresponds with below cache line:
-	 *			0 1 2 3
-	 *			4 5 6 7
-	 *			8 9 10
-	 *
-	 * @param cache - cache instance
-	 * @param idx - index in collision list
-	 * @return mapped cache line
-	 */
-	ocf_cache_line_t (*lg2phy)(struct ocf_cache *cache,
-			ocf_cache_line_t coll_idx);
-
-	/**
-	 * @brief Map physical cache line on cache device to logical one
-	 * @note This function is the inverse of map_coll_idx_to_cache_line
-	 *
-	 * @param cache Cache instance
-	 * @param phy Physical cache line of cache device
-	 * @return Logical cache line
-	 */
-	ocf_cache_line_t (*phy2lg)(struct ocf_cache *cache,
-			ocf_cache_line_t phy);
-};
-
 /**
  * @brief Query cores completion callback
  *
@@ -126,9 +79,9 @@ struct ocf_metadata_iface {
 
 
 	/**
-	 * @brief Metadata cache line location on pages interface
+	 * @brief Per-cacheline metadata layout
 	 */
-	const struct ocf_metadata_layout_iface *layout_iface;
+	ocf_metadata_layout_t layout;
 
 	/**
 	 * @brief Initialize hash table

From 98cba1603f681f9a168853299314dd454e1bb47d Mon Sep 17 00:00:00 2001
From: Adam Rutkowski <adam.j.rutkowski@intel.com>
Date: Mon, 23 Nov 2020 22:14:22 -0600
Subject: [PATCH 03/13] Replace metadata ifc wrappers with direct calls to hash
 ifc

Metadata wrapper functions (calling iface->func) in header
files are changed to be declarations only. Hash interface
implementation functions in metadata_hash.c are given an
external linkage and are renamed to drop "hash" prefix.

Signed-off-by: Adam Rutkowski <adam.j.rutkowski@intel.com>
---
 src/metadata/metadata.c                 | 104 ++---------
 src/metadata/metadata.h                 |  25 +--
 src/metadata/metadata_cleaning_policy.h |   7 +-
 src/metadata/metadata_collision.h       |  42 ++---
 src/metadata/metadata_core.h            |  46 ++---
 src/metadata/metadata_eviction_policy.h |   7 +-
 src/metadata/metadata_hash.c            | 224 +++++++-----------------
 src/metadata/metadata_partition.h       |  30 +---
 src/metadata/metadata_superblock.h      |  22 +--
 9 files changed, 129 insertions(+), 378 deletions(-)

diff --git a/src/metadata/metadata.c b/src/metadata/metadata.c
index 395f8c6..07795bb 100644
--- a/src/metadata/metadata.c
+++ b/src/metadata/metadata.c
@@ -21,19 +21,23 @@
 #define OCF_DEBUG_TRACE(cache)
 #endif
 
+/* TODO: temporarily still in metadata_hash.c, definition will
+ be moved to this file */
+int ocf_metadata_init_fixed_size(struct ocf_cache *cache,
+		ocf_cache_line_size_t cache_line_size);
+void ocf_metadata_deinit_fixed_size(struct ocf_cache *cache);
+void ocf_metadata_query_cores(ocf_ctx_t owner, ocf_volume_t volume,
+		struct ocf_volume_uuid *uuid, uint32_t count,
+		ocf_metadata_query_cores_end_t cmpl, void *priv);
+
 int ocf_metadata_init(struct ocf_cache *cache,
 		ocf_cache_line_size_t cache_line_size)
 {
-	struct ocf_metadata_iface *iface = (struct ocf_metadata_iface *)
-			&cache->metadata.iface;
 	int ret;
 
 	OCF_DEBUG_TRACE(cache);
 
-	ENV_BUG_ON(cache->metadata.iface_priv);
-
-	*iface = *metadata_hash_get_iface();
-	ret = cache->metadata.iface.init(cache, cache_line_size);
+	ret = ocf_metadata_init_fixed_size(cache, cache_line_size);
 	if (ret) {
 		ocf_metadata_io_deinit(cache);
 		return ret;
@@ -41,8 +45,7 @@ int ocf_metadata_init(struct ocf_cache *cache,
 
 	ret = ocf_metadata_concurrency_init(&cache->metadata.lock);
 	if (ret) {
-		if (cache->metadata.iface.deinit)
-			cache->metadata.iface.deinit(cache);
+		ocf_metadata_deinit_fixed_size(cache);
 
 		ocf_metadata_io_deinit(cache);
 		return ret;
@@ -51,53 +54,15 @@ int ocf_metadata_init(struct ocf_cache *cache,
 	return 0;
 }
 
-int ocf_metadata_init_variable_size(struct ocf_cache *cache, uint64_t device_size,
-		ocf_cache_line_size_t cache_line_size,
-		ocf_metadata_layout_t layout)
-{
-	OCF_DEBUG_TRACE(cache);
-	return cache->metadata.iface.init_variable_size(cache, device_size,
-			cache_line_size, layout);
-}
-
-void ocf_metadata_init_hash_table(struct ocf_cache *cache)
-{
-	OCF_DEBUG_TRACE(cache);
-	cache->metadata.iface.init_hash_table(cache);
-}
-
-void ocf_metadata_init_collision(struct ocf_cache *cache)
-{
-	OCF_DEBUG_TRACE(cache);
-	cache->metadata.iface.init_collision(cache);
-}
-
 void ocf_metadata_deinit(struct ocf_cache *cache)
 {
 	OCF_DEBUG_TRACE(cache);
 
-	if (cache->metadata.iface.deinit) {
-		cache->metadata.iface.deinit(cache);
-	}
-
+	ocf_metadata_deinit_fixed_size(cache);
 	ocf_metadata_concurrency_deinit(&cache->metadata.lock);
-
 	ocf_metadata_io_deinit(cache);
 }
 
-void ocf_metadata_deinit_variable_size(struct ocf_cache *cache)
-{
-	OCF_DEBUG_TRACE(cache);
-
-	if (cache->metadata.iface.deinit_variable_size)
-		cache->metadata.iface.deinit_variable_size(cache);
-}
-
-size_t ocf_metadata_size_of(struct ocf_cache *cache)
-{
-	return cache->metadata.iface.size_of(cache);
-}
-
 void ocf_metadata_error(struct ocf_cache *cache)
 {
 	if (cache->device->metadata_error == 0)
@@ -107,47 +72,6 @@ void ocf_metadata_error(struct ocf_cache *cache)
 	cache->device->metadata_error = -1;
 }
 
-ocf_cache_line_t ocf_metadata_get_pages_count(struct ocf_cache *cache)
-{
-	return cache->metadata.iface.pages(cache);
-}
-
-ocf_cache_line_t ocf_metadata_get_cachelines_count(ocf_cache_t cache)
-{
-	return cache->metadata.iface.cachelines(cache);
-}
-
-void ocf_metadata_flush_all(ocf_cache_t cache,
-		ocf_metadata_end_t cmpl, void *priv)
-{
-	cache->metadata.iface.flush_all(cache, cmpl, priv);
-}
-
-void ocf_metadata_load_all(ocf_cache_t cache,
-		ocf_metadata_end_t cmpl, void *priv)
-{
-	cache->metadata.iface.load_all(cache, cmpl, priv);
-}
-
-void ocf_metadata_load_recovery(ocf_cache_t cache,
-		ocf_metadata_end_t cmpl, void *priv)
-{
-	cache->metadata.iface.load_recovery(cache, cmpl, priv);
-}
-
-void ocf_metadata_flush_mark(struct ocf_cache *cache, struct ocf_request *req,
-		uint32_t map_idx, int to_state, uint8_t start, uint8_t stop)
-{
-	cache->metadata.iface.flush_mark(cache, req, map_idx, to_state,
-			start, stop);
-}
-
-void ocf_metadata_flush_do_asynch(struct ocf_cache *cache,
-		struct ocf_request *req, ocf_req_end_t complete)
-{
-	cache->metadata.iface.flush_do_asynch(cache, req, complete);
-}
-
 struct ocf_metadata_read_sb_ctx;
 
 typedef void (*ocf_metadata_read_sb_end_t)(
@@ -374,7 +298,6 @@ void ocf_metadata_probe_cores(ocf_ctx_t ctx, ocf_volume_t volume,
 		ocf_metadata_probe_cores_end_t cmpl, void *priv)
 {
 	struct ocf_metadata_query_cores_context *context;
-	const struct ocf_metadata_iface *iface;
 
 	context = env_vzalloc(sizeof(*context));
 	if (!context)
@@ -383,8 +306,7 @@ void ocf_metadata_probe_cores(ocf_ctx_t ctx, ocf_volume_t volume,
 	context->cmpl = cmpl;
 	context->priv = priv;
 
-	iface = metadata_hash_get_iface();
-	iface->query_cores(ctx, volume, uuids, uuids_count,
+	ocf_metadata_query_cores(ctx, volume, uuids, uuids_count,
 			ocf_metadata_query_cores_end, context);
 }
 
diff --git a/src/metadata/metadata.h b/src/metadata/metadata.h
index 08f49af..595efed 100644
--- a/src/metadata/metadata.h
+++ b/src/metadata/metadata.h
@@ -170,10 +170,7 @@ void ocf_metadata_load_recovery(ocf_cache_t cache,
  *
  * @param cache Cache instance
  */
-static inline uint64_t ocf_metadata_get_reserved_lba(ocf_cache_t cache)
-{
-	return cache->metadata.iface.get_reserved_lba(cache);
-}
+uint64_t ocf_metadata_get_reserved_lba(ocf_cache_t cache);
 
 /*
  * NOTE Hash table is specific for hash table metadata service implementation
@@ -182,23 +179,11 @@ static inline uint64_t ocf_metadata_get_reserved_lba(ocf_cache_t cache)
  * temporary defined in this file.
  */
 
-static inline ocf_cache_line_t
-ocf_metadata_get_hash(struct ocf_cache *cache, ocf_cache_line_t index)
-{
-	return cache->metadata.iface.get_hash(cache, index);
-}
+ocf_cache_line_t
+ocf_metadata_get_hash(struct ocf_cache *cache, ocf_cache_line_t index);
 
-static inline void ocf_metadata_set_hash(struct ocf_cache *cache,
-		ocf_cache_line_t index, ocf_cache_line_t line)
-{
-	cache->metadata.iface.set_hash(cache, index, line);
-}
-
-static inline ocf_cache_line_t ocf_metadata_entries_hash(
-		struct ocf_cache *cache)
-{
-	return cache->metadata.iface.entries_hash(cache);
-}
+void ocf_metadata_set_hash(struct ocf_cache *cache,
+		ocf_cache_line_t index, ocf_cache_line_t line);
 
 struct ocf_metadata_load_properties {
 	enum ocf_metadata_shutdown_status shutdown_status;
diff --git a/src/metadata/metadata_cleaning_policy.h b/src/metadata/metadata_cleaning_policy.h
index 8b0e442..4ba9799 100644
--- a/src/metadata/metadata_cleaning_policy.h
+++ b/src/metadata/metadata_cleaning_policy.h
@@ -6,12 +6,9 @@
 #ifndef __METADATA_CLEANING_POLICY_H__
 #define __METADATA_CLEANING_POLICY_H__
 
-static inline struct cleaning_policy_meta *
+struct cleaning_policy_meta *
 ocf_metadata_get_cleaning_policy(struct ocf_cache *cache,
-		ocf_cache_line_t line)
-{
-	return cache->metadata.iface.get_cleaning_policy(cache, line);
-}
+		ocf_cache_line_t line);
 
 
 #endif /* METADATA_CLEANING_POLICY_H_ */
diff --git a/src/metadata/metadata_collision.h b/src/metadata/metadata_collision.h
index f6be960..e7f4ccc 100644
--- a/src/metadata/metadata_collision.h
+++ b/src/metadata/metadata_collision.h
@@ -44,33 +44,21 @@ ocf_cache_line_t ocf_metadata_map_lg2phy(
 ocf_cache_line_t ocf_metadata_map_phy2lg(
 		struct ocf_cache *cache, ocf_cache_line_t cache_line);
 
-static inline void ocf_metadata_set_collision_info(
+void ocf_metadata_set_collision_info(
 		struct ocf_cache *cache, ocf_cache_line_t line,
-		ocf_cache_line_t next, ocf_cache_line_t prev)
-{
-	cache->metadata.iface.set_collision_info(cache, line, next, prev);
-}
+		ocf_cache_line_t next, ocf_cache_line_t prev);
 
-static inline void ocf_metadata_set_collision_next(
+void ocf_metadata_set_collision_next(
 		struct ocf_cache *cache, ocf_cache_line_t line,
-		ocf_cache_line_t next)
-{
-	cache->metadata.iface.set_collision_next(cache, line, next);
-}
+		ocf_cache_line_t next);
 
-static inline void ocf_metadata_set_collision_prev(
+void ocf_metadata_set_collision_prev(
 		struct ocf_cache *cache, ocf_cache_line_t line,
-		ocf_cache_line_t prev)
-{
-	cache->metadata.iface.set_collision_prev(cache, line, prev);
-}
+		ocf_cache_line_t prev);
 
-static inline void ocf_metadata_get_collision_info(
+void ocf_metadata_get_collision_info(
 		struct ocf_cache *cache, ocf_cache_line_t line,
-		ocf_cache_line_t *next, ocf_cache_line_t *prev)
-{
-	cache->metadata.iface.get_collision_info(cache, line, next, prev);
-}
+		ocf_cache_line_t *next, ocf_cache_line_t *prev);
 
 static inline ocf_cache_line_t ocf_metadata_get_collision_next(
 		struct ocf_cache *cache, ocf_cache_line_t line)
@@ -97,16 +85,10 @@ void ocf_metadata_add_to_collision(struct ocf_cache *cache,
 void ocf_metadata_remove_from_collision(struct ocf_cache *cache,
 		ocf_cache_line_t line, ocf_part_id_t part_id);
 
-static inline void ocf_metadata_start_collision_shared_access(
-		struct ocf_cache *cache, ocf_cache_line_t line)
-{
-	cache->metadata.iface.start_collision_shared_access(cache, line);
-}
+ void ocf_metadata_start_collision_shared_access(
+		struct ocf_cache *cache, ocf_cache_line_t line);
 
-static inline void ocf_metadata_end_collision_shared_access(
-		struct ocf_cache *cache, ocf_cache_line_t line)
-{
-	cache->metadata.iface.end_collision_shared_access(cache, line);
-}
+ void ocf_metadata_end_collision_shared_access(
+		struct ocf_cache *cache, ocf_cache_line_t line);
 
 #endif /* METADATA_COLLISION_H_ */
diff --git a/src/metadata/metadata_core.h b/src/metadata/metadata_core.h
index 3214acf..2e8ba73 100644
--- a/src/metadata/metadata_core.h
+++ b/src/metadata/metadata_core.h
@@ -6,40 +6,22 @@
 #ifndef __METADATA_CORE_H__
 #define __METADATA_CORE_H__
 
-static inline void ocf_metadata_set_core_info(struct ocf_cache *cache,
-		ocf_cache_line_t line, ocf_core_id_t core_id,
-		uint64_t core_sector)
-{
-	cache->metadata.iface.set_core_info(cache, line, core_id,
-			core_sector);
-}
-
-static inline void ocf_metadata_get_core_info(struct ocf_cache *cache,
+void ocf_metadata_get_core_info(struct ocf_cache *cache,
 		ocf_cache_line_t line, ocf_core_id_t *core_id,
-		uint64_t *core_sector)
-{
-	cache->metadata.iface.get_core_info(cache, line, core_id,
-			core_sector);
-}
+		uint64_t *core_sector);
 
-static inline void ocf_metadata_get_core_and_part_id(
+void ocf_metadata_set_core_info(struct ocf_cache *cache,
+		ocf_cache_line_t line, ocf_core_id_t core_id,
+		uint64_t core_sector);
+
+ocf_core_id_t ocf_metadata_get_core_id(
+		struct ocf_cache *cache, ocf_cache_line_t line);
+
+struct ocf_metadata_uuid *ocf_metadata_get_core_uuid(
+		struct ocf_cache *cache, ocf_core_id_t core_id);
+
+void ocf_metadata_get_core_and_part_id(
 		struct ocf_cache *cache, ocf_cache_line_t line,
-		ocf_core_id_t *core_id, ocf_part_id_t *part_id)
-{
-	cache->metadata.iface.get_core_and_part_id(cache, line, core_id,
-			part_id);
-}
-
-static inline ocf_core_id_t ocf_metadata_get_core_id(
-		struct ocf_cache *cache, ocf_cache_line_t line)
-{
-	return cache->metadata.iface.get_core_id(cache, line);
-}
-
-static inline struct ocf_metadata_uuid *ocf_metadata_get_core_uuid(
-		struct ocf_cache *cache, ocf_core_id_t core_id)
-{
-	return cache->metadata.iface.get_core_uuid(cache, core_id);
-}
+		ocf_core_id_t *core_id, ocf_part_id_t *part_id);
 
 #endif /* METADATA_CORE_H_ */
diff --git a/src/metadata/metadata_eviction_policy.h b/src/metadata/metadata_eviction_policy.h
index 0e34d5c..bfbfc61 100644
--- a/src/metadata/metadata_eviction_policy.h
+++ b/src/metadata/metadata_eviction_policy.h
@@ -6,11 +6,8 @@
 #ifndef __METADATA_EVICTION_H__
 #define __METADATA_EVICTION_H__
 
-static inline union eviction_policy_meta *
+union eviction_policy_meta *
 ocf_metadata_get_eviction_policy(
-		struct ocf_cache *cache, ocf_cache_line_t line)
-{
-	return cache->metadata.iface.get_eviction_policy(cache, line);
-}
+		struct ocf_cache *cache, ocf_cache_line_t line);
 
 #endif /* METADATA_EVICTION_H_ */
diff --git a/src/metadata/metadata_hash.c b/src/metadata/metadata_hash.c
index 2f217a5..153bdac 100644
--- a/src/metadata/metadata_hash.c
+++ b/src/metadata/metadata_hash.c
@@ -404,7 +404,7 @@ static void ocf_metadata_hash_raw_info(struct ocf_cache *cache,
 /*
  * Deinitialize hash metadata interface
  */
-static void ocf_metadata_hash_deinit_variable_size(struct ocf_cache *cache)
+void ocf_metadata_deinit_variable_size(struct ocf_cache *cache)
 {
 
 	int result = 0;
@@ -445,7 +445,7 @@ static inline void ocf_metadata_config_init(struct ocf_cache *cache,
 			ocf_metadata_status_sizeof(settings));
 }
 
-static void ocf_metadata_hash_deinit(struct ocf_cache *cache)
+void ocf_metadata_deinit_fixed_size(struct ocf_cache *cache)
 {
 	int result = 0;
 	uint32_t i;
@@ -515,7 +515,7 @@ static struct ocf_metadata_hash_ctrl *ocf_metadata_hash_ctrl_init(
 	return ctrl;
 }
 
-int ocf_metadata_hash_init(struct ocf_cache *cache,
+int ocf_metadata_init_fixed_size(struct ocf_cache *cache,
 		ocf_cache_line_size_t cache_line_size)
 {
 	struct ocf_metadata_hash_ctrl *ctrl = NULL;
@@ -550,7 +550,7 @@ int ocf_metadata_hash_init(struct ocf_cache *cache,
 	}
 
 	if (result) {
-		ocf_metadata_hash_deinit(cache);
+		ocf_metadata_deinit_fixed_size(cache);
 		return result;
 	}
 
@@ -828,7 +828,7 @@ exit:
 	return err;
 }
 
-void ocf_metadata_hash_query_cores(ocf_ctx_t owner, ocf_volume_t volume,
+void ocf_metadata_query_cores(ocf_ctx_t owner, ocf_volume_t volume,
 		struct ocf_volume_uuid *uuid, uint32_t count,
 		ocf_metadata_query_cores_end_t cmpl, void *priv)
 {
@@ -903,7 +903,7 @@ static void ocf_metadata_hash_flush_unlock_collision_page(
 /*
  * Initialize hash metadata interface
  */
-static int ocf_metadata_hash_init_variable_size(struct ocf_cache *cache,
+int ocf_metadata_init_variable_size(struct ocf_cache *cache,
 		uint64_t device_size, ocf_cache_line_size_t cache_line_size,
 		ocf_metadata_layout_t layout)
 {
@@ -1024,7 +1024,7 @@ finalize:
 		/*
 		 * Hash De-Init also contains RAW deinitialization
 		 */
-		ocf_metadata_hash_deinit_variable_size(cache);
+		ocf_metadata_deinit_variable_size(cache);
 		return result;
 	}
 
@@ -1080,7 +1080,7 @@ finalize:
 	if (result) {
 		ocf_cache_log(cache, log_err, "Failed to initialize attached "
 				"metadata concurrency\n");
-		ocf_metadata_hash_deinit_variable_size(cache);
+		ocf_metadata_deinit_variable_size(cache);
 		return  result;
 	}
 
@@ -1101,7 +1101,7 @@ static inline void _ocf_init_collision_entry(struct ocf_cache *cache,
 /*
  * Initialize collision table
  */
-static void ocf_metadata_hash_init_collision(struct ocf_cache *cache)
+void ocf_metadata_init_collision(struct ocf_cache *cache)
 {
 	unsigned int i;
 	unsigned int step = 0;
@@ -1115,7 +1115,7 @@ static void ocf_metadata_hash_init_collision(struct ocf_cache *cache)
 /*
  * Initialize hash table
  */
-static void ocf_metadata_hash_init_hash_table(struct ocf_cache *cache)
+void ocf_metadata_init_hash_table(struct ocf_cache *cache)
 {
 	unsigned int i;
 	unsigned int hash_table_entries = cache->device->hash_table_entries;
@@ -1135,7 +1135,7 @@ static void ocf_metadata_hash_init_hash_table(struct ocf_cache *cache)
 /*
  * Get count of pages that is dedicated for metadata
  */
-static ocf_cache_line_t ocf_metadata_hash_pages(struct ocf_cache *cache)
+ocf_cache_line_t ocf_metadata_get_pages_count(struct ocf_cache *cache)
 {
 	struct ocf_metadata_hash_ctrl *ctrl = NULL;
 
@@ -1149,7 +1149,7 @@ static ocf_cache_line_t ocf_metadata_hash_pages(struct ocf_cache *cache)
 /*
  * Get amount of cache lines
  */
-static ocf_cache_line_t ocf_metadata_hash_cachelines(
+ocf_cache_line_t ocf_metadata_get_cachelines_count(
 		struct ocf_cache *cache)
 {
 	struct ocf_metadata_hash_ctrl *ctrl = NULL;
@@ -1161,7 +1161,7 @@ static ocf_cache_line_t ocf_metadata_hash_cachelines(
 	return ctrl->cachelines;
 }
 
-static size_t ocf_metadata_hash_size_of(struct ocf_cache *cache)
+size_t ocf_metadata_size_of(struct ocf_cache *cache)
 {
 	uint32_t i = 0;
 	size_t size = 0;
@@ -1390,7 +1390,7 @@ static void ocf_metadata_hash_load_sb_restore(
 	}
 }
 
-static void ocf_metadata_hash_load_superblock_finish(ocf_pipeline_t pipeline,
+static void ocf_metadata_load_superblock_finish(ocf_pipeline_t pipeline,
 		void *priv, int error)
 {
 	struct ocf_metadata_hash_context *context = priv;
@@ -1447,7 +1447,7 @@ struct ocf_pipeline_arg ocf_metadata_hash_load_sb_check_crc_args_clean[] = {
 
 struct ocf_pipeline_properties ocf_metadata_hash_load_sb_pipeline_props = {
 	.priv_size = sizeof(struct ocf_metadata_hash_context),
-	.finish = ocf_metadata_hash_load_superblock_finish,
+	.finish = ocf_metadata_load_superblock_finish,
 	.steps = {
 		OCF_PL_STEP_FOREACH(ocf_medatata_hash_store_segment,
 				ocf_metadata_hash_load_sb_store_segment_args),
@@ -1466,8 +1466,8 @@ struct ocf_pipeline_properties ocf_metadata_hash_load_sb_pipeline_props = {
 /*
  * Super Block - Load, This function has to prevent to pointers overwrite
  */
-static void ocf_metadata_hash_load_superblock(ocf_cache_t cache,
-		ocf_metadata_end_t cmpl, void *priv)
+void ocf_metadata_load_superblock(ocf_cache_t cache, ocf_metadata_end_t cmpl,
+		void *priv)
 {
 	struct ocf_metadata_hash_context *context;
 	ocf_pipeline_t pipeline;
@@ -1569,7 +1569,7 @@ static void ocf_medatata_hash_flush_segment(ocf_pipeline_t pipeline,
 			ocf_metadata_hash_generic_complete, context);
 }
 
-static void ocf_metadata_hash_flush_superblock_finish(ocf_pipeline_t pipeline,
+static void ocf_metadata_flush_superblock_finish(ocf_pipeline_t pipeline,
 		void *priv, int error)
 {
 	struct ocf_metadata_hash_context *context = priv;
@@ -1622,7 +1622,7 @@ struct ocf_pipeline_arg ocf_metadata_hash_flush_sb_flush_segment_args[] = {
 
 struct ocf_pipeline_properties ocf_metadata_hash_flush_sb_pipeline_props = {
 	.priv_size = sizeof(struct ocf_metadata_hash_context),
-	.finish = ocf_metadata_hash_flush_superblock_finish,
+	.finish = ocf_metadata_flush_superblock_finish,
 	.steps = {
 		OCF_PL_STEP(ocf_medatata_hash_flush_superblock_prepare),
 		OCF_PL_STEP(ocf_medatata_hash_calculate_crc_sb_config),
@@ -1638,7 +1638,7 @@ struct ocf_pipeline_properties ocf_metadata_hash_flush_sb_pipeline_props = {
 /*
  * Super Block - FLUSH
  */
-static void ocf_metadata_hash_flush_superblock(ocf_cache_t cache,
+void ocf_metadata_flush_superblock(ocf_cache_t cache,
 		ocf_metadata_end_t cmpl, void *priv)
 {
 	struct ocf_metadata_hash_context *context;
@@ -1670,7 +1670,7 @@ static void ocf_metadata_hash_flush_superblock(ocf_cache_t cache,
  *
  * @return Operation status (0 success, otherwise error)
  */
-static void ocf_metadata_hash_set_shutdown_status(ocf_cache_t cache,
+void ocf_metadata_set_shutdown_status(ocf_cache_t cache,
 		enum ocf_metadata_shutdown_status shutdown_status,
 		ocf_metadata_end_t cmpl, void *priv)
 {
@@ -1694,14 +1694,14 @@ static void ocf_metadata_hash_set_shutdown_status(ocf_cache_t cache,
 	superblock->magic_number = CACHE_MAGIC_NUMBER;
 
 	/* Flush superblock */
-	ocf_metadata_hash_flush_superblock(cache, cmpl, priv);
+	ocf_metadata_flush_superblock(cache, cmpl, priv);
 }
 
 /*******************************************************************************
  * RESERVED AREA
  ******************************************************************************/
 
-static uint64_t ocf_metadata_hash_get_reserved_lba(
+uint64_t ocf_metadata_get_reserved_lba(
 		struct ocf_cache *cache)
 {
 	struct ocf_metadata_hash_ctrl *ctrl;
@@ -1733,7 +1733,7 @@ static void ocf_medatata_hash_flush_all_set_status(ocf_pipeline_t pipeline,
 	enum ocf_metadata_shutdown_status shutdown_status =
 			ocf_pipeline_arg_get_int(arg);
 
-	ocf_metadata_hash_set_shutdown_status(cache, shutdown_status,
+	ocf_metadata_set_shutdown_status(cache, shutdown_status,
 			ocf_medatata_hash_flush_all_set_status_complete,
 			context);
 }
@@ -1788,7 +1788,7 @@ struct ocf_pipeline_properties ocf_metadata_hash_flush_all_pipeline_props = {
 /*
  * Flush all metadata
  */
-static void ocf_metadata_hash_flush_all(ocf_cache_t cache,
+void ocf_metadata_flush_all(ocf_cache_t cache,
 		ocf_metadata_end_t cmpl, void *priv)
 {
 	struct ocf_metadata_hash_context *context;
@@ -1815,7 +1815,7 @@ static void ocf_metadata_hash_flush_all(ocf_cache_t cache,
 /*
  * Flush specified cache line
  */
-static void ocf_metadata_hash_flush_mark(struct ocf_cache *cache,
+void ocf_metadata_flush_mark(struct ocf_cache *cache,
 		struct ocf_request *req, uint32_t map_idx, int to_state,
 		uint8_t start, uint8_t stop)
 {
@@ -1839,7 +1839,7 @@ static void ocf_metadata_hash_flush_mark(struct ocf_cache *cache,
 /*
  * Flush specified cache lines asynchronously
  */
-static void ocf_metadata_hash_flush_do_asynch(struct ocf_cache *cache,
+void ocf_metadata_flush_do_asynch(struct ocf_cache *cache,
 		struct ocf_request *req, ocf_req_end_t complete)
 {
 	int result = 0;
@@ -1910,7 +1910,7 @@ struct ocf_pipeline_properties ocf_metadata_hash_load_all_pipeline_props = {
 /*
  * Load all metadata
  */
-static void ocf_metadata_hash_load_all(ocf_cache_t cache,
+void ocf_metadata_load_all(ocf_cache_t cache,
 		ocf_metadata_end_t cmpl, void *priv)
 {
 	struct ocf_metadata_hash_context *context;
@@ -2240,7 +2240,7 @@ static void _ocf_metadata_hash_load_recovery_atomic(ocf_cache_t cache,
 /*
  * Load for recovery - Load only data that is required for recovery procedure
  */
-static void ocf_metadata_hash_load_recovery(ocf_cache_t cache,
+void ocf_metadata_load_recovery(ocf_cache_t cache,
 		ocf_metadata_end_t cmpl, void *priv)
 {
 	OCF_DEBUG_TRACE(cache);
@@ -2254,7 +2254,7 @@ static void ocf_metadata_hash_load_recovery(ocf_cache_t cache,
 /*******************************************************************************
  * Core Info
  ******************************************************************************/
-static void ocf_metadata_hash_get_core_info(struct ocf_cache *cache,
+void ocf_metadata_get_core_info(struct ocf_cache *cache,
 		ocf_cache_line_t line, ocf_core_id_t *core_id,
 		uint64_t *core_sector)
 {
@@ -2279,7 +2279,7 @@ static void ocf_metadata_hash_get_core_info(struct ocf_cache *cache,
 	}
 }
 
-static void ocf_metadata_hash_set_core_info(struct ocf_cache *cache,
+void ocf_metadata_set_core_info(struct ocf_cache *cache,
 		ocf_cache_line_t line, ocf_core_id_t core_id,
 		uint64_t core_sector)
 {
@@ -2298,8 +2298,8 @@ static void ocf_metadata_hash_set_core_info(struct ocf_cache *cache,
 	}
 }
 
-static ocf_core_id_t ocf_metadata_hash_get_core_id(
-		struct ocf_cache *cache, ocf_cache_line_t line)
+ocf_core_id_t ocf_metadata_get_core_id(struct ocf_cache *cache,
+		ocf_cache_line_t line)
 {
 	const struct ocf_metadata_map *collision;
 	struct ocf_metadata_hash_ctrl *ctrl =
@@ -2315,7 +2315,7 @@ static ocf_core_id_t ocf_metadata_hash_get_core_id(
 	return OCF_CORE_MAX;
 }
 
-static struct ocf_metadata_uuid *ocf_metadata_hash_get_core_uuid(
+struct ocf_metadata_uuid *ocf_metadata_get_core_uuid(
 		struct ocf_cache *cache, ocf_core_id_t core_id)
 {
 	struct ocf_metadata_uuid *muuid;
@@ -2335,9 +2335,9 @@ static struct ocf_metadata_uuid *ocf_metadata_hash_get_core_uuid(
  * Core and part id
  ******************************************************************************/
 
-static void ocf_metadata_hash_get_core_and_part_id(
-		struct ocf_cache *cache, ocf_cache_line_t line,
-		ocf_core_id_t *core_id, ocf_part_id_t *part_id)
+void ocf_metadata_get_core_and_part_id(struct ocf_cache *cache,
+		ocf_cache_line_t line, ocf_core_id_t *core_id,
+		ocf_part_id_t *part_id)
 {
 	const struct ocf_metadata_map *collision;
 	const struct ocf_metadata_list_info *info;
@@ -2370,8 +2370,8 @@ static void ocf_metadata_hash_get_core_and_part_id(
 /*
  * Hash Table - Get
  */
-static ocf_cache_line_t ocf_metadata_hash_get_hash(
-		struct ocf_cache *cache, ocf_cache_line_t index)
+ocf_cache_line_t ocf_metadata_get_hash(struct ocf_cache *cache,
+		ocf_cache_line_t index)
 {
 	ocf_cache_line_t line = cache->device->collision_table_entries;
 	int result = 0;
@@ -2390,8 +2390,8 @@ static ocf_cache_line_t ocf_metadata_hash_get_hash(
 /*
  * Hash Table - Set
  */
-static void ocf_metadata_hash_set_hash(struct ocf_cache *cache,
-		ocf_cache_line_t index, ocf_cache_line_t line)
+void ocf_metadata_set_hash(struct ocf_cache *cache, ocf_cache_line_t index,
+		ocf_cache_line_t line)
 {
 	int result = 0;
 	struct ocf_metadata_hash_ctrl *ctrl
@@ -2411,8 +2411,8 @@ static void ocf_metadata_hash_set_hash(struct ocf_cache *cache,
 /*
  * Cleaning policy - Get
  */
-static struct cleaning_policy_meta *
-ocf_metadata_hash_get_cleaning_policy(struct ocf_cache *cache,
+struct cleaning_policy_meta *
+ocf_metadata_get_cleaning_policy(struct ocf_cache *cache,
 		ocf_cache_line_t line)
 {
 	struct ocf_metadata_hash_ctrl *ctrl
@@ -2429,8 +2429,8 @@ ocf_metadata_hash_get_cleaning_policy(struct ocf_cache *cache,
 /*
  * Eviction policy - Get
  */
-static union eviction_policy_meta *
-ocf_metadata_hash_get_eviction_policy(struct ocf_cache *cache,
+union eviction_policy_meta *
+ocf_metadata_get_eviction_policy(struct ocf_cache *cache,
 		ocf_cache_line_t line)
 {
 	struct ocf_metadata_hash_ctrl *ctrl
@@ -2588,10 +2588,9 @@ ocf_cache_line_t ocf_metadata_map_phy2lg(
 	}
 }
 
-
-static void ocf_metadata_hash_set_collision_info(
-		struct ocf_cache *cache, ocf_cache_line_t line,
-		ocf_cache_line_t next, ocf_cache_line_t prev)
+void ocf_metadata_set_collision_info(struct ocf_cache *cache,
+		ocf_cache_line_t line, ocf_cache_line_t next,
+		ocf_cache_line_t prev)
 {
 	struct ocf_metadata_list_info *info;
 	struct ocf_metadata_hash_ctrl *ctrl =
@@ -2608,9 +2607,8 @@ static void ocf_metadata_hash_set_collision_info(
 	}
 }
 
-static void ocf_metadata_hash_set_collision_next(
-		struct ocf_cache *cache, ocf_cache_line_t line,
-		ocf_cache_line_t next)
+void ocf_metadata_set_collision_next(struct ocf_cache *cache,
+		ocf_cache_line_t line, ocf_cache_line_t next)
 {
 	struct ocf_metadata_list_info *info;
 	struct ocf_metadata_hash_ctrl *ctrl =
@@ -2625,9 +2623,8 @@ static void ocf_metadata_hash_set_collision_next(
 		ocf_metadata_error(cache);
 }
 
-static void ocf_metadata_hash_set_collision_prev(
-		struct ocf_cache *cache, ocf_cache_line_t line,
-		ocf_cache_line_t prev)
+void ocf_metadata_set_collision_prev(struct ocf_cache *cache,
+		ocf_cache_line_t line, ocf_cache_line_t prev)
 {
 	struct ocf_metadata_list_info *info;
 	struct ocf_metadata_hash_ctrl *ctrl =
@@ -2642,9 +2639,9 @@ static void ocf_metadata_hash_set_collision_prev(
 		ocf_metadata_error(cache);
 }
 
-static void ocf_metadata_hash_get_collision_info(
-		struct ocf_cache *cache, ocf_cache_line_t line,
-		ocf_cache_line_t *next, ocf_cache_line_t *prev)
+void ocf_metadata_get_collision_info(struct ocf_cache *cache,
+		ocf_cache_line_t line, ocf_cache_line_t *next,
+		ocf_cache_line_t *prev)
 {
 	const struct ocf_metadata_list_info *info;
 	struct ocf_metadata_hash_ctrl *ctrl =
@@ -2669,7 +2666,7 @@ static void ocf_metadata_hash_get_collision_info(
 	}
 }
 
-void ocf_metadata_hash_start_collision_shared_access(struct ocf_cache *cache,
+void ocf_metadata_start_collision_shared_access(struct ocf_cache *cache,
 		ocf_cache_line_t line)
 {
 	struct ocf_metadata_hash_ctrl *ctrl =
@@ -2681,7 +2678,7 @@ void ocf_metadata_hash_start_collision_shared_access(struct ocf_cache *cache,
 	ocf_collision_start_shared_access(&cache->metadata.lock, page);
 }
 
-void ocf_metadata_hash_end_collision_shared_access(struct ocf_cache *cache,
+void ocf_metadata_end_collision_shared_access(struct ocf_cache *cache,
 		ocf_cache_line_t line)
 {
 	struct ocf_metadata_hash_ctrl *ctrl =
@@ -2697,10 +2694,9 @@ void ocf_metadata_hash_end_collision_shared_access(struct ocf_cache *cache,
  *  Partition
  ******************************************************************************/
 
-static void ocf_metadata_hash_get_partition_info(
-		struct ocf_cache *cache, ocf_cache_line_t line,
-		ocf_part_id_t *part_id, ocf_cache_line_t *next_line,
-		ocf_cache_line_t *prev_line)
+void ocf_metadata_get_partition_info(struct ocf_cache *cache,
+		ocf_cache_line_t line, ocf_part_id_t *part_id,
+		ocf_cache_line_t *next_line, ocf_cache_line_t *prev_line)
 {
 	const struct ocf_metadata_list_info *info;
 	struct ocf_metadata_hash_ctrl *ctrl =
@@ -2727,9 +2723,8 @@ static void ocf_metadata_hash_get_partition_info(
 	}
 }
 
-static void ocf_metadata_hash_set_partition_next(
-		struct ocf_cache *cache, ocf_cache_line_t line,
-		ocf_cache_line_t next_line)
+void ocf_metadata_set_partition_next(struct ocf_cache *cache,
+		ocf_cache_line_t line, ocf_cache_line_t next_line)
 {
 	struct ocf_metadata_list_info *info;
 	struct ocf_metadata_hash_ctrl *ctrl =
@@ -2744,9 +2739,8 @@ static void ocf_metadata_hash_set_partition_next(
 		ocf_metadata_error(cache);
 }
 
-static void ocf_metadata_hash_set_partition_prev(
-		struct ocf_cache *cache, ocf_cache_line_t line,
-		ocf_cache_line_t prev_line)
+void ocf_metadata_set_partition_prev(struct ocf_cache *cache,
+		ocf_cache_line_t line, ocf_cache_line_t prev_line)
 {
 	struct ocf_metadata_list_info *info;
 	struct ocf_metadata_hash_ctrl *ctrl =
@@ -2761,10 +2755,9 @@ static void ocf_metadata_hash_set_partition_prev(
 		ocf_metadata_error(cache);
 }
 
-static void ocf_metadata_hash_set_partition_info(
-		struct ocf_cache *cache, ocf_cache_line_t line,
-		ocf_part_id_t part_id, ocf_cache_line_t next_line,
-		ocf_cache_line_t prev_line)
+void ocf_metadata_set_partition_info(struct ocf_cache *cache,
+		ocf_cache_line_t line, ocf_part_id_t part_id,
+		ocf_cache_line_t next_line, ocf_cache_line_t prev_line)
 {
 	struct ocf_metadata_list_info *info;
 	struct ocf_metadata_hash_ctrl *ctrl =
@@ -2787,89 +2780,6 @@ static void ocf_metadata_hash_set_partition_info(
  ******************************************************************************/
 
 static const struct ocf_metadata_iface metadata_hash_iface = {
-	.init = ocf_metadata_hash_init,
-	.deinit = ocf_metadata_hash_deinit,
-	.query_cores = ocf_metadata_hash_query_cores,
-	.init_variable_size = ocf_metadata_hash_init_variable_size,
-	.deinit_variable_size = ocf_metadata_hash_deinit_variable_size,
-	.init_hash_table = ocf_metadata_hash_init_hash_table,
-	.init_collision = ocf_metadata_hash_init_collision,
-
-	.layout = ocf_metadata_layout_default,
-	.pages = ocf_metadata_hash_pages,
-	.cachelines = ocf_metadata_hash_cachelines,
-	.size_of = ocf_metadata_hash_size_of,
-
-	/*
-	 * Load all, flushing all, etc...
-	 */
-	.flush_all = ocf_metadata_hash_flush_all,
-	.flush_mark = ocf_metadata_hash_flush_mark,
-	.flush_do_asynch = ocf_metadata_hash_flush_do_asynch,
-	.load_all = ocf_metadata_hash_load_all,
-	.load_recovery = ocf_metadata_hash_load_recovery,
-
-	/*
-	 * Super Block
-	 */
-	.set_shutdown_status = ocf_metadata_hash_set_shutdown_status,
-	.flush_superblock = ocf_metadata_hash_flush_superblock,
-	.load_superblock = ocf_metadata_hash_load_superblock,
-
-	/*
-	 * Reserved area
-	 */
-	.get_reserved_lba = ocf_metadata_hash_get_reserved_lba,
-
-	/*
-	 * Core Info
-	 */
-	.set_core_info = ocf_metadata_hash_set_core_info,
-	.get_core_info = ocf_metadata_hash_get_core_info,
-	.get_core_id = ocf_metadata_hash_get_core_id,
-	.get_core_uuid  = ocf_metadata_hash_get_core_uuid,
-
-	/*
-	 * Core and part id
-	 */
-
-	.get_core_and_part_id = ocf_metadata_hash_get_core_and_part_id,
-
-	/*
-	 * Collision Info
-	 */
-	.get_collision_info = ocf_metadata_hash_get_collision_info,
-	.set_collision_info = ocf_metadata_hash_set_collision_info,
-	.set_collision_next = ocf_metadata_hash_set_collision_next,
-	.set_collision_prev = ocf_metadata_hash_set_collision_prev,
-	.start_collision_shared_access =
-			ocf_metadata_hash_start_collision_shared_access,
-	.end_collision_shared_access =
-			ocf_metadata_hash_end_collision_shared_access,
-
-	/*
-	 * Partition Info
-	 */
-	.get_partition_info = ocf_metadata_hash_get_partition_info,
-	.set_partition_next = ocf_metadata_hash_set_partition_next,
-	.set_partition_prev = ocf_metadata_hash_set_partition_prev,
-	.set_partition_info = ocf_metadata_hash_set_partition_info,
-
-	/*
-	 * Hash Table
-	 */
-	.get_hash = ocf_metadata_hash_get_hash,
-	.set_hash = ocf_metadata_hash_set_hash,
-
-	/*
-	 * Cleaning Policy
-	 */
-	.get_cleaning_policy = ocf_metadata_hash_get_cleaning_policy,
-
-	/*
-	 * Eviction Policy
-	 */
-	.get_eviction_policy = ocf_metadata_hash_get_eviction_policy,
 };
 
 /*******************************************************************************
diff --git a/src/metadata/metadata_partition.h b/src/metadata/metadata_partition.h
index 0dd024f..61beb0e 100644
--- a/src/metadata/metadata_partition.h
+++ b/src/metadata/metadata_partition.h
@@ -13,14 +13,10 @@
 #define PARTITION_INVALID		((ocf_part_id_t)-1)
 #define PARTITION_SIZE_MAX		((ocf_cache_line_t)-1)
 
-static inline void ocf_metadata_get_partition_info(
+void ocf_metadata_get_partition_info(
 		struct ocf_cache *cache, ocf_cache_line_t line,
 		ocf_part_id_t *part_id, ocf_cache_line_t *next_line,
-		ocf_cache_line_t *prev_line)
-{
-	cache->metadata.iface.get_partition_info(cache, line, part_id,
-			next_line, prev_line);
-}
+		ocf_cache_line_t *prev_line);
 
 static inline ocf_part_id_t ocf_metadata_get_partition_id(
 		struct ocf_cache *cache, ocf_cache_line_t line)
@@ -52,28 +48,18 @@ static inline ocf_cache_line_t ocf_metadata_get_partition_prev(
 	return prev;
 }
 
-static inline void ocf_metadata_set_partition_next(
+void ocf_metadata_set_partition_next(
 		struct ocf_cache *cache, ocf_cache_line_t line,
-		ocf_cache_line_t next_line)
-{
-	cache->metadata.iface.set_partition_next(cache, line, next_line);
-}
+		ocf_cache_line_t next_line);
 
-static inline void ocf_metadata_set_partition_prev(
+void ocf_metadata_set_partition_prev(
 		struct ocf_cache *cache, ocf_cache_line_t line,
-		ocf_cache_line_t prev_line)
-{
-	cache->metadata.iface.set_partition_prev(cache, line, prev_line);
-}
+		ocf_cache_line_t prev_line);
 
-static inline void ocf_metadata_set_partition_info(
+void ocf_metadata_set_partition_info(
 		struct ocf_cache *cache, ocf_cache_line_t line,
 		ocf_part_id_t part_id, ocf_cache_line_t next_line,
-		ocf_cache_line_t prev_line)
-{
-	cache->metadata.iface.set_partition_info(cache, line, part_id,
-			next_line, prev_line);
-}
+		ocf_cache_line_t prev_line);
 
 void ocf_metadata_add_to_partition(struct ocf_cache *cache,
 		ocf_part_id_t part_id, ocf_cache_line_t line);
diff --git a/src/metadata/metadata_superblock.h b/src/metadata/metadata_superblock.h
index 8b6781e..49b15e5 100644
--- a/src/metadata/metadata_superblock.h
+++ b/src/metadata/metadata_superblock.h
@@ -63,24 +63,14 @@ struct ocf_superblock_runtime {
 	uint32_t cleaning_thread_access;
 };
 
-static inline void ocf_metadata_set_shutdown_status(ocf_cache_t cache,
+void ocf_metadata_set_shutdown_status(ocf_cache_t cache,
 		enum ocf_metadata_shutdown_status shutdown_status,
-		ocf_metadata_end_t cmpl, void *priv)
-{
-	cache->metadata.iface.set_shutdown_status(cache, shutdown_status,
-			cmpl, priv);
-}
+		ocf_metadata_end_t cmpl, void *priv);
 
-static inline void ocf_metadata_load_superblock(ocf_cache_t cache,
-		ocf_metadata_end_t cmpl, void *priv)
-{
-	cache->metadata.iface.load_superblock(cache, cmpl, priv);
-}
+void ocf_metadata_load_superblock(ocf_cache_t cache,
+		ocf_metadata_end_t cmpl, void *priv);
 
-static inline void ocf_metadata_flush_superblock(ocf_cache_t cache,
-		ocf_metadata_end_t cmpl, void *priv)
-{
-	cache->metadata.iface.flush_superblock(cache, cmpl, priv);
-}
+void ocf_metadata_flush_superblock(ocf_cache_t cache,
+		ocf_metadata_end_t cmpl, void *priv);
 
 #endif /* METADATA_SUPERBLOCK_H_ */

From 05c0826c0f471826185bf4bc2b577e260a7e76c1 Mon Sep 17 00:00:00 2001
From: Adam Rutkowski <adam.j.rutkowski@intel.com>
Date: Mon, 23 Nov 2020 13:16:39 -0600
Subject: [PATCH 04/13] Remove metadata bits manipulation abstraction

Signed-off-by: Adam Rutkowski <adam.j.rutkowski@intel.com>
---
 src/metadata/metadata_hash.c    | 154 ++++++++++++--------------------
 src/metadata/metadata_status.h  |  82 ++++++++++-------
 src/metadata/metadata_structs.h |  37 --------
 3 files changed, 104 insertions(+), 169 deletions(-)

diff --git a/src/metadata/metadata_hash.c b/src/metadata/metadata_hash.c
index 153bdac..0e74cd1 100644
--- a/src/metadata/metadata_hash.c
+++ b/src/metadata/metadata_hash.c
@@ -2788,6 +2788,62 @@ static const struct ocf_metadata_iface metadata_hash_iface = {
 
 #include "metadata_bit.h"
 
+#define _ocf_metadata_funcs_5arg(what) \
+bool ocf_metadata_##what(struct ocf_cache *cache, \
+	 ocf_cache_line_t line, uint8_t start, uint8_t stop, bool all) \
+{ \
+	switch (cache->metadata.settings.size) { \
+		case ocf_cache_line_size_4: \
+			return _ocf_metadata_##what##_u8(cache, line, start, stop, all); \
+		case ocf_cache_line_size_8: \
+			return _ocf_metadata_##what##_u16(cache, line, start, stop, all); \
+		case ocf_cache_line_size_16: \
+			return _ocf_metadata_##what##_u32(cache, line, start, stop, all); \
+		case ocf_cache_line_size_32: \
+			return _ocf_metadata_##what##_u64(cache, line, start, stop, all); \
+		case ocf_cache_line_size_64: \
+			return _ocf_metadata_##what##_u128(cache, line, start, stop, all); \
+		case ocf_cache_line_size_none: \
+		default: \
+			ENV_BUG_ON(1); \
+			return false; \
+	} \
+} \
+
+
+#define _ocf_metadata_funcs_4arg(what) \
+bool ocf_metadata_##what(struct ocf_cache *cache, \
+	 ocf_cache_line_t line, uint8_t start, uint8_t stop) \
+{ \
+	switch (cache->metadata.settings.size) { \
+		case ocf_cache_line_size_4: \
+			return _ocf_metadata_##what##_u8(cache, line, start, stop); \
+		case ocf_cache_line_size_8: \
+			return _ocf_metadata_##what##_u16(cache, line, start, stop); \
+		case ocf_cache_line_size_16: \
+			return _ocf_metadata_##what##_u32(cache, line, start, stop); \
+		case ocf_cache_line_size_32: \
+			return _ocf_metadata_##what##_u64(cache, line, start, stop); \
+		case ocf_cache_line_size_64: \
+			return _ocf_metadata_##what##_u128(cache, line, start, stop); \
+		case ocf_cache_line_size_none: \
+		default: \
+			ENV_BUG_ON(1); \
+			return false; \
+	} \
+} \
+
+#define _ocf_metadata_funcs(what) \
+	_ocf_metadata_funcs_5arg(test_##what) \
+	_ocf_metadata_funcs_4arg(test_out_##what) \
+	_ocf_metadata_funcs_4arg(clear_##what) \
+	_ocf_metadata_funcs_4arg(set_##what) \
+	_ocf_metadata_funcs_5arg(test_and_set_##what) \
+	_ocf_metadata_funcs_5arg(test_and_clear_##what)
+
+_ocf_metadata_funcs(dirty)
+_ocf_metadata_funcs(valid)
+
 static void ocf_metadata_hash_init_iface(struct ocf_cache *cache,
 		ocf_metadata_layout_t layout)
 {
@@ -2802,104 +2858,6 @@ static void ocf_metadata_hash_init_iface(struct ocf_cache *cache,
 	iface->layout = layout;
 
 	/* Initialize bit status function */
-
-	switch (cache->metadata.settings.size) {
-	case ocf_cache_line_size_4:
-		iface->test_dirty = _ocf_metadata_test_dirty_u8;
-		iface->test_out_dirty = _ocf_metadata_test_out_dirty_u8;
-		iface->clear_dirty = _ocf_metadata_clear_dirty_u8;
-		iface->set_dirty = _ocf_metadata_set_dirty_u8;
-		iface->test_and_set_dirty = _ocf_metadata_test_and_set_dirty_u8;
-		iface->test_and_clear_dirty =
-				_ocf_metadata_test_and_clear_dirty_u8;
-		iface->test_valid = _ocf_metadata_test_valid_u8;
-		iface->test_out_valid = _ocf_metadata_test_out_valid_u8;
-		iface->clear_valid = _ocf_metadata_clear_valid_u8;
-		iface->set_valid = _ocf_metadata_set_valid_u8;
-		iface->test_and_set_valid = _ocf_metadata_test_and_set_valid_u8;
-		iface->test_and_clear_valid =
-				_ocf_metadata_test_and_clear_valid_u8;
-		break;
-
-	case ocf_cache_line_size_8:
-		iface->test_dirty = _ocf_metadata_test_dirty_u16;
-		iface->test_out_dirty = _ocf_metadata_test_out_dirty_u16;
-		iface->clear_dirty = _ocf_metadata_clear_dirty_u16;
-		iface->set_dirty = _ocf_metadata_set_dirty_u16;
-		iface->test_and_set_dirty =
-				_ocf_metadata_test_and_set_dirty_u16;
-		iface->test_and_clear_dirty =
-				_ocf_metadata_test_and_clear_dirty_u16;
-		iface->test_valid = _ocf_metadata_test_valid_u16;
-		iface->test_out_valid = _ocf_metadata_test_out_valid_u16;
-		iface->clear_valid = _ocf_metadata_clear_valid_u16;
-		iface->set_valid = _ocf_metadata_set_valid_u16;
-		iface->test_and_set_valid =
-				_ocf_metadata_test_and_set_valid_u16;
-		iface->test_and_clear_valid =
-				_ocf_metadata_test_and_clear_valid_u16;
-		break;
-
-	case ocf_cache_line_size_16:
-		iface->test_dirty = _ocf_metadata_test_dirty_u32;
-		iface->test_out_dirty = _ocf_metadata_test_out_dirty_u32;
-		iface->clear_dirty = _ocf_metadata_clear_dirty_u32;
-		iface->set_dirty = _ocf_metadata_set_dirty_u32;
-		iface->test_and_set_dirty =
-				_ocf_metadata_test_and_set_dirty_u32;
-		iface->test_and_clear_dirty =
-				_ocf_metadata_test_and_clear_dirty_u32;
-		iface->test_valid = _ocf_metadata_test_valid_u32;
-		iface->test_out_valid = _ocf_metadata_test_out_valid_u32;
-		iface->clear_valid = _ocf_metadata_clear_valid_u32;
-		iface->set_valid = _ocf_metadata_set_valid_u32;
-		iface->test_and_set_valid =
-				_ocf_metadata_test_and_set_valid_u32;
-		iface->test_and_clear_valid =
-				_ocf_metadata_test_and_clear_valid_u32;
-		break;
-	case ocf_cache_line_size_32:
-		iface->test_dirty = _ocf_metadata_test_dirty_u64;
-		iface->test_out_dirty = _ocf_metadata_test_out_dirty_u64;
-		iface->clear_dirty = _ocf_metadata_clear_dirty_u64;
-		iface->set_dirty = _ocf_metadata_set_dirty_u64;
-		iface->test_and_set_dirty =
-				_ocf_metadata_test_and_set_dirty_u64;
-		iface->test_and_clear_dirty =
-				_ocf_metadata_test_and_clear_dirty_u64;
-		iface->test_valid = _ocf_metadata_test_valid_u64;
-		iface->test_out_valid = _ocf_metadata_test_out_valid_u64;
-		iface->clear_valid = _ocf_metadata_clear_valid_u64;
-		iface->set_valid = _ocf_metadata_set_valid_u64;
-		iface->test_and_set_valid =
-				_ocf_metadata_test_and_set_valid_u64;
-		iface->test_and_clear_valid =
-				_ocf_metadata_test_and_clear_valid_u64;
-		break;
-
-	case ocf_cache_line_size_64:
-		iface->test_dirty = _ocf_metadata_test_dirty_u128;
-		iface->test_out_dirty = _ocf_metadata_test_out_dirty_u128;
-		iface->clear_dirty = _ocf_metadata_clear_dirty_u128;
-		iface->set_dirty = _ocf_metadata_set_dirty_u128;
-		iface->test_and_set_dirty =
-				_ocf_metadata_test_and_set_dirty_u128;
-		iface->test_and_clear_dirty =
-				_ocf_metadata_test_and_clear_dirty_u128;
-		iface->test_valid = _ocf_metadata_test_valid_u128;
-		iface->test_out_valid = _ocf_metadata_test_out_valid_u128;
-		iface->clear_valid = _ocf_metadata_clear_valid_u128;
-		iface->set_valid = _ocf_metadata_set_valid_u128;
-		iface->test_and_set_valid =
-				_ocf_metadata_test_and_set_valid_u128;
-		iface->test_and_clear_valid =
-				_ocf_metadata_test_and_clear_valid_u128;
-		break;
-
-	default:
-		ENV_BUG();
-		break;
-	}
 }
 
 /*
diff --git a/src/metadata/metadata_status.h b/src/metadata/metadata_status.h
index efcd3a2..71836b1 100644
--- a/src/metadata/metadata_status.h
+++ b/src/metadata/metadata_status.h
@@ -12,15 +12,29 @@
  * Dirty
  ******************************************************************************/
 
+bool ocf_metadata_test_dirty(struct ocf_cache *cache, ocf_cache_line_t line, uint8_t start, uint8_t stop, bool all);
+bool ocf_metadata_test_out_dirty(struct ocf_cache *cache, ocf_cache_line_t line, uint8_t start, uint8_t stop);
+bool ocf_metadata_clear_dirty(struct ocf_cache *cache, ocf_cache_line_t line, uint8_t start, uint8_t stop);
+bool ocf_metadata_set_dirty(struct ocf_cache *cache, ocf_cache_line_t line, uint8_t start, uint8_t stop);
+bool ocf_metadata_test_and_set_dirty(struct ocf_cache *cache, ocf_cache_line_t line, uint8_t start, uint8_t stop, bool all);
+bool ocf_metadata_test_and_clear_dirty(struct ocf_cache *cache, ocf_cache_line_t line, uint8_t start, uint8_t stop, bool all);
+
+bool ocf_metadata_test_valid(struct ocf_cache *cache, ocf_cache_line_t line, uint8_t start, uint8_t stop, bool all);
+bool ocf_metadata_test_out_valid(struct ocf_cache *cache, ocf_cache_line_t line, uint8_t start, uint8_t stop);
+bool ocf_metadata_clear_valid(struct ocf_cache *cache, ocf_cache_line_t line, uint8_t start, uint8_t stop);
+bool ocf_metadata_set_valid(struct ocf_cache *cache, ocf_cache_line_t line, uint8_t start, uint8_t stop);
+bool ocf_metadata_test_and_set_valid(struct ocf_cache *cache, ocf_cache_line_t line, uint8_t start, uint8_t stop, bool all);
+bool ocf_metadata_test_and_clear_valid(struct ocf_cache *cache, ocf_cache_line_t line, uint8_t start, uint8_t stop, bool all);
+
 static inline void metadata_init_status_bits(struct ocf_cache *cache,
 		ocf_cache_line_t line)
 {
 	OCF_METADATA_BITS_LOCK_WR();
 
-	cache->metadata.iface.clear_dirty(cache, line,
+	ocf_metadata_clear_dirty(cache, line,
 			cache->metadata.settings.sector_start,
 			cache->metadata.settings.sector_end);
-	cache->metadata.iface.clear_valid(cache, line,
+	ocf_metadata_clear_valid(cache, line,
 			cache->metadata.settings.sector_start,
 			cache->metadata.settings.sector_end);
 
@@ -33,7 +47,7 @@ static inline bool metadata_test_dirty_all(struct ocf_cache *cache,
 	bool test;
 
 	OCF_METADATA_BITS_LOCK_RD();
-	test = cache->metadata.iface.test_dirty(cache, line,
+	test = ocf_metadata_test_dirty(cache, line,
 		cache->metadata.settings.sector_start,
 		cache->metadata.settings.sector_end, true);
 	OCF_METADATA_BITS_UNLOCK_RD();
@@ -47,7 +61,7 @@ static inline bool metadata_test_dirty(struct ocf_cache *cache,
 	bool test;
 
 	OCF_METADATA_BITS_LOCK_RD();
-	test = cache->metadata.iface.test_dirty(cache, line,
+	test = ocf_metadata_test_dirty(cache, line,
 		cache->metadata.settings.sector_start,
 		cache->metadata.settings.sector_end, false);
 	OCF_METADATA_BITS_UNLOCK_RD();
@@ -59,7 +73,7 @@ static inline void metadata_set_dirty(struct ocf_cache *cache,
 		ocf_cache_line_t line)
 {
 	OCF_METADATA_BITS_LOCK_WR();
-	cache->metadata.iface.set_dirty(cache, line,
+	ocf_metadata_set_dirty(cache, line,
 			cache->metadata.settings.sector_start,
 			cache->metadata.settings.sector_end);
 	OCF_METADATA_BITS_UNLOCK_WR();
@@ -69,7 +83,7 @@ static inline void metadata_clear_dirty(struct ocf_cache *cache,
 		ocf_cache_line_t line)
 {
 	OCF_METADATA_BITS_LOCK_WR();
-	cache->metadata.iface.clear_dirty(cache, line,
+	ocf_metadata_clear_dirty(cache, line,
 			cache->metadata.settings.sector_start,
 			cache->metadata.settings.sector_end);
 	OCF_METADATA_BITS_UNLOCK_WR();
@@ -81,7 +95,7 @@ static inline bool metadata_test_and_clear_dirty(
 	bool test;
 
 	OCF_METADATA_BITS_LOCK_WR();
-	test =	cache->metadata.iface.test_and_clear_dirty(cache, line,
+	test =	ocf_metadata_test_and_clear_dirty(cache, line,
 			cache->metadata.settings.sector_start,
 			cache->metadata.settings.sector_end, false);
 	OCF_METADATA_BITS_UNLOCK_WR();
@@ -95,7 +109,7 @@ static inline bool metadata_test_and_set_dirty(struct ocf_cache *cache,
 	bool test;
 
 	OCF_METADATA_BITS_LOCK_WR();
-	test =	cache->metadata.iface.test_and_set_dirty(cache, line,
+	test =	ocf_metadata_test_and_set_dirty(cache, line,
 			cache->metadata.settings.sector_start,
 			cache->metadata.settings.sector_end, false);
 	OCF_METADATA_BITS_UNLOCK_WR();
@@ -113,7 +127,7 @@ static inline bool metadata_test_dirty_sec(struct ocf_cache *cache,
 	bool test;
 
 	OCF_METADATA_BITS_LOCK_RD();
-	test = cache->metadata.iface.test_dirty(cache, line,
+	test = ocf_metadata_test_dirty(cache, line,
 			start, stop, false);
 	OCF_METADATA_BITS_UNLOCK_RD();
 
@@ -126,7 +140,7 @@ static inline bool metadata_test_dirty_all_sec(struct ocf_cache *cache,
 	bool test;
 
 	OCF_METADATA_BITS_LOCK_RD();
-	test = cache->metadata.iface.test_dirty(cache, line,
+	test = ocf_metadata_test_dirty(cache, line,
 			start, stop, true);
 	OCF_METADATA_BITS_UNLOCK_RD();
 
@@ -145,7 +159,7 @@ static inline bool metadata_test_dirty_out_sec(struct ocf_cache *cache,
 	bool test;
 
 	OCF_METADATA_BITS_LOCK_RD();
-	test = cache->metadata.iface.test_out_dirty(cache, line, start, stop);
+	test = ocf_metadata_test_out_dirty(cache, line, start, stop);
 	OCF_METADATA_BITS_UNLOCK_RD();
 
 	return test;
@@ -155,7 +169,7 @@ static inline void metadata_set_dirty_sec(struct ocf_cache *cache,
 		ocf_cache_line_t line, uint8_t start, uint8_t stop)
 {
 	OCF_METADATA_BITS_LOCK_WR();
-	cache->metadata.iface.set_dirty(cache, line, start, stop);
+	ocf_metadata_set_dirty(cache, line, start, stop);
 	OCF_METADATA_BITS_UNLOCK_WR();
 }
 
@@ -163,7 +177,7 @@ static inline void metadata_clear_dirty_sec(struct ocf_cache *cache,
 		ocf_cache_line_t line, uint8_t start, uint8_t stop)
 {
 	OCF_METADATA_BITS_LOCK_WR();
-	cache->metadata.iface.clear_dirty(cache, line, start, stop);
+	ocf_metadata_clear_dirty(cache, line, start, stop);
 	OCF_METADATA_BITS_UNLOCK_WR();
 }
 
@@ -171,7 +185,7 @@ static inline void metadata_set_dirty_sec_one(struct ocf_cache *cache,
 		ocf_cache_line_t line, uint8_t pos)
 {
 	OCF_METADATA_BITS_LOCK_WR();
-	cache->metadata.iface.set_dirty(cache, line, pos, pos);
+	ocf_metadata_set_dirty(cache, line, pos, pos);
 	OCF_METADATA_BITS_UNLOCK_WR();
 }
 
@@ -179,7 +193,7 @@ static inline void metadata_clear_dirty_sec_one(struct ocf_cache *cache,
 		ocf_cache_line_t line, uint8_t pos)
 {
 	OCF_METADATA_BITS_LOCK_WR();
-	cache->metadata.iface.clear_dirty(cache, line, pos, pos);
+	ocf_metadata_clear_dirty(cache, line, pos, pos);
 	OCF_METADATA_BITS_UNLOCK_WR();
 }
 
@@ -190,7 +204,7 @@ static inline bool metadata_test_and_clear_dirty_sec(
 	bool test = false;
 
 	OCF_METADATA_BITS_LOCK_WR();
-	test = cache->metadata.iface.test_and_clear_dirty(cache, line,
+	test = ocf_metadata_test_and_clear_dirty(cache, line,
 			start, stop, false);
 	OCF_METADATA_BITS_UNLOCK_WR();
 
@@ -211,9 +225,9 @@ static inline bool metadata_clear_dirty_sec_changed(
 
 	OCF_METADATA_BITS_LOCK_WR();
 
-	sec_changed = cache->metadata.iface.test_dirty(cache, line,
+	sec_changed = ocf_metadata_test_dirty(cache, line,
 			start, stop, false);
-	*line_is_clean = !cache->metadata.iface.clear_dirty(cache, line,
+	*line_is_clean = !ocf_metadata_clear_dirty(cache, line,
 			start, stop);
 
 	OCF_METADATA_BITS_UNLOCK_WR();
@@ -234,9 +248,9 @@ static inline bool metadata_set_dirty_sec_changed(
 	bool sec_changed;
 
 	OCF_METADATA_BITS_LOCK_WR();
-	sec_changed = !cache->metadata.iface.test_dirty(cache, line,
+	sec_changed = !ocf_metadata_test_dirty(cache, line,
 			start, stop, true);
-	*line_was_dirty = cache->metadata.iface.set_dirty(cache, line, start,
+	*line_was_dirty = ocf_metadata_set_dirty(cache, line, start,
 			stop);
 	OCF_METADATA_BITS_UNLOCK_WR();
 
@@ -253,7 +267,7 @@ static inline bool metadata_test_valid_any(struct ocf_cache *cache,
 	bool test;
 
 	OCF_METADATA_BITS_LOCK_RD();
-	test = cache->metadata.iface.test_valid(cache, line,
+	test = ocf_metadata_test_valid(cache, line,
 		cache->metadata.settings.sector_start,
 		cache->metadata.settings.sector_end, false);
 	OCF_METADATA_BITS_UNLOCK_RD();
@@ -267,7 +281,7 @@ static inline bool metadata_test_valid(struct ocf_cache *cache,
 	bool test;
 
 	OCF_METADATA_BITS_LOCK_RD();
-	test = cache->metadata.iface.test_valid(cache, line,
+	test = ocf_metadata_test_valid(cache, line,
 		cache->metadata.settings.sector_start,
 		cache->metadata.settings.sector_end, true);
 	OCF_METADATA_BITS_UNLOCK_RD();
@@ -279,7 +293,7 @@ static inline void metadata_set_valid(struct ocf_cache *cache,
 		ocf_cache_line_t line)
 {
 	OCF_METADATA_BITS_LOCK_WR();
-	cache->metadata.iface.set_valid(cache, line,
+	ocf_metadata_set_valid(cache, line,
 			cache->metadata.settings.sector_start,
 			cache->metadata.settings.sector_end);
 	OCF_METADATA_BITS_UNLOCK_WR();
@@ -289,7 +303,7 @@ static inline void metadata_clear_valid(struct ocf_cache *cache,
 		ocf_cache_line_t line)
 {
 	OCF_METADATA_BITS_LOCK_WR();
-	cache->metadata.iface.clear_valid(cache, line,
+	ocf_metadata_clear_valid(cache, line,
 			cache->metadata.settings.sector_start,
 			cache->metadata.settings.sector_end);
 	OCF_METADATA_BITS_UNLOCK_WR();
@@ -301,7 +315,7 @@ static inline bool metadata_test_and_clear_valid(
 	bool test = false;
 
 	OCF_METADATA_BITS_LOCK_WR();
-	test =	cache->metadata.iface.test_and_clear_valid(cache, line,
+	test =	ocf_metadata_test_and_clear_valid(cache, line,
 			cache->metadata.settings.sector_start,
 			cache->metadata.settings.sector_end, true);
 	OCF_METADATA_BITS_UNLOCK_WR();
@@ -315,7 +329,7 @@ static inline bool metadata_test_and_set_valid(struct ocf_cache *cache,
 	bool test = false;
 
 	OCF_METADATA_BITS_LOCK_WR();
-	test =	cache->metadata.iface.test_and_set_valid(cache, line,
+	test =	ocf_metadata_test_and_set_valid(cache, line,
 			cache->metadata.settings.sector_start,
 			cache->metadata.settings.sector_end, true);
 	OCF_METADATA_BITS_UNLOCK_WR();
@@ -333,7 +347,7 @@ static inline bool metadata_test_valid_sec(struct ocf_cache *cache,
 	bool test;
 
 	OCF_METADATA_BITS_LOCK_RD();
-	test = cache->metadata.iface.test_valid(cache, line,
+	test = ocf_metadata_test_valid(cache, line,
 			start, stop, true);
 	OCF_METADATA_BITS_UNLOCK_RD();
 
@@ -347,7 +361,7 @@ static inline bool metadata_test_valid_any_out_sec(
 	bool test = false;
 
 	OCF_METADATA_BITS_LOCK_RD();
-	test = cache->metadata.iface.test_out_valid(cache, line,
+	test = ocf_metadata_test_out_valid(cache, line,
 			start, stop);
 	OCF_METADATA_BITS_UNLOCK_RD();
 
@@ -374,7 +388,7 @@ static inline bool metadata_set_valid_sec_changed(
 	bool was_any_valid;
 
 	OCF_METADATA_BITS_LOCK_WR();
-	was_any_valid = cache->metadata.iface.set_valid(cache, line,
+	was_any_valid = ocf_metadata_set_valid(cache, line,
 			start, stop);
 	OCF_METADATA_BITS_UNLOCK_WR();
 
@@ -385,7 +399,7 @@ static inline void metadata_clear_valid_sec(struct ocf_cache *cache,
 		ocf_cache_line_t line, uint8_t start, uint8_t stop)
 {
 	OCF_METADATA_BITS_LOCK_WR();
-	cache->metadata.iface.clear_valid(cache, line, start, stop);
+	ocf_metadata_clear_valid(cache, line, start, stop);
 	OCF_METADATA_BITS_UNLOCK_WR();
 }
 
@@ -393,7 +407,7 @@ static inline void metadata_clear_valid_sec_one(struct ocf_cache *cache,
 		ocf_cache_line_t line, uint8_t pos)
 {
 	OCF_METADATA_BITS_LOCK_WR();
-	cache->metadata.iface.clear_valid(cache, line, pos, pos);
+	ocf_metadata_clear_valid(cache, line, pos, pos);
 	OCF_METADATA_BITS_UNLOCK_WR();
 }
 
@@ -401,7 +415,7 @@ static inline void metadata_set_valid_sec_one(struct ocf_cache *cache,
 		ocf_cache_line_t line, uint8_t pos)
 {
 	OCF_METADATA_BITS_LOCK_WR();
-	cache->metadata.iface.set_valid(cache, line, pos, pos);
+	ocf_metadata_set_valid(cache, line, pos, pos);
 	OCF_METADATA_BITS_UNLOCK_WR();
 }
 /*
@@ -419,11 +433,11 @@ static inline bool metadata_clear_valid_sec_changed(
 
 	OCF_METADATA_BITS_LOCK_WR();
 
-	was_any_valid = cache->metadata.iface.test_valid(cache, line,
+	was_any_valid = ocf_metadata_test_valid(cache, line,
 			cache->metadata.settings.sector_start,
 			cache->metadata.settings.sector_end, false);
 
-	*is_valid = cache->metadata.iface.clear_valid(cache, line,
+	*is_valid = ocf_metadata_clear_valid(cache, line,
 			start, stop);
 
 	OCF_METADATA_BITS_UNLOCK_WR();
diff --git a/src/metadata/metadata_structs.h b/src/metadata/metadata_structs.h
index bf5c312..a42eae3 100644
--- a/src/metadata/metadata_structs.h
+++ b/src/metadata/metadata_structs.h
@@ -315,43 +315,6 @@ struct ocf_metadata_iface {
 	struct ocf_metadata_status*
 	(*wr_status_access)(struct ocf_cache *cache,
 			ocf_cache_line_t line);
-
-	bool (*test_dirty)(struct ocf_cache *cache,
-		ocf_cache_line_t line, uint8_t start, uint8_t stop, bool all);
-
-	bool (*test_out_dirty)(struct ocf_cache *cache,
-		ocf_cache_line_t line, uint8_t start, uint8_t stop);
-
-	bool (*clear_dirty)(struct ocf_cache *cache,
-		ocf_cache_line_t line, uint8_t start, uint8_t stop);
-
-	bool (*set_dirty)(struct ocf_cache *cache,
-		ocf_cache_line_t line, uint8_t start, uint8_t stop);
-
-	bool (*test_and_set_dirty)(struct ocf_cache *cache,
-		ocf_cache_line_t line, uint8_t start, uint8_t stop, bool all);
-
-	bool (*test_and_clear_dirty)(struct ocf_cache *cache,
-		ocf_cache_line_t line, uint8_t start, uint8_t stop, bool all);
-
-
-	bool (*test_valid)(struct ocf_cache *cache,
-		ocf_cache_line_t line, uint8_t start, uint8_t stop, bool all);
-
-	bool (*test_out_valid)(struct ocf_cache *cache,
-		ocf_cache_line_t line, uint8_t start, uint8_t stop);
-
-	bool (*clear_valid)(struct ocf_cache *cache,
-		ocf_cache_line_t line, uint8_t start, uint8_t stop);
-
-	bool (*set_valid)(struct ocf_cache *cache,
-		ocf_cache_line_t line, uint8_t start, uint8_t stop);
-
-	bool (*test_and_set_valid)(struct ocf_cache *cache,
-		ocf_cache_line_t line, uint8_t start, uint8_t stop, bool all);
-
-	bool (*test_and_clear_valid)(struct ocf_cache *cache,
-		ocf_cache_line_t line, uint8_t start, uint8_t stop, bool all);
 };
 
 struct ocf_cache_line_settings {

From b5d6cdb398fb39b8974c8c558b8e0dd6a5f511bf Mon Sep 17 00:00:00 2001
From: Adam Rutkowski <adam.j.rutkowski@intel.com>
Date: Mon, 23 Nov 2020 22:03:44 -0600
Subject: [PATCH 05/13] Rename metadata iface_priv to priv

Signed-off-by: Adam Rutkowski <adam.j.rutkowski@intel.com>
---
 src/metadata/metadata_bit.h     | 12 ++---
 src/metadata/metadata_hash.c    | 90 ++++++++++++++++-----------------
 src/metadata/metadata_structs.h |  2 +-
 3 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/src/metadata/metadata_bit.h b/src/metadata/metadata_bit.h
index e88d9bc..1cba47b 100644
--- a/src/metadata/metadata_bit.h
+++ b/src/metadata/metadata_bit.h
@@ -58,7 +58,7 @@ static bool _ocf_metadata_test_##what##_##type(struct ocf_cache *cache, \
 	type mask = _get_mask_##type(start, stop); \
 \
 	struct ocf_metadata_hash_ctrl *ctrl = \
-		(struct ocf_metadata_hash_ctrl *) cache->metadata.iface_priv; \
+		(struct ocf_metadata_hash_ctrl *) cache->metadata.priv; \
 \
 	struct ocf_metadata_raw *raw = \
 			&ctrl->raw_desc[metadata_segment_collision]; \
@@ -88,7 +88,7 @@ static bool _ocf_metadata_test_out_##what##_##type(struct ocf_cache *cache, \
 	type mask = _get_mask_##type(start, stop); \
 \
 	struct ocf_metadata_hash_ctrl *ctrl = \
-		(struct ocf_metadata_hash_ctrl *) cache->metadata.iface_priv; \
+		(struct ocf_metadata_hash_ctrl *) cache->metadata.priv; \
 \
 	struct ocf_metadata_raw *raw = \
 			&ctrl->raw_desc[metadata_segment_collision]; \
@@ -110,7 +110,7 @@ static bool _ocf_metadata_clear_##what##_##type(struct ocf_cache *cache, \
 	type mask = _get_mask_##type(start, stop); \
 \
 	struct ocf_metadata_hash_ctrl *ctrl = \
-		(struct ocf_metadata_hash_ctrl *) cache->metadata.iface_priv; \
+		(struct ocf_metadata_hash_ctrl *) cache->metadata.priv; \
 \
 	struct ocf_metadata_raw *raw = \
 			&ctrl->raw_desc[metadata_segment_collision]; \
@@ -135,7 +135,7 @@ static bool _ocf_metadata_set_##what##_##type(struct ocf_cache *cache, \
 	type mask = _get_mask_##type(start, stop); \
 \
 	struct ocf_metadata_hash_ctrl *ctrl = \
-		(struct ocf_metadata_hash_ctrl *) cache->metadata.iface_priv; \
+		(struct ocf_metadata_hash_ctrl *) cache->metadata.priv; \
 \
 	struct ocf_metadata_raw *raw = \
 			&ctrl->raw_desc[metadata_segment_collision]; \
@@ -159,7 +159,7 @@ static bool _ocf_metadata_test_and_set_##what##_##type( \
 	type mask = _get_mask_##type(start, stop); \
 \
 	struct ocf_metadata_hash_ctrl *ctrl = \
-		(struct ocf_metadata_hash_ctrl *) cache->metadata.iface_priv; \
+		(struct ocf_metadata_hash_ctrl *) cache->metadata.priv; \
 \
 	struct ocf_metadata_raw *raw = \
 			&ctrl->raw_desc[metadata_segment_collision]; \
@@ -194,7 +194,7 @@ static bool _ocf_metadata_test_and_clear_##what##_##type( \
 	type mask = _get_mask_##type(start, stop); \
 \
 	struct ocf_metadata_hash_ctrl *ctrl = \
-		(struct ocf_metadata_hash_ctrl *) cache->metadata.iface_priv; \
+		(struct ocf_metadata_hash_ctrl *) cache->metadata.priv; \
 \
 	struct ocf_metadata_raw *raw = \
 			&ctrl->raw_desc[metadata_segment_collision]; \
diff --git a/src/metadata/metadata_hash.c b/src/metadata/metadata_hash.c
index 0e74cd1..9801440 100644
--- a/src/metadata/metadata_hash.c
+++ b/src/metadata/metadata_hash.c
@@ -411,7 +411,7 @@ void ocf_metadata_deinit_variable_size(struct ocf_cache *cache)
 	uint32_t i = 0;
 
 	struct ocf_metadata_hash_ctrl *ctrl = (struct ocf_metadata_hash_ctrl *)
-			cache->metadata.iface_priv;
+			cache->metadata.priv;
 
 	OCF_DEBUG_TRACE(cache);
 
@@ -451,7 +451,7 @@ void ocf_metadata_deinit_fixed_size(struct ocf_cache *cache)
 	uint32_t i;
 
 	struct ocf_metadata_hash_ctrl *ctrl = (struct ocf_metadata_hash_ctrl *)
-			cache->metadata.iface_priv;
+			cache->metadata.priv;
 
 	for (i = 0; i < metadata_segment_fixed_size_max; i++) {
 		result |= ocf_metadata_raw_deinit(cache,
@@ -459,7 +459,7 @@ void ocf_metadata_deinit_fixed_size(struct ocf_cache *cache)
 	}
 
 	env_vfree(ctrl);
-	cache->metadata.iface_priv = NULL;
+	cache->metadata.priv = NULL;
 
 	if (result)
 		ENV_BUG();
@@ -533,14 +533,14 @@ int ocf_metadata_init_fixed_size(struct ocf_cache *cache,
 
 	OCF_DEBUG_TRACE(cache);
 
-	ENV_WARN_ON(metadata->iface_priv);
+	ENV_WARN_ON(metadata->priv);
 
 	ocf_metadata_config_init(cache, settings, cache_line_size);
 
 	ctrl = ocf_metadata_hash_ctrl_init(metadata->is_volatile);
 	if (!ctrl)
 		return -OCF_ERR_NO_MEM;
-	metadata->iface_priv = ctrl;
+	metadata->priv = ctrl;
 
 	for (i = 0; i < metadata_segment_fixed_size_max; i++) {
 		result |= ocf_metadata_raw_init(cache, NULL, NULL,
@@ -918,9 +918,9 @@ int ocf_metadata_init_variable_size(struct ocf_cache *cache,
 
 	OCF_DEBUG_TRACE(cache);
 
-	ENV_WARN_ON(!cache->metadata.iface_priv);
+	ENV_WARN_ON(!cache->metadata.priv);
 
-	ctrl = cache->metadata.iface_priv;
+	ctrl = cache->metadata.priv;
 
 	device_lines = device_size / cache_line_size;
 	if (device_lines >= (ocf_cache_line_t)(-1)){
@@ -1141,7 +1141,7 @@ ocf_cache_line_t ocf_metadata_get_pages_count(struct ocf_cache *cache)
 
 	OCF_DEBUG_TRACE(cache);
 
-	ctrl = (struct ocf_metadata_hash_ctrl *) cache->metadata.iface_priv;
+	ctrl = (struct ocf_metadata_hash_ctrl *) cache->metadata.priv;
 
 	return ctrl->count_pages;
 }
@@ -1156,7 +1156,7 @@ ocf_cache_line_t ocf_metadata_get_cachelines_count(
 
 	OCF_DEBUG_TRACE(cache);
 
-	ctrl = (struct ocf_metadata_hash_ctrl *) cache->metadata.iface_priv;
+	ctrl = (struct ocf_metadata_hash_ctrl *) cache->metadata.priv;
 
 	return ctrl->cachelines;
 }
@@ -1169,7 +1169,7 @@ size_t ocf_metadata_size_of(struct ocf_cache *cache)
 
 	OCF_DEBUG_TRACE(cache);
 
-	ctrl = (struct ocf_metadata_hash_ctrl *) cache->metadata.iface_priv;
+	ctrl = (struct ocf_metadata_hash_ctrl *) cache->metadata.priv;
 
 	/*
 	 * Get size of all RAW metadata container
@@ -1214,7 +1214,7 @@ static void ocf_medatata_hash_load_segment(ocf_pipeline_t pipeline,
 	struct ocf_metadata_hash_ctrl *ctrl;
 	ocf_cache_t cache = context->cache;
 
-	ctrl = (struct ocf_metadata_hash_ctrl *)cache->metadata.iface_priv;
+	ctrl = (struct ocf_metadata_hash_ctrl *)cache->metadata.priv;
 
 	ocf_metadata_raw_load_all(cache, &ctrl->raw_desc[segment],
 			ocf_metadata_hash_generic_complete, context);
@@ -1229,7 +1229,7 @@ static void ocf_medatata_hash_store_segment(ocf_pipeline_t pipeline,
 	ocf_cache_t cache = context->cache;
 	int error;
 
-	ctrl = (struct ocf_metadata_hash_ctrl *)cache->metadata.iface_priv;
+	ctrl = (struct ocf_metadata_hash_ctrl *)cache->metadata.priv;
 
 	context->segment_copy[segment].mem_pool =
 		env_malloc(ctrl->raw_desc[segment].mem_pool_limit, ENV_MEM_NORMAL);
@@ -1258,7 +1258,7 @@ static void ocf_medatata_hash_check_crc_sb_config(ocf_pipeline_t pipeline,
 	int segment = metadata_segment_sb_config;
 	uint32_t crc;
 
-	ctrl = (struct ocf_metadata_hash_ctrl *)cache->metadata.iface_priv;
+	ctrl = (struct ocf_metadata_hash_ctrl *)cache->metadata.priv;
 	sb_config = METADATA_MEM_POOL(ctrl, metadata_segment_sb_config);
 
 	crc = env_crc32(0, (void *)sb_config,
@@ -1285,7 +1285,7 @@ static void ocf_medatata_hash_check_crc_skip(ocf_pipeline_t pipeline,
 	ocf_cache_t cache = context->cache;
 	uint32_t crc;
 
-	ctrl = (struct ocf_metadata_hash_ctrl *)cache->metadata.iface_priv;
+	ctrl = (struct ocf_metadata_hash_ctrl *)cache->metadata.priv;
 	sb_config = METADATA_MEM_POOL(ctrl, metadata_segment_sb_config);
 
 	if (!sb_config->clean_shutdown && skip_on_dirty_shutdown)
@@ -1335,7 +1335,7 @@ static void ocf_medatata_hash_load_superblock_post(ocf_pipeline_t pipeline,
 	ocf_core_t core;
 	ocf_core_id_t core_id;
 
-	ctrl = (struct ocf_metadata_hash_ctrl *)cache->metadata.iface_priv;
+	ctrl = (struct ocf_metadata_hash_ctrl *)cache->metadata.priv;
 	sb_config = METADATA_MEM_POOL(ctrl, metadata_segment_sb_config);
 
 	for_each_core_metadata(cache, core, core_id) {
@@ -1375,7 +1375,7 @@ static void ocf_metadata_hash_load_sb_restore(
 	struct ocf_metadata_hash_ctrl *ctrl;
 	int segment, error;
 
-	ctrl = (struct ocf_metadata_hash_ctrl *)cache->metadata.iface_priv;
+	ctrl = (struct ocf_metadata_hash_ctrl *)cache->metadata.priv;
 
 	for (segment = metadata_segment_sb_config;
 			segment < metadata_segment_fixed_size_max; segment++) {
@@ -1478,7 +1478,7 @@ void ocf_metadata_load_superblock(ocf_cache_t cache, ocf_metadata_end_t cmpl,
 
 	OCF_DEBUG_TRACE(cache);
 
-	ctrl = (struct ocf_metadata_hash_ctrl *) cache->metadata.iface_priv;
+	ctrl = (struct ocf_metadata_hash_ctrl *) cache->metadata.priv;
 	ENV_BUG_ON(!ctrl);
 
 	sb_config = METADATA_MEM_POOL(ctrl, metadata_segment_sb_config);
@@ -1527,7 +1527,7 @@ static void ocf_medatata_hash_calculate_crc_sb_config(ocf_pipeline_t pipeline,
 	struct ocf_superblock_config *sb_config;
 	ocf_cache_t cache = context->cache;
 
-	ctrl = (struct ocf_metadata_hash_ctrl *)cache->metadata.iface_priv;
+	ctrl = (struct ocf_metadata_hash_ctrl *)cache->metadata.priv;
 	sb_config = METADATA_MEM_POOL(ctrl, metadata_segment_sb_config);
 
 	sb_config->checksum[metadata_segment_sb_config] = env_crc32(0,
@@ -1546,7 +1546,7 @@ static void ocf_medatata_hash_calculate_crc(ocf_pipeline_t pipeline,
 	struct ocf_superblock_config *sb_config;
 	ocf_cache_t cache = context->cache;
 
-	ctrl = (struct ocf_metadata_hash_ctrl *)cache->metadata.iface_priv;
+	ctrl = (struct ocf_metadata_hash_ctrl *)cache->metadata.priv;
 	sb_config = METADATA_MEM_POOL(ctrl, metadata_segment_sb_config);
 
 	sb_config->checksum[segment] = ocf_metadata_raw_checksum(cache,
@@ -1563,7 +1563,7 @@ static void ocf_medatata_hash_flush_segment(ocf_pipeline_t pipeline,
 	struct ocf_metadata_hash_ctrl *ctrl;
 	ocf_cache_t cache = context->cache;
 
-	ctrl = (struct ocf_metadata_hash_ctrl *)cache->metadata.iface_priv;
+	ctrl = (struct ocf_metadata_hash_ctrl *)cache->metadata.priv;
 
 	ocf_metadata_raw_flush_all(cache, &ctrl->raw_desc[segment],
 			ocf_metadata_hash_generic_complete, context);
@@ -1682,7 +1682,7 @@ void ocf_metadata_set_shutdown_status(ocf_cache_t cache,
 	/*
 	 * Get metadata hash service control structure
 	 */
-	ctrl = (struct ocf_metadata_hash_ctrl *) cache->metadata.iface_priv;
+	ctrl = (struct ocf_metadata_hash_ctrl *) cache->metadata.priv;
 
 	/*
 	 * Get super block
@@ -1708,7 +1708,7 @@ uint64_t ocf_metadata_get_reserved_lba(
 
 	OCF_DEBUG_TRACE(cache);
 
-	ctrl = (struct ocf_metadata_hash_ctrl *) cache->metadata.iface_priv;
+	ctrl = (struct ocf_metadata_hash_ctrl *) cache->metadata.priv;
 	return ctrl->raw_desc[metadata_segment_reserved].ssd_pages_offset *
 			PAGE_SIZE;
 }
@@ -1823,7 +1823,7 @@ void ocf_metadata_flush_mark(struct ocf_cache *cache,
 
 	OCF_DEBUG_TRACE(cache);
 
-	ctrl = (struct ocf_metadata_hash_ctrl *) cache->metadata.iface_priv;
+	ctrl = (struct ocf_metadata_hash_ctrl *) cache->metadata.priv;
 
 	/*
 	 * Mark all required metadata elements to make given metadata cache
@@ -1847,7 +1847,7 @@ void ocf_metadata_flush_do_asynch(struct ocf_cache *cache,
 
 	OCF_DEBUG_TRACE(cache);
 
-	ctrl = (struct ocf_metadata_hash_ctrl *) cache->metadata.iface_priv;
+	ctrl = (struct ocf_metadata_hash_ctrl *) cache->metadata.priv;
 
 	/*
 	 * Flush all required metadata elements to make given metadata cache
@@ -2260,7 +2260,7 @@ void ocf_metadata_get_core_info(struct ocf_cache *cache,
 {
 	const struct ocf_metadata_map *collision;
 	struct ocf_metadata_hash_ctrl *ctrl =
-		(struct ocf_metadata_hash_ctrl *) cache->metadata.iface_priv;
+		(struct ocf_metadata_hash_ctrl *) cache->metadata.priv;
 
 	collision = ocf_metadata_raw_rd_access(cache,
 			&(ctrl->raw_desc[metadata_segment_collision]), line);
@@ -2285,7 +2285,7 @@ void ocf_metadata_set_core_info(struct ocf_cache *cache,
 {
 	struct ocf_metadata_map *collision;
 	struct ocf_metadata_hash_ctrl *ctrl =
-		(struct ocf_metadata_hash_ctrl *) cache->metadata.iface_priv;
+		(struct ocf_metadata_hash_ctrl *) cache->metadata.priv;
 
 	collision = ocf_metadata_raw_wr_access(cache,
 			&(ctrl->raw_desc[metadata_segment_collision]), line);
@@ -2303,7 +2303,7 @@ ocf_core_id_t ocf_metadata_get_core_id(struct ocf_cache *cache,
 {
 	const struct ocf_metadata_map *collision;
 	struct ocf_metadata_hash_ctrl *ctrl =
-		(struct ocf_metadata_hash_ctrl *) cache->metadata.iface_priv;
+		(struct ocf_metadata_hash_ctrl *) cache->metadata.priv;
 
 	collision = ocf_metadata_raw_rd_access(cache,
 			&(ctrl->raw_desc[metadata_segment_collision]), line);
@@ -2320,7 +2320,7 @@ struct ocf_metadata_uuid *ocf_metadata_get_core_uuid(
 {
 	struct ocf_metadata_uuid *muuid;
 	struct ocf_metadata_hash_ctrl *ctrl =
-		(struct ocf_metadata_hash_ctrl *) cache->metadata.iface_priv;
+		(struct ocf_metadata_hash_ctrl *) cache->metadata.priv;
 
 	muuid = ocf_metadata_raw_wr_access(cache,
 			&(ctrl->raw_desc[metadata_segment_core_uuid]), core_id);
@@ -2342,7 +2342,7 @@ void ocf_metadata_get_core_and_part_id(struct ocf_cache *cache,
 	const struct ocf_metadata_map *collision;
 	const struct ocf_metadata_list_info *info;
 	struct ocf_metadata_hash_ctrl *ctrl =
-		(struct ocf_metadata_hash_ctrl *) cache->metadata.iface_priv;
+		(struct ocf_metadata_hash_ctrl *) cache->metadata.priv;
 
 	collision = ocf_metadata_raw_rd_access(cache,
 			&(ctrl->raw_desc[metadata_segment_collision]), line);
@@ -2376,7 +2376,7 @@ ocf_cache_line_t ocf_metadata_get_hash(struct ocf_cache *cache,
 	ocf_cache_line_t line = cache->device->collision_table_entries;
 	int result = 0;
 	struct ocf_metadata_hash_ctrl *ctrl
-		= (struct ocf_metadata_hash_ctrl *) cache->metadata.iface_priv;
+		= (struct ocf_metadata_hash_ctrl *) cache->metadata.priv;
 
 	result = ocf_metadata_raw_get(cache,
 			&(ctrl->raw_desc[metadata_segment_hash]), index, &line);
@@ -2395,7 +2395,7 @@ void ocf_metadata_set_hash(struct ocf_cache *cache, ocf_cache_line_t index,
 {
 	int result = 0;
 	struct ocf_metadata_hash_ctrl *ctrl
-		= (struct ocf_metadata_hash_ctrl *) cache->metadata.iface_priv;
+		= (struct ocf_metadata_hash_ctrl *) cache->metadata.priv;
 
 	result = ocf_metadata_raw_set(cache,
 			&(ctrl->raw_desc[metadata_segment_hash]), index, &line);
@@ -2416,7 +2416,7 @@ ocf_metadata_get_cleaning_policy(struct ocf_cache *cache,
 		ocf_cache_line_t line)
 {
 	struct ocf_metadata_hash_ctrl *ctrl
-		= (struct ocf_metadata_hash_ctrl *) cache->metadata.iface_priv;
+		= (struct ocf_metadata_hash_ctrl *) cache->metadata.priv;
 
 	return ocf_metadata_raw_wr_access(cache,
 			&(ctrl->raw_desc[metadata_segment_cleaning]), line);
@@ -2434,7 +2434,7 @@ ocf_metadata_get_eviction_policy(struct ocf_cache *cache,
 		ocf_cache_line_t line)
 {
 	struct ocf_metadata_hash_ctrl *ctrl
-		= (struct ocf_metadata_hash_ctrl *) cache->metadata.iface_priv;
+		= (struct ocf_metadata_hash_ctrl *) cache->metadata.priv;
 
 	return ocf_metadata_raw_wr_access(cache,
 			&(ctrl->raw_desc[metadata_segment_eviction]), line);
@@ -2488,7 +2488,7 @@ static ocf_cache_line_t ocf_metadata_hash_map_lg2phy_striping(
 {
 	ocf_cache_line_t cache_line = 0, offset = 0;
 	struct ocf_metadata_hash_ctrl *ctrl =
-		(struct ocf_metadata_hash_ctrl *) cache->metadata.iface_priv;
+		(struct ocf_metadata_hash_ctrl *) cache->metadata.priv;
 	unsigned int entries_in_page =
 		ctrl->raw_desc[metadata_segment_collision].entries_in_page;
 	unsigned int pages =
@@ -2522,7 +2522,7 @@ static ocf_cache_line_t ocf_metadata_hash_map_phy2lg_striping(
 	ocf_cache_line_t coll_idx = 0;
 
 	struct ocf_metadata_hash_ctrl *ctrl =
-		(struct ocf_metadata_hash_ctrl *) cache->metadata.iface_priv;
+		(struct ocf_metadata_hash_ctrl *) cache->metadata.priv;
 
 	struct ocf_metadata_raw *raw =
 		&ctrl->raw_desc[metadata_segment_collision];
@@ -2594,7 +2594,7 @@ void ocf_metadata_set_collision_info(struct ocf_cache *cache,
 {
 	struct ocf_metadata_list_info *info;
 	struct ocf_metadata_hash_ctrl *ctrl =
-		(struct ocf_metadata_hash_ctrl *) cache->metadata.iface_priv;
+		(struct ocf_metadata_hash_ctrl *) cache->metadata.priv;
 
 	info = ocf_metadata_raw_wr_access(cache,
 			&(ctrl->raw_desc[metadata_segment_list_info]), line);
@@ -2612,7 +2612,7 @@ void ocf_metadata_set_collision_next(struct ocf_cache *cache,
 {
 	struct ocf_metadata_list_info *info;
 	struct ocf_metadata_hash_ctrl *ctrl =
-		(struct ocf_metadata_hash_ctrl *) cache->metadata.iface_priv;
+		(struct ocf_metadata_hash_ctrl *) cache->metadata.priv;
 
 	info = ocf_metadata_raw_wr_access(cache,
 			&(ctrl->raw_desc[metadata_segment_list_info]), line);
@@ -2628,7 +2628,7 @@ void ocf_metadata_set_collision_prev(struct ocf_cache *cache,
 {
 	struct ocf_metadata_list_info *info;
 	struct ocf_metadata_hash_ctrl *ctrl =
-		(struct ocf_metadata_hash_ctrl *) cache->metadata.iface_priv;
+		(struct ocf_metadata_hash_ctrl *) cache->metadata.priv;
 
 	info = ocf_metadata_raw_wr_access(cache,
 			&(ctrl->raw_desc[metadata_segment_list_info]), line);
@@ -2645,7 +2645,7 @@ void ocf_metadata_get_collision_info(struct ocf_cache *cache,
 {
 	const struct ocf_metadata_list_info *info;
 	struct ocf_metadata_hash_ctrl *ctrl =
-		(struct ocf_metadata_hash_ctrl *) cache->metadata.iface_priv;
+		(struct ocf_metadata_hash_ctrl *) cache->metadata.priv;
 
 	ENV_BUG_ON(NULL == next && NULL == prev);
 
@@ -2670,7 +2670,7 @@ void ocf_metadata_start_collision_shared_access(struct ocf_cache *cache,
 		ocf_cache_line_t line)
 {
 	struct ocf_metadata_hash_ctrl *ctrl =
-		(struct ocf_metadata_hash_ctrl *) cache->metadata.iface_priv;
+		(struct ocf_metadata_hash_ctrl *) cache->metadata.priv;
 	struct ocf_metadata_raw *raw =
 			&ctrl->raw_desc[metadata_segment_collision];
 	uint32_t page = ocf_metadata_raw_page(raw, line);
@@ -2682,7 +2682,7 @@ void ocf_metadata_end_collision_shared_access(struct ocf_cache *cache,
 		ocf_cache_line_t line)
 {
 	struct ocf_metadata_hash_ctrl *ctrl =
-		(struct ocf_metadata_hash_ctrl *) cache->metadata.iface_priv;
+		(struct ocf_metadata_hash_ctrl *) cache->metadata.priv;
 	struct ocf_metadata_raw *raw =
 			&ctrl->raw_desc[metadata_segment_collision];
 	uint32_t page = ocf_metadata_raw_page(raw, line);
@@ -2700,7 +2700,7 @@ void ocf_metadata_get_partition_info(struct ocf_cache *cache,
 {
 	const struct ocf_metadata_list_info *info;
 	struct ocf_metadata_hash_ctrl *ctrl =
-		(struct ocf_metadata_hash_ctrl *) cache->metadata.iface_priv;
+		(struct ocf_metadata_hash_ctrl *) cache->metadata.priv;
 
 	info = ocf_metadata_raw_rd_access(cache,
 			&(ctrl->raw_desc[metadata_segment_list_info]), line);
@@ -2728,7 +2728,7 @@ void ocf_metadata_set_partition_next(struct ocf_cache *cache,
 {
 	struct ocf_metadata_list_info *info;
 	struct ocf_metadata_hash_ctrl *ctrl =
-		(struct ocf_metadata_hash_ctrl *) cache->metadata.iface_priv;
+		(struct ocf_metadata_hash_ctrl *) cache->metadata.priv;
 
 	info = ocf_metadata_raw_wr_access(cache,
 			&(ctrl->raw_desc[metadata_segment_list_info]), line);
@@ -2744,7 +2744,7 @@ void ocf_metadata_set_partition_prev(struct ocf_cache *cache,
 {
 	struct ocf_metadata_list_info *info;
 	struct ocf_metadata_hash_ctrl *ctrl =
-		(struct ocf_metadata_hash_ctrl *) cache->metadata.iface_priv;
+		(struct ocf_metadata_hash_ctrl *) cache->metadata.priv;
 
 	info = ocf_metadata_raw_wr_access(cache,
 			&(ctrl->raw_desc[metadata_segment_list_info]), line);
@@ -2761,7 +2761,7 @@ void ocf_metadata_set_partition_info(struct ocf_cache *cache,
 {
 	struct ocf_metadata_list_info *info;
 	struct ocf_metadata_hash_ctrl *ctrl =
-		(struct ocf_metadata_hash_ctrl *) cache->metadata.iface_priv;
+		(struct ocf_metadata_hash_ctrl *) cache->metadata.priv;
 
 	info = ocf_metadata_raw_wr_access(cache,
 			&(ctrl->raw_desc[metadata_segment_list_info]), line);
diff --git a/src/metadata/metadata_structs.h b/src/metadata/metadata_structs.h
index a42eae3..5971c01 100644
--- a/src/metadata/metadata_structs.h
+++ b/src/metadata/metadata_structs.h
@@ -344,7 +344,7 @@ struct ocf_metadata {
 	const struct ocf_metadata_iface iface;
 		/*!< Metadata service interface */
 
-	void *iface_priv;
+	void *priv;
 		/*!< Private data of metadata service interface */
 
 	const struct ocf_cache_line_settings settings;

From 4d97b1611fd61004a8447a38ee1c3153d60e3cf4 Mon Sep 17 00:00:00 2001
From: Adam Rutkowski <adam.j.rutkowski@intel.com>
Date: Mon, 23 Nov 2020 22:06:22 -0600
Subject: [PATCH 06/13] Move metadata layout field outside meteadata ifc

Signed-off-by: Adam Rutkowski <adam.j.rutkowski@intel.com>
---
 src/metadata/metadata_hash.c    | 42 +++++++++++----------------------
 src/metadata/metadata_structs.h |  3 +++
 2 files changed, 17 insertions(+), 28 deletions(-)

diff --git a/src/metadata/metadata_hash.c b/src/metadata/metadata_hash.c
index 9801440..2c5f67f 100644
--- a/src/metadata/metadata_hash.c
+++ b/src/metadata/metadata_hash.c
@@ -32,9 +32,6 @@
 
 #define METADATA_MEM_POOL(ctrl, section) ctrl->raw_desc[section].mem_pool
 
-static void ocf_metadata_hash_init_iface(struct ocf_cache *cache,
-		ocf_metadata_layout_t layout);
-
 #define OCF_METADATA_HASH_DIFF_MAX 1000
 
 enum {
@@ -900,6 +897,17 @@ static void ocf_metadata_hash_flush_unlock_collision_page(
 			page);
 }
 
+static void ocf_metadata_init_layout(struct ocf_cache *cache,
+		ocf_metadata_layout_t layout)
+{
+	ENV_BUG_ON(layout >= ocf_metadata_layout_max || layout < 0);
+
+	/* Initialize metadata location interface*/
+	if (cache->device->init_mode == ocf_init_mode_metadata_volatile)
+		layout = ocf_metadata_layout_seq;
+	cache->metadata.layout = layout;
+}
+
 /*
  * Initialize hash metadata interface
  */
@@ -940,7 +948,7 @@ int ocf_metadata_init_variable_size(struct ocf_cache *cache,
 	ctrl->mapping_size = ocf_metadata_status_sizeof(settings)
 		+ sizeof(struct ocf_metadata_map);
 
-	ocf_metadata_hash_init_iface(cache, layout);
+	ocf_metadata_init_layout(cache, layout);
 
 	/* Initial setup of dynamic size RAW containers */
 	for (i = metadata_segment_variable_size_start;
@@ -2553,10 +2561,7 @@ static ocf_cache_line_t ocf_metadata_hash_map_phy2lg_striping(
 ocf_cache_line_t ocf_metadata_map_lg2phy(
 		struct ocf_cache *cache, ocf_cache_line_t coll_idx)
 {
-	struct ocf_metadata_iface *iface = (struct ocf_metadata_iface *)
-			&cache->metadata.iface;
-
-	switch (iface->layout) {
+	switch (cache->metadata.layout) {
 	case ocf_metadata_layout_striping:
 		return ocf_metadata_hash_map_lg2phy_striping(
 				cache, coll_idx);
@@ -2572,10 +2577,7 @@ ocf_cache_line_t ocf_metadata_map_lg2phy(
 ocf_cache_line_t ocf_metadata_map_phy2lg(
 		struct ocf_cache *cache, ocf_cache_line_t cache_line)
 {
-	struct ocf_metadata_iface *iface = (struct ocf_metadata_iface *)
-			&cache->metadata.iface;
-
-	switch (iface->layout) {
+	switch (cache->metadata.layout) {
 	case ocf_metadata_layout_striping:
 		return ocf_metadata_hash_map_phy2lg_striping(
 				cache, cache_line);
@@ -2844,22 +2846,6 @@ bool ocf_metadata_##what(struct ocf_cache *cache, \
 _ocf_metadata_funcs(dirty)
 _ocf_metadata_funcs(valid)
 
-static void ocf_metadata_hash_init_iface(struct ocf_cache *cache,
-		ocf_metadata_layout_t layout)
-{
-	struct ocf_metadata_iface *iface = (struct ocf_metadata_iface *)
-			&cache->metadata.iface;
-
-	ENV_BUG_ON(layout >= ocf_metadata_layout_max || layout < 0);
-
-	/* Initialize metadata location interface*/
-	if (cache->device->init_mode == ocf_init_mode_metadata_volatile)
-		layout = ocf_metadata_layout_seq;
-	iface->layout = layout;
-
-	/* Initialize bit status function */
-}
-
 /*
  * Get metadata hash interface
  */
diff --git a/src/metadata/metadata_structs.h b/src/metadata/metadata_structs.h
index 5971c01..f78f09a 100644
--- a/src/metadata/metadata_structs.h
+++ b/src/metadata/metadata_structs.h
@@ -344,6 +344,9 @@ struct ocf_metadata {
 	const struct ocf_metadata_iface iface;
 		/*!< Metadata service interface */
 
+	ocf_metadata_layout_t layout;
+		/*!< Per-cacheline metadata layout */
+
 	void *priv;
 		/*!< Private data of metadata service interface */
 

From 6dfdd6940b2367a9b2eecd1882b607ada80f79cf Mon Sep 17 00:00:00 2001
From: Adam Rutkowski <adam.j.rutkowski@intel.com>
Date: Mon, 23 Nov 2020 22:06:51 -0600
Subject: [PATCH 07/13] Remove metadata ifc structure

At this point it is not used

Signed-off-by: Adam Rutkowski <adam.j.rutkowski@intel.com>
---
 src/metadata/metadata_hash.c    |  15 --
 src/metadata/metadata_hash.h    |   7 -
 src/metadata/metadata_structs.h | 284 --------------------------------
 3 files changed, 306 deletions(-)

diff --git a/src/metadata/metadata_hash.c b/src/metadata/metadata_hash.c
index 2c5f67f..36c1de2 100644
--- a/src/metadata/metadata_hash.c
+++ b/src/metadata/metadata_hash.c
@@ -2777,13 +2777,6 @@ void ocf_metadata_set_partition_info(struct ocf_cache *cache,
 	}
 }
 
-/*******************************************************************************
- * Hash Metadata interface definition
- ******************************************************************************/
-
-static const struct ocf_metadata_iface metadata_hash_iface = {
-};
-
 /*******************************************************************************
  *  Bitmap status
  ******************************************************************************/
@@ -2845,11 +2838,3 @@ bool ocf_metadata_##what(struct ocf_cache *cache, \
 
 _ocf_metadata_funcs(dirty)
 _ocf_metadata_funcs(valid)
-
-/*
- * Get metadata hash interface
- */
-const struct ocf_metadata_iface *metadata_hash_get_iface(void)
-{
-	return &metadata_hash_iface;
-}
diff --git a/src/metadata/metadata_hash.h b/src/metadata/metadata_hash.h
index afcaebc..51a70f6 100644
--- a/src/metadata/metadata_hash.h
+++ b/src/metadata/metadata_hash.h
@@ -41,11 +41,4 @@ enum ocf_metadata_segment {
 	metadata_segment_max,		/*!< MAX */
 };
 
-/**
- * @brief Get metadata interface implementation
- *
- * @return metadata interface
- */
-const struct ocf_metadata_iface *metadata_hash_get_iface(void);
-
 #endif /* METADATA_HASH_H_ */
diff --git a/src/metadata/metadata_structs.h b/src/metadata/metadata_structs.h
index f78f09a..2efdc92 100644
--- a/src/metadata/metadata_structs.h
+++ b/src/metadata/metadata_structs.h
@@ -36,287 +36,6 @@ enum ocf_metadata_shutdown_status {
 typedef void (*ocf_metadata_query_cores_end_t)(void *priv, int error,
 		unsigned int num_cores);
 
-/**
- * OCF Metadata interface
- */
-struct ocf_metadata_iface {
-	/**
-	 * @brief Initialize metadata
-	 *
-	 * @param cache - Cache instance
-	 * @param cache_line_size - Cache line size
-	 * @return 0 - Operation success otherwise failure
-	 */
-	int (*init)(struct ocf_cache *cache,
-			ocf_cache_line_size_t cache_line_size);
-
-	/**
-	 * @brief Initialize variable size metadata sections
-	 *
-	 * @param cache - Cache instance
-	 * @param device_size - Cache size in bytes
-	 * @param cache_line_size - Cache line size
-	 * @param layout Metadata layout
-	 * @return 0 - Operation success otherwise failure
-	 */
-	int (*init_variable_size)(struct ocf_cache *cache, uint64_t device_size,
-			ocf_cache_line_size_t cache_line_size,
-			ocf_metadata_layout_t layout);
-
-	/**
-	 * @brief Query metadata for added cores
-	 *
-	 * @param[in] owner - OCF context
-	 * @param[in] volume - volume to probe
-	 * @param[in,out] uuid - array of uuids
-	 * @param[in] count - size of uuid array
-	 * @param[in] cmpl - completion callback
-	 * @param[in] priv - completion private data
-	 */
-	void (*query_cores)(ocf_ctx_t owner, ocf_volume_t volume,
-		struct ocf_volume_uuid *uuid, uint32_t count,
-		ocf_metadata_query_cores_end_t cmpl, void *priv);
-
-
-	/**
-	 * @brief Per-cacheline metadata layout
-	 */
-	ocf_metadata_layout_t layout;
-
-	/**
-	 * @brief Initialize hash table
-	 *
-	 * @param cache - Cache instance
-	 */
-	void (*init_hash_table)(struct ocf_cache *cache);
-
-	/**
-	 * @brief Initialize collision table
-	 *
-	 * @param cache - Cache instance
-	 */
-	void (*init_collision)(struct ocf_cache *cache);
-
-	/**
-	 * @brief De-Initialize metadata
-	 *
-	 * @param cache - Cache instance
-	 */
-	void (*deinit)(struct ocf_cache *cache);
-
-	/**
-	 * @brief De-Initialize variable size metadata segments
-	 *
-	 * @param cache - Cache instance
-	 */
-	void (*deinit_variable_size)(struct ocf_cache *cache);
-
-	/**
-	 * @brief Get memory footprint
-	 *
-	 * @param cache - Cache instance
-	 * @return 0 - memory footprint
-	 */
-	size_t (*size_of)(struct ocf_cache *cache);
-
-	/**
-	 * @brief Get amount of pages required for metadata
-	 *
-	 * @param cache - Cache instance
-	 * @return Pages required for store metadata on cache device
-	 */
-	ocf_cache_line_t (*pages)(struct ocf_cache *cache);
-
-	/**
-	 * @brief Get amount of cache lines
-	 *
-	 * @param cache - Cache instance
-	 * @return Amount of cache lines (cache device lines - metadata space)
-	 */
-	ocf_cache_line_t (*cachelines)(struct ocf_cache *cache);
-
-	/**
-	 * @brief Load metadata from cache device
-	 *
-	 * @param[in] cache - Cache instance
-	 * @param[in] cmpl - Completion callback
-	 * @param[in] priv - Completion callback context
-	 */
-	void (*load_all)(ocf_cache_t cache,
-			ocf_metadata_end_t cmpl, void *priv);
-
-	/**
-	 * @brief Load metadata from recovery procedure
-	 *
-	 * @param[in] cache - Cache instance
-	 * @param[in] cmpl - Completion callback
-	 * @param[in] priv - Completion callback context
-	 */
-	void (*load_recovery)(ocf_cache_t cache,
-			ocf_metadata_end_t cmpl, void *priv);
-
-	/**
-	 * @brief Flush metadata into cahce cache
-	 *
-	 * @param[in] cache - Cache instance
-	 * @param[in] cmpl - Completion callback
-	 * @param[in] priv - Completion callback context
-	 */
-	void (*flush_all)(ocf_cache_t cache,
-			ocf_metadata_end_t cmpl, void *priv);
-
-	/**
-	 * @brief Mark specified cache line to be flushed
-	 *
-	 * @param[in] cache - Cache instance
-	 * @param[in] line - cache line which to be flushed
-	 */
-	void (*flush_mark)(struct ocf_cache *cache, struct ocf_request *req,
-			uint32_t map_idx, int to_state, uint8_t start,
-			uint8_t stop);
-
-	/**
-	 * @brief Flush marked cache lines asynchronously
-	 *
-	 * @param cache - Cache instance
-	 * @param queue - I/O queue to which metadata flush should be submitted
-	 * @param remaining - request remaining
-	 * @param complete - flushing request callback
-	 * @param context - context that will be passed into callback
-	 */
-	void (*flush_do_asynch)(struct ocf_cache *cache,
-			struct ocf_request *req, ocf_req_end_t complete);
-
-
-	/* TODO Provide documentation below */
-
-	enum ocf_metadata_shutdown_status (*get_shutdown_status)(
-			struct ocf_cache *cache);
-
-	void (*set_shutdown_status)(ocf_cache_t cache,
-			enum ocf_metadata_shutdown_status shutdown_status,
-			ocf_metadata_end_t cmpl, void *priv);
-
-	void (*load_superblock)(ocf_cache_t cache,
-			ocf_metadata_end_t cmpl, void *priv);
-
-	void (*flush_superblock)(ocf_cache_t cache,
-			ocf_metadata_end_t cmpl, void *priv);
-
-	uint64_t (*get_reserved_lba)(struct ocf_cache *cache);
-
-	/**
-	 * @brief Get eviction policy
-	 *
-	 * @param[in] cache - Cache instance
-	 * @param[in] line - cache line for which eviction policy is requested
-	 * @return eviction policy metadata
-	 */
-	union eviction_policy_meta *(*get_eviction_policy)(
-			struct ocf_cache *cache, ocf_cache_line_t line);
-
-	/**
-	 * @brief Get cleaning policy
-	 *
-	 * @param[in] cache - Cache instance
-	 * @param[in] line - cache line for which cleaning policy is requested
-	 * @return cleaning_policy metadata
-	 */
-	struct cleaning_policy_meta *(*get_cleaning_policy)(
-			struct ocf_cache *cache, ocf_cache_line_t line);
-
-	/**
-	 * @brief Get hash table for specified index
-	 *
-	 * @param[in] cache - Cache instance
-	 * @param[in] index - Hash table index
-	 * @return Cache line value under specified hash table index
-	 */
-	 ocf_cache_line_t (*get_hash)(struct ocf_cache *cache,
-			ocf_cache_line_t index);
-
-	/**
-	 * @brief Set hash table value for specified index
-	 *
-	 * @param[in] cache - Cache instance
-	 * @param[in] index - Hash table index
-	 * @param[in] line - Cache line value to be set under specified hash
-	 * table index
-	 */
-	void (*set_hash)(struct ocf_cache *cache,
-			ocf_cache_line_t index, ocf_cache_line_t line);
-
-	/**
-	 * @brief Get hash table entries
-	 *
-	 * @param[in] cache - Cache instance
-	 * @return Hash table entries
-	 */
-	ocf_cache_line_t (*entries_hash)(struct ocf_cache *cache);
-
-	/* TODO Provide documentation below */
-	void (*set_core_info)(struct ocf_cache *cache,
-			ocf_cache_line_t line, ocf_core_id_t core_id,
-			uint64_t core_sector);
-
-	void (*get_core_info)(struct ocf_cache *cache,
-			ocf_cache_line_t line, ocf_core_id_t *core_id,
-			uint64_t *core_sector);
-
-	ocf_core_id_t (*get_core_id)(struct ocf_cache *cache,
-			ocf_cache_line_t line);
-
-	void (*get_core_and_part_id)(struct ocf_cache *cache,
-			ocf_cache_line_t line, ocf_core_id_t *core_id,
-			ocf_part_id_t *part_id);
-
-	struct ocf_metadata_uuid *(*get_core_uuid)(
-			struct ocf_cache *cache, ocf_core_id_t core_id);
-
-	void (*set_collision_info)(struct ocf_cache *cache,
-			ocf_cache_line_t line, ocf_cache_line_t next,
-			ocf_cache_line_t prev);
-
-	void (*get_collision_info)(struct ocf_cache *cache,
-				ocf_cache_line_t line, ocf_cache_line_t *next,
-				ocf_cache_line_t *prev);
-
-	void (*set_collision_next)(struct ocf_cache *cache,
-				ocf_cache_line_t line, ocf_cache_line_t next);
-
-	void (*set_collision_prev)(struct ocf_cache *cache,
-				ocf_cache_line_t line, ocf_cache_line_t prev);
-
-	void (*start_collision_shared_access)(struct ocf_cache *cache,
-			ocf_cache_line_t line);
-
-	void (*end_collision_shared_access)(struct ocf_cache *cache,
-			ocf_cache_line_t line);
-
-	void (*get_partition_info)(struct ocf_cache *cache,
-			ocf_cache_line_t line, ocf_part_id_t *part_id,
-			ocf_cache_line_t *next_line,
-			ocf_cache_line_t *prev_line);
-
-	void (*set_partition_next)(struct ocf_cache *cache,
-			ocf_cache_line_t line, ocf_cache_line_t next_line);
-
-	void (*set_partition_prev)(struct ocf_cache *cache,
-			ocf_cache_line_t line, ocf_cache_line_t prev_line);
-
-	void (*set_partition_info)(struct ocf_cache *cache,
-			ocf_cache_line_t line, ocf_part_id_t part_id,
-			ocf_cache_line_t next_line, ocf_cache_line_t prev_line);
-
-	const struct ocf_metadata_status*
-	(*rd_status_access)(struct ocf_cache *cache,
-			ocf_cache_line_t line);
-
-	struct ocf_metadata_status*
-	(*wr_status_access)(struct ocf_cache *cache,
-			ocf_cache_line_t line);
-};
-
 struct ocf_cache_line_settings {
 	ocf_cache_line_size_t size;
 	uint64_t sector_count;
@@ -341,9 +60,6 @@ struct ocf_metadata_lock
  * @brief Metadata control structure
  */
 struct ocf_metadata {
-	const struct ocf_metadata_iface iface;
-		/*!< Metadata service interface */
-
 	ocf_metadata_layout_t layout;
 		/*!< Per-cacheline metadata layout */
 

From 5fb4d68c7f76f68efbe983a85ffb53218a44ca67 Mon Sep 17 00:00:00 2001
From: Adam Rutkowski <adam.j.rutkowski@intel.com>
Date: Mon, 23 Nov 2020 20:18:53 -0600
Subject: [PATCH 08/13] Remove get and set from metadata raw ifc

Memcopy based metadata interface is an unnecessary
overhead and is being removed.

Signed-off-by: Adam Rutkowski <adam.j.rutkowski@intel.com>
---
 src/metadata/metadata_hash.c        | 19 ++++-----------
 src/metadata/metadata_raw.c         | 30 ------------------------
 src/metadata/metadata_raw.h         | 36 -----------------------------
 src/metadata/metadata_raw_dynamic.c | 33 --------------------------
 src/metadata/metadata_raw_dynamic.h | 12 ----------
 5 files changed, 4 insertions(+), 126 deletions(-)

diff --git a/src/metadata/metadata_hash.c b/src/metadata/metadata_hash.c
index 36c1de2..3219105 100644
--- a/src/metadata/metadata_hash.c
+++ b/src/metadata/metadata_hash.c
@@ -2381,18 +2381,11 @@ void ocf_metadata_get_core_and_part_id(struct ocf_cache *cache,
 ocf_cache_line_t ocf_metadata_get_hash(struct ocf_cache *cache,
 		ocf_cache_line_t index)
 {
-	ocf_cache_line_t line = cache->device->collision_table_entries;
-	int result = 0;
 	struct ocf_metadata_hash_ctrl *ctrl
 		= (struct ocf_metadata_hash_ctrl *) cache->metadata.priv;
 
-	result = ocf_metadata_raw_get(cache,
-			&(ctrl->raw_desc[metadata_segment_hash]), index, &line);
-
-	if (result)
-		ocf_metadata_error(cache);
-
-	return line;
+	return *(ocf_cache_line_t *)ocf_metadata_raw_rd_access(cache,
+			&(ctrl->raw_desc[metadata_segment_hash]), index);
 }
 
 /*
@@ -2401,15 +2394,11 @@ ocf_cache_line_t ocf_metadata_get_hash(struct ocf_cache *cache,
 void ocf_metadata_set_hash(struct ocf_cache *cache, ocf_cache_line_t index,
 		ocf_cache_line_t line)
 {
-	int result = 0;
 	struct ocf_metadata_hash_ctrl *ctrl
 		= (struct ocf_metadata_hash_ctrl *) cache->metadata.priv;
 
-	result = ocf_metadata_raw_set(cache,
-			&(ctrl->raw_desc[metadata_segment_hash]), index, &line);
-
-	if (result)
-		ocf_metadata_error(cache);
+	*(ocf_cache_line_t *)ocf_metadata_raw_wr_access(cache,
+			&(ctrl->raw_desc[metadata_segment_hash]), index) = line;
 }
 
 /*******************************************************************************
diff --git a/src/metadata/metadata_raw.c b/src/metadata/metadata_raw.c
index 4c17078..052ffeb 100644
--- a/src/metadata/metadata_raw.c
+++ b/src/metadata/metadata_raw.c
@@ -164,17 +164,6 @@ uint32_t _raw_ram_page(struct ocf_metadata_raw *raw, uint32_t entry)
 	return _RAW_RAM_PAGE(raw, entry);
 }
 
-/*
- * RAM Implementation - Get entry
- */
-static int _raw_ram_get(ocf_cache_t cache, struct ocf_metadata_raw *raw,
-		uint32_t entry, void *data)
-{
-	ENV_BUG_ON(!_raw_is_valid(raw, entry));
-
-	return _RAW_RAM_GET(raw, entry, data);
-}
-
 /*
  * RAM Implementation - Read only entry access
  */
@@ -186,17 +175,6 @@ static void *_raw_ram_access(ocf_cache_t cache,
 	return _RAW_RAM_ADDR(raw, entry);
 }
 
-/*
- * RAM Implementation - Set Entry
- */
-static int _raw_ram_set(ocf_cache_t cache, struct ocf_metadata_raw *raw,
-		uint32_t entry, void *data)
-{
-	ENV_BUG_ON(!_raw_is_valid(raw, entry));
-
-	return _RAW_RAM_SET(raw, entry, data);
-}
-
 struct _raw_ram_load_all_context {
 	struct ocf_metadata_raw *raw;
 	ocf_metadata_end_t cmpl;
@@ -568,8 +546,6 @@ static const struct raw_iface IRAW[metadata_raw_type_max] = {
 		.size_on_ssd		= _raw_ram_size_on_ssd,
 		.checksum		= _raw_ram_checksum,
 		.page			= _raw_ram_page,
-		.get			= _raw_ram_get,
-		.set			= _raw_ram_set,
 		.access			= _raw_ram_access,
 		.load_all		= _raw_ram_load_all,
 		.flush_all		= _raw_ram_flush_all,
@@ -583,8 +559,6 @@ static const struct raw_iface IRAW[metadata_raw_type_max] = {
 		.size_on_ssd		= raw_dynamic_size_on_ssd,
 		.checksum		= raw_dynamic_checksum,
 		.page			= raw_dynamic_page,
-		.get			= raw_dynamic_get,
-		.set			= raw_dynamic_set,
 		.access			= raw_dynamic_access,
 		.load_all		= raw_dynamic_load_all,
 		.flush_all		= raw_dynamic_flush_all,
@@ -598,8 +572,6 @@ static const struct raw_iface IRAW[metadata_raw_type_max] = {
 		.size_on_ssd		= raw_volatile_size_on_ssd,
 		.checksum		= raw_volatile_checksum,
 		.page			= _raw_ram_page,
-		.get			= _raw_ram_get,
-		.set			= _raw_ram_set,
 		.access			= _raw_ram_access,
 		.load_all		= raw_volatile_load_all,
 		.flush_all		= raw_volatile_flush_all,
@@ -613,8 +585,6 @@ static const struct raw_iface IRAW[metadata_raw_type_max] = {
 		.size_on_ssd		= _raw_ram_size_on_ssd,
 		.checksum		= _raw_ram_checksum,
 		.page			= _raw_ram_page,
-		.get			= _raw_ram_get,
-		.set			= _raw_ram_set,
 		.access			= _raw_ram_access,
 		.load_all		= _raw_ram_load_all,
 		.flush_all		= _raw_ram_flush_all,
diff --git a/src/metadata/metadata_raw.h b/src/metadata/metadata_raw.h
index 1f44409..1a26602 100644
--- a/src/metadata/metadata_raw.h
+++ b/src/metadata/metadata_raw.h
@@ -117,12 +117,6 @@ struct raw_iface {
 
 	uint32_t (*page)(struct ocf_metadata_raw *raw, uint32_t entry);
 
-	int (*get)(ocf_cache_t cache, struct ocf_metadata_raw *raw,
-			uint32_t entry, void *data);
-
-	int (*set)(ocf_cache_t cache, struct ocf_metadata_raw *raw,
-			uint32_t entry, void *data);
-
 	void* (*access)(ocf_cache_t cache, struct ocf_metadata_raw *raw,
 			uint32_t entry);
 
@@ -214,21 +208,6 @@ static inline uint32_t ocf_metadata_raw_page(struct ocf_metadata_raw* raw,
 	return raw->iface->page(raw, entry);
 }
 
-/**
- * @brief Get specified element of metadata
- *
- * @param cache - Cache instance
- * @param raw - RAW descriptor
- * @param entry - Entry to be get
- * @param data - Data where metadata entry will be copied into
- * @return 0 - Operation success, otherwise error
- */
-static inline int ocf_metadata_raw_get(ocf_cache_t cache,
-		struct ocf_metadata_raw *raw, uint32_t entry, void *data)
-{
-	return raw->iface->get(cache, raw, entry, data);
-}
-
 /**
  * @brief Access specified element of metadata directly
  *
@@ -259,21 +238,6 @@ static inline const void *ocf_metadata_raw_rd_access( ocf_cache_t cache,
 	return raw->iface->access(cache, raw, entry);
 }
 
-/**
- * @brief Set specified element of metadata
- *
- * @param cache - Cache instance
- * @param raw - RAW descriptor
- * @param entry - Entry to be set
- * @param data - Data taht will be copied into metadata entry
- * @return 0 - Operation success, otherwise error
- */
-static inline int ocf_metadata_raw_set(ocf_cache_t cache,
-		struct ocf_metadata_raw *raw, uint32_t entry, void *data)
-{
-	return raw->iface->set(cache, raw, entry, data);
-}
-
 /**
  * @brief Load all entries from SSD cache (cahce cache)
  *
diff --git a/src/metadata/metadata_raw_dynamic.c b/src/metadata/metadata_raw_dynamic.c
index a297b63..a034d76 100644
--- a/src/metadata/metadata_raw_dynamic.c
+++ b/src/metadata/metadata_raw_dynamic.c
@@ -234,39 +234,6 @@ uint32_t raw_dynamic_page(struct ocf_metadata_raw *raw, uint32_t entry)
 	return _RAW_DYNAMIC_PAGE(raw, entry);
 }
 
-/*
-* RAM DYNAMIC Implementation - Get
-*/
-int raw_dynamic_get(ocf_cache_t cache, struct ocf_metadata_raw *raw,
-		uint32_t entry, void *data)
-{
-	void *item = _raw_dynamic_get_item(cache, raw, entry);
-
-	if (!item) {
-		ENV_BUG_ON(env_memset(data, raw->entry_size, 0));
-		ocf_metadata_error(cache);
-		return -1;
-	}
-
-	return env_memcpy(data, raw->entry_size, item, raw->entry_size);
-}
-
-/*
-* RAM DYNAMIC Implementation - Set
-*/
-int raw_dynamic_set(ocf_cache_t cache, struct ocf_metadata_raw *raw,
-		uint32_t entry, void *data)
-{
-	void *item = _raw_dynamic_get_item(cache, raw, entry);
-
-	if (!item) {
-		ocf_metadata_error(cache);
-		return -1;
-	}
-
-	return env_memcpy(item, raw->entry_size, data, raw->entry_size);
-}
-
 /*
 * RAM DYNAMIC Implementation - access
 */
diff --git a/src/metadata/metadata_raw_dynamic.h b/src/metadata/metadata_raw_dynamic.h
index 6a19445..4c6b7cf 100644
--- a/src/metadata/metadata_raw_dynamic.h
+++ b/src/metadata/metadata_raw_dynamic.h
@@ -47,18 +47,6 @@ uint32_t raw_dynamic_checksum(ocf_cache_t cache,
  */
 uint32_t raw_dynamic_page(struct ocf_metadata_raw *raw, uint32_t entry);
 
-/*
- * RAW DYNAMIC - Get specified entry
- */
-int raw_dynamic_get(ocf_cache_t cache, struct ocf_metadata_raw *raw,
-		uint32_t entry, void *data);
-
-/*
- * RAW DYNAMIC - Set specified entry
- */
-int raw_dynamic_set(ocf_cache_t cache, struct ocf_metadata_raw *raw,
-		uint32_t entry, void *data);
-
 /*
  * RAW DYNAMIC - Write access for specified entry
  */

From 18e35c390b8a43a73b6f0d3e95135f2c8929b7a7 Mon Sep 17 00:00:00 2001
From: Adam Rutkowski <adam.j.rutkowski@intel.com>
Date: Mon, 23 Nov 2020 22:23:28 -0600
Subject: [PATCH 09/13] Remove last references to "hash" metadata
 implementation

Hashed metadata is now default and only implemetation.

Signed-off-by: Adam Rutkowski <adam.j.rutkowski@intel.com>
---
 src/metadata/metadata_bit.h  |  24 +-
 src/metadata/metadata_hash.c | 444 +++++++++++++++++------------------
 2 files changed, 234 insertions(+), 234 deletions(-)

diff --git a/src/metadata/metadata_bit.h b/src/metadata/metadata_bit.h
index 1cba47b..f94c4c8 100644
--- a/src/metadata/metadata_bit.h
+++ b/src/metadata/metadata_bit.h
@@ -57,8 +57,8 @@ static bool _ocf_metadata_test_##what##_##type(struct ocf_cache *cache, \
 { \
 	type mask = _get_mask_##type(start, stop); \
 \
-	struct ocf_metadata_hash_ctrl *ctrl = \
-		(struct ocf_metadata_hash_ctrl *) cache->metadata.priv; \
+	struct ocf_metadata_ctrl *ctrl = \
+		(struct ocf_metadata_ctrl *) cache->metadata.priv; \
 \
 	struct ocf_metadata_raw *raw = \
 			&ctrl->raw_desc[metadata_segment_collision]; \
@@ -87,8 +87,8 @@ static bool _ocf_metadata_test_out_##what##_##type(struct ocf_cache *cache, \
 { \
 	type mask = _get_mask_##type(start, stop); \
 \
-	struct ocf_metadata_hash_ctrl *ctrl = \
-		(struct ocf_metadata_hash_ctrl *) cache->metadata.priv; \
+	struct ocf_metadata_ctrl *ctrl = \
+		(struct ocf_metadata_ctrl *) cache->metadata.priv; \
 \
 	struct ocf_metadata_raw *raw = \
 			&ctrl->raw_desc[metadata_segment_collision]; \
@@ -109,8 +109,8 @@ static bool _ocf_metadata_clear_##what##_##type(struct ocf_cache *cache, \
 { \
 	type mask = _get_mask_##type(start, stop); \
 \
-	struct ocf_metadata_hash_ctrl *ctrl = \
-		(struct ocf_metadata_hash_ctrl *) cache->metadata.priv; \
+	struct ocf_metadata_ctrl *ctrl = \
+		(struct ocf_metadata_ctrl *) cache->metadata.priv; \
 \
 	struct ocf_metadata_raw *raw = \
 			&ctrl->raw_desc[metadata_segment_collision]; \
@@ -134,8 +134,8 @@ static bool _ocf_metadata_set_##what##_##type(struct ocf_cache *cache, \
 	bool result; \
 	type mask = _get_mask_##type(start, stop); \
 \
-	struct ocf_metadata_hash_ctrl *ctrl = \
-		(struct ocf_metadata_hash_ctrl *) cache->metadata.priv; \
+	struct ocf_metadata_ctrl *ctrl = \
+		(struct ocf_metadata_ctrl *) cache->metadata.priv; \
 \
 	struct ocf_metadata_raw *raw = \
 			&ctrl->raw_desc[metadata_segment_collision]; \
@@ -158,8 +158,8 @@ static bool _ocf_metadata_test_and_set_##what##_##type( \
 	bool test; \
 	type mask = _get_mask_##type(start, stop); \
 \
-	struct ocf_metadata_hash_ctrl *ctrl = \
-		(struct ocf_metadata_hash_ctrl *) cache->metadata.priv; \
+	struct ocf_metadata_ctrl *ctrl = \
+		(struct ocf_metadata_ctrl *) cache->metadata.priv; \
 \
 	struct ocf_metadata_raw *raw = \
 			&ctrl->raw_desc[metadata_segment_collision]; \
@@ -193,8 +193,8 @@ static bool _ocf_metadata_test_and_clear_##what##_##type( \
 	bool test; \
 	type mask = _get_mask_##type(start, stop); \
 \
-	struct ocf_metadata_hash_ctrl *ctrl = \
-		(struct ocf_metadata_hash_ctrl *) cache->metadata.priv; \
+	struct ocf_metadata_ctrl *ctrl = \
+		(struct ocf_metadata_ctrl *) cache->metadata.priv; \
 \
 	struct ocf_metadata_raw *raw = \
 			&ctrl->raw_desc[metadata_segment_collision]; \
diff --git a/src/metadata/metadata_hash.c b/src/metadata/metadata_hash.c
index 3219105..872e04d 100644
--- a/src/metadata/metadata_hash.c
+++ b/src/metadata/metadata_hash.c
@@ -56,7 +56,7 @@ static inline size_t ocf_metadata_status_sizeof(
 /*
  * Hash metadata control structure
  */
-struct ocf_metadata_hash_ctrl {
+struct ocf_metadata_ctrl {
 	ocf_cache_line_t cachelines;
 	ocf_cache_line_t start_page;
 	ocf_cache_line_t count_pages;
@@ -68,7 +68,7 @@ struct ocf_metadata_hash_ctrl {
 /*
  * get entries for specified metadata hash type
  */
-static ocf_cache_line_t ocf_metadata_hash_get_entries(
+static ocf_cache_line_t ocf_metadata_get_entries(
 		enum ocf_metadata_segment type,
 		ocf_cache_line_t cache_lines)
 {
@@ -121,7 +121,7 @@ static ocf_cache_line_t ocf_metadata_hash_get_entries(
 /*
  * Get size of particular hash metadata type element
  */
-static int64_t ocf_metadata_hash_get_element_size(
+static int64_t ocf_metadata_get_element_size(
 		enum ocf_metadata_segment type,
 		const struct ocf_cache_line_settings *settings)
 {
@@ -202,7 +202,7 @@ static int64_t ocf_metadata_hash_get_element_size(
  * @return true - Accept unused sapce
  * @return false - unused space is not acceptable
  */
-static bool ocf_metadata_hash_calculate_exception_hndl(ocf_cache_t cache,
+static bool ocf_metadata_calculate_exception_hndl(ocf_cache_t cache,
 		int64_t unused_lines, int64_t device_lines)
 {
 	static bool warn;
@@ -232,9 +232,9 @@ static bool ocf_metadata_hash_calculate_exception_hndl(ocf_cache_t cache,
  * Algorithm to calculate amount of cache lines taking into account required
  * space for metadata
  */
-static int ocf_metadata_hash_calculate_metadata_size(
+static int ocf_metadata_calculate_metadata_size(
 		struct ocf_cache *cache,
-		struct ocf_metadata_hash_ctrl *ctrl,
+		struct ocf_metadata_ctrl *ctrl,
 		const struct ocf_cache_line_settings *settings)
 {
 	int64_t i_diff = 0, diff_lines = 0, cache_lines = ctrl->device_lines;
@@ -254,7 +254,7 @@ static int ocf_metadata_hash_calculate_metadata_size(
 
 			/* Setup number of entries */
 			raw->entries
-				= ocf_metadata_hash_get_entries(i, cache_lines);
+				= ocf_metadata_get_entries(i, cache_lines);
 
 			/*
 			 * Setup SSD location and size
@@ -274,7 +274,7 @@ static int ocf_metadata_hash_calculate_metadata_size(
 			/*
 			 * Never should be here but try handle this exception
 			 */
-			if (ocf_metadata_hash_calculate_exception_hndl(cache,
+			if (ocf_metadata_calculate_exception_hndl(cache,
 					diff_lines, ctrl->device_lines)) {
 				break;
 			}
@@ -327,7 +327,7 @@ static int ocf_metadata_hash_calculate_metadata_size(
 	return 0;
 }
 
-static const char * const ocf_metadata_hash_raw_names[] = {
+static const char * const ocf_metadata_segment_names[] = {
 		[metadata_segment_sb_config]		= "Super block config",
 		[metadata_segment_sb_runtime]		= "Super block runtime",
 		[metadata_segment_reserved]		= "Reserved",
@@ -346,8 +346,8 @@ static const char * const ocf_metadata_hash_raw_names[] = {
 /*
  * Debug info functions prints metadata and raw containers information
  */
-static void ocf_metadata_hash_raw_info(struct ocf_cache *cache,
-		struct ocf_metadata_hash_ctrl *ctrl)
+static void ocf_metadata_raw_info(struct ocf_cache *cache,
+		struct ocf_metadata_ctrl *ctrl)
 {
 	uint64_t capacity = 0;
 	uint64_t capacity_sum = 0;
@@ -358,7 +358,7 @@ static void ocf_metadata_hash_raw_info(struct ocf_cache *cache,
 		struct ocf_metadata_raw *raw = &(ctrl->raw_desc[i]);
 
 		OCF_DEBUG_PARAM(cache, "Raw : name            = %s",
-				ocf_metadata_hash_raw_names[i]);
+				ocf_metadata_segment_names[i]);
 		OCF_DEBUG_PARAM(cache, "    : metadata type   = %u", i);
 		OCF_DEBUG_PARAM(cache, "    : raw type        = %u",
 				raw->raw_type);
@@ -391,11 +391,11 @@ static void ocf_metadata_hash_raw_info(struct ocf_cache *cache,
 		}
 
 		OCF_DEBUG_PARAM(cache, "%s capacity %llu %s",
-			ocf_metadata_hash_raw_names[i], capacity, unit);
+			ocf_metadata_segment_names[i], capacity, unit);
 	}
 }
 #else
-#define ocf_metadata_hash_raw_info(cache, ctrl)
+#define ocf_metadata_raw_info(cache, ctrl)
 #endif
 
 /*
@@ -407,7 +407,7 @@ void ocf_metadata_deinit_variable_size(struct ocf_cache *cache)
 	int result = 0;
 	uint32_t i = 0;
 
-	struct ocf_metadata_hash_ctrl *ctrl = (struct ocf_metadata_hash_ctrl *)
+	struct ocf_metadata_ctrl *ctrl = (struct ocf_metadata_ctrl *)
 			cache->metadata.priv;
 
 	OCF_DEBUG_TRACE(cache);
@@ -447,7 +447,7 @@ void ocf_metadata_deinit_fixed_size(struct ocf_cache *cache)
 	int result = 0;
 	uint32_t i;
 
-	struct ocf_metadata_hash_ctrl *ctrl = (struct ocf_metadata_hash_ctrl *)
+	struct ocf_metadata_ctrl *ctrl = (struct ocf_metadata_ctrl *)
 			cache->metadata.priv;
 
 	for (i = 0; i < metadata_segment_fixed_size_max; i++) {
@@ -462,10 +462,10 @@ void ocf_metadata_deinit_fixed_size(struct ocf_cache *cache)
 		ENV_BUG();
 }
 
-static struct ocf_metadata_hash_ctrl *ocf_metadata_hash_ctrl_init(
+static struct ocf_metadata_ctrl *ocf_metadata_ctrl_init(
 		bool metadata_volatile)
 {
-	struct ocf_metadata_hash_ctrl *ctrl = NULL;
+	struct ocf_metadata_ctrl *ctrl = NULL;
 	uint32_t page = 0;
 	uint32_t i = 0;
 
@@ -490,11 +490,11 @@ static struct ocf_metadata_hash_ctrl *ocf_metadata_hash_ctrl_init(
 
 		/* Entry size configuration */
 		raw->entry_size
-			= ocf_metadata_hash_get_element_size(i, NULL);
+			= ocf_metadata_get_element_size(i, NULL);
 		raw->entries_in_page = PAGE_SIZE / raw->entry_size;
 
 		/* Setup number of entries */
-		raw->entries = ocf_metadata_hash_get_entries(i, 0);
+		raw->entries = ocf_metadata_get_entries(i, 0);
 
 		/*
 		 * Setup SSD location and size
@@ -515,7 +515,7 @@ static struct ocf_metadata_hash_ctrl *ocf_metadata_hash_ctrl_init(
 int ocf_metadata_init_fixed_size(struct ocf_cache *cache,
 		ocf_cache_line_size_t cache_line_size)
 {
-	struct ocf_metadata_hash_ctrl *ctrl = NULL;
+	struct ocf_metadata_ctrl *ctrl = NULL;
 	struct ocf_metadata *metadata = &cache->metadata;
 	struct ocf_cache_line_settings *settings =
 		(struct ocf_cache_line_settings *)&metadata->settings;
@@ -534,7 +534,7 @@ int ocf_metadata_init_fixed_size(struct ocf_cache *cache,
 
 	ocf_metadata_config_init(cache, settings, cache_line_size);
 
-	ctrl = ocf_metadata_hash_ctrl_init(metadata->is_volatile);
+	ctrl = ocf_metadata_ctrl_init(metadata->is_volatile);
 	if (!ctrl)
 		return -OCF_ERR_NO_MEM;
 	metadata->priv = ctrl;
@@ -615,7 +615,7 @@ struct query_cores_context
 };
 
 /* copy next metadata entry from data to memory buffer */
-static void ocf_metadata_hash_query_cores_data_read(ocf_ctx_t ctx,
+static void ocf_metadata_query_cores_data_read(ocf_ctx_t ctx,
 		struct query_cores_data *data,
 		void *buf, uint32_t size)
 {
@@ -666,7 +666,7 @@ static void ocf_metadata_query_cores_end(struct query_cores_context *context,
 
 	/* read valid cores from core config segment */
 	for (i = 0; i < OCF_CORE_MAX; i++) {
-		ocf_metadata_hash_query_cores_data_read(ctx,
+		ocf_metadata_query_cores_data_read(ctx,
 				&context->data.core_config,
 				&core_config, sizeof(core_config));
 		if (core_config.valid) {
@@ -679,7 +679,7 @@ static void ocf_metadata_query_cores_end(struct query_cores_context *context,
 	out_cores = OCF_MIN(core_count, context->params.uuids_count);
 	for (i = 0, core_idx = 0; i < OCF_CORE_MAX && core_idx < out_cores;
 			i++) {
-		ocf_metadata_hash_query_cores_data_read(ctx,
+		ocf_metadata_query_cores_data_read(ctx,
 				&context->data.core_uuids,
 				muuid, sizeof(*muuid));
 
@@ -767,7 +767,7 @@ int ocf_metadata_query_cores_segment_io(
 		ocf_ctx_t owner,
 		ocf_volume_t volume,
 		enum ocf_metadata_segment segment,
-		struct ocf_metadata_hash_ctrl *ctrl,
+		struct ocf_metadata_ctrl *ctrl,
 		struct query_cores_data *segment_data)
 {
 	uint32_t pages_left;
@@ -829,7 +829,7 @@ void ocf_metadata_query_cores(ocf_ctx_t owner, ocf_volume_t volume,
 		struct ocf_volume_uuid *uuid, uint32_t count,
 		ocf_metadata_query_cores_end_t cmpl, void *priv)
 {
-	struct ocf_metadata_hash_ctrl *ctrl = NULL;
+	struct ocf_metadata_ctrl *ctrl = NULL;
 	struct query_cores_context *context;
 	int err;
 
@@ -849,7 +849,7 @@ void ocf_metadata_query_cores(ocf_ctx_t owner, ocf_volume_t volume,
 	context->params.uuids_count = count;
 	env_atomic_set(&context->count, 1);
 
-	ctrl = ocf_metadata_hash_ctrl_init(false);
+	ctrl = ocf_metadata_ctrl_init(false);
 	if (!ctrl) {
 		err = -OCF_ERR_NO_MEM;
 		goto exit;
@@ -880,7 +880,7 @@ exit:
 	ocf_metadata_query_cores_end(context, err);
 }
 
-static void ocf_metadata_hash_flush_lock_collision_page(struct ocf_cache *cache,
+static void ocf_metadata_flush_lock_collision_page(struct ocf_cache *cache,
 		struct ocf_metadata_raw *raw, uint32_t page)
 
 {
@@ -888,7 +888,7 @@ static void ocf_metadata_hash_flush_lock_collision_page(struct ocf_cache *cache,
 			page);
 }
 
-static void ocf_metadata_hash_flush_unlock_collision_page(
+static void ocf_metadata_flush_unlock_collision_page(
 		struct ocf_cache *cache, struct ocf_metadata_raw *raw,
 		uint32_t page)
 
@@ -918,7 +918,7 @@ int ocf_metadata_init_variable_size(struct ocf_cache *cache,
 	int result = 0;
 	uint32_t i = 0;
 	ocf_cache_line_t line;
-	struct ocf_metadata_hash_ctrl *ctrl = NULL;
+	struct ocf_metadata_ctrl *ctrl = NULL;
 	struct ocf_cache_line_settings *settings =
 		(struct ocf_cache_line_settings *)&cache->metadata.settings;
 	ocf_flush_page_synch_t lock_page, unlock_page;
@@ -969,11 +969,11 @@ int ocf_metadata_init_variable_size(struct ocf_cache *cache,
 
 		/* Entry size configuration */
 		raw->entry_size
-			= ocf_metadata_hash_get_element_size(i, settings);
+			= ocf_metadata_get_element_size(i, settings);
 		raw->entries_in_page = PAGE_SIZE / raw->entry_size;
 	}
 
-	if (0 != ocf_metadata_hash_calculate_metadata_size(cache, ctrl,
+	if (0 != ocf_metadata_calculate_metadata_size(cache, ctrl,
 			settings)) {
 		return -1;
 	}
@@ -990,9 +990,9 @@ int ocf_metadata_init_variable_size(struct ocf_cache *cache,
 			i < metadata_segment_max; i++) {
 		if (i == metadata_segment_collision) {
 			lock_page =
-				ocf_metadata_hash_flush_lock_collision_page;
+				ocf_metadata_flush_lock_collision_page;
 			unlock_page =
-				ocf_metadata_hash_flush_unlock_collision_page;
+				ocf_metadata_flush_unlock_collision_page;
 		} else {
 			lock_page = unlock_page = NULL;
 		}
@@ -1006,22 +1006,22 @@ int ocf_metadata_init_variable_size(struct ocf_cache *cache,
 
 	for (i = 0; i < metadata_segment_max; i++) {
 		ocf_cache_log(cache, log_info, "%s offset : %llu kiB\n",
-				ocf_metadata_hash_raw_names[i],
+				ocf_metadata_segment_names[i],
 				ctrl->raw_desc[i].ssd_pages_offset
 				* PAGE_SIZE / KiB);
 		if (i == metadata_segment_sb_config) {
 			ocf_cache_log(cache, log_info, "%s size : %lu B\n",
-				ocf_metadata_hash_raw_names[i],
+				ocf_metadata_segment_names[i],
 				offsetof(struct ocf_superblock_config, checksum)
 				+ sizeof(((struct ocf_superblock_config *)0)
 						->checksum));
 		} else if (i == metadata_segment_sb_runtime) {
 			ocf_cache_log(cache, log_info, "%s size : %lu B\n",
-				ocf_metadata_hash_raw_names[i],
+				ocf_metadata_segment_names[i],
 				sizeof(struct ocf_superblock_runtime));
 		} else {
 			ocf_cache_log(cache, log_info, "%s size : %llu kiB\n",
-					ocf_metadata_hash_raw_names[i],
+					ocf_metadata_segment_names[i],
 					ctrl->raw_desc[i].ssd_pages
 					* PAGE_SIZE / KiB);
 		}
@@ -1049,7 +1049,7 @@ finalize:
 	cache->conf_meta->cachelines = ctrl->cachelines;
 	cache->conf_meta->line_size = cache_line_size;
 
-	ocf_metadata_hash_raw_info(cache, ctrl);
+	ocf_metadata_raw_info(cache, ctrl);
 
 	ocf_cache_log(cache, log_info, "Cache line size: %llu kiB\n",
 			settings->size / KiB);
@@ -1145,11 +1145,11 @@ void ocf_metadata_init_hash_table(struct ocf_cache *cache)
  */
 ocf_cache_line_t ocf_metadata_get_pages_count(struct ocf_cache *cache)
 {
-	struct ocf_metadata_hash_ctrl *ctrl = NULL;
+	struct ocf_metadata_ctrl *ctrl = NULL;
 
 	OCF_DEBUG_TRACE(cache);
 
-	ctrl = (struct ocf_metadata_hash_ctrl *) cache->metadata.priv;
+	ctrl = (struct ocf_metadata_ctrl *) cache->metadata.priv;
 
 	return ctrl->count_pages;
 }
@@ -1160,11 +1160,11 @@ ocf_cache_line_t ocf_metadata_get_pages_count(struct ocf_cache *cache)
 ocf_cache_line_t ocf_metadata_get_cachelines_count(
 		struct ocf_cache *cache)
 {
-	struct ocf_metadata_hash_ctrl *ctrl = NULL;
+	struct ocf_metadata_ctrl *ctrl = NULL;
 
 	OCF_DEBUG_TRACE(cache);
 
-	ctrl = (struct ocf_metadata_hash_ctrl *) cache->metadata.priv;
+	ctrl = (struct ocf_metadata_ctrl *) cache->metadata.priv;
 
 	return ctrl->cachelines;
 }
@@ -1173,11 +1173,11 @@ size_t ocf_metadata_size_of(struct ocf_cache *cache)
 {
 	uint32_t i = 0;
 	size_t size = 0;
-	struct ocf_metadata_hash_ctrl *ctrl = NULL;
+	struct ocf_metadata_ctrl *ctrl = NULL;
 
 	OCF_DEBUG_TRACE(cache);
 
-	ctrl = (struct ocf_metadata_hash_ctrl *) cache->metadata.priv;
+	ctrl = (struct ocf_metadata_ctrl *) cache->metadata.priv;
 
 	/*
 	 * Get size of all RAW metadata container
@@ -1199,7 +1199,7 @@ size_t ocf_metadata_size_of(struct ocf_cache *cache)
  * Super Block
  ******************************************************************************/
 
-struct ocf_metadata_hash_context {
+struct ocf_metadata_context {
 	ocf_metadata_end_t cmpl;
 	void *priv;
 	ocf_pipeline_t pipeline;
@@ -1207,9 +1207,9 @@ struct ocf_metadata_hash_context {
 	struct ocf_metadata_raw segment_copy[metadata_segment_fixed_size_max];
 };
 
-static void ocf_metadata_hash_generic_complete(void *priv, int error)
+static void ocf_metadata_generic_complete(void *priv, int error)
 {
-	struct ocf_metadata_hash_context *context = priv;
+	struct ocf_metadata_context *context = priv;
 
 	OCF_PL_NEXT_ON_SUCCESS_RET(context->pipeline, error);
 }
@@ -1217,27 +1217,27 @@ static void ocf_metadata_hash_generic_complete(void *priv, int error)
 static void ocf_medatata_hash_load_segment(ocf_pipeline_t pipeline,
 		void *priv, ocf_pipeline_arg_t arg)
 {
-	struct ocf_metadata_hash_context *context = priv;
+	struct ocf_metadata_context *context = priv;
 	int segment = ocf_pipeline_arg_get_int(arg);
-	struct ocf_metadata_hash_ctrl *ctrl;
+	struct ocf_metadata_ctrl *ctrl;
 	ocf_cache_t cache = context->cache;
 
-	ctrl = (struct ocf_metadata_hash_ctrl *)cache->metadata.priv;
+	ctrl = (struct ocf_metadata_ctrl *)cache->metadata.priv;
 
 	ocf_metadata_raw_load_all(cache, &ctrl->raw_desc[segment],
-			ocf_metadata_hash_generic_complete, context);
+			ocf_metadata_generic_complete, context);
 }
 
 static void ocf_medatata_hash_store_segment(ocf_pipeline_t pipeline,
 		void *priv, ocf_pipeline_arg_t arg)
 {
-	struct ocf_metadata_hash_context *context = priv;
+	struct ocf_metadata_context *context = priv;
 	int segment = ocf_pipeline_arg_get_int(arg);
-	struct ocf_metadata_hash_ctrl *ctrl;
+	struct ocf_metadata_ctrl *ctrl;
 	ocf_cache_t cache = context->cache;
 	int error;
 
-	ctrl = (struct ocf_metadata_hash_ctrl *)cache->metadata.priv;
+	ctrl = (struct ocf_metadata_ctrl *)cache->metadata.priv;
 
 	context->segment_copy[segment].mem_pool =
 		env_malloc(ctrl->raw_desc[segment].mem_pool_limit, ENV_MEM_NORMAL);
@@ -1259,14 +1259,14 @@ static void ocf_medatata_hash_store_segment(ocf_pipeline_t pipeline,
 static void ocf_medatata_hash_check_crc_sb_config(ocf_pipeline_t pipeline,
 		void *priv, ocf_pipeline_arg_t arg)
 {
-	struct ocf_metadata_hash_context *context = priv;
-	struct ocf_metadata_hash_ctrl *ctrl;
+	struct ocf_metadata_context *context = priv;
+	struct ocf_metadata_ctrl *ctrl;
 	struct ocf_superblock_config *sb_config;
 	ocf_cache_t cache = context->cache;
 	int segment = metadata_segment_sb_config;
 	uint32_t crc;
 
-	ctrl = (struct ocf_metadata_hash_ctrl *)cache->metadata.priv;
+	ctrl = (struct ocf_metadata_ctrl *)cache->metadata.priv;
 	sb_config = METADATA_MEM_POOL(ctrl, metadata_segment_sb_config);
 
 	crc = env_crc32(0, (void *)sb_config,
@@ -1276,7 +1276,7 @@ static void ocf_medatata_hash_check_crc_sb_config(ocf_pipeline_t pipeline,
 		/* Checksum does not match */
 		ocf_cache_log(cache, log_err,
 				"Loading %s ERROR, invalid checksum",
-				ocf_metadata_hash_raw_names[segment]);
+				ocf_metadata_segment_names[segment]);
 		OCF_PL_FINISH_RET(pipeline, -OCF_ERR_INVAL);
 	}
 
@@ -1286,14 +1286,14 @@ static void ocf_medatata_hash_check_crc_sb_config(ocf_pipeline_t pipeline,
 static void ocf_medatata_hash_check_crc_skip(ocf_pipeline_t pipeline,
 		void *priv, ocf_pipeline_arg_t arg, bool skip_on_dirty_shutdown)
 {
-	struct ocf_metadata_hash_context *context = priv;
+	struct ocf_metadata_context *context = priv;
 	int segment = ocf_pipeline_arg_get_int(arg);
-	struct ocf_metadata_hash_ctrl *ctrl;
+	struct ocf_metadata_ctrl *ctrl;
 	struct ocf_superblock_config *sb_config;
 	ocf_cache_t cache = context->cache;
 	uint32_t crc;
 
-	ctrl = (struct ocf_metadata_hash_ctrl *)cache->metadata.priv;
+	ctrl = (struct ocf_metadata_ctrl *)cache->metadata.priv;
 	sb_config = METADATA_MEM_POOL(ctrl, metadata_segment_sb_config);
 
 	if (!sb_config->clean_shutdown && skip_on_dirty_shutdown)
@@ -1306,11 +1306,11 @@ static void ocf_medatata_hash_check_crc_skip(ocf_pipeline_t pipeline,
 		if (!sb_config->clean_shutdown) {
 			ocf_cache_log(cache, log_warn,
 					"Loading %s WARNING, invalid checksum",
-					ocf_metadata_hash_raw_names[segment]);
+					ocf_metadata_segment_names[segment]);
 		} else {
 			ocf_cache_log(cache, log_err,
 					"Loading %s ERROR, invalid checksum",
-					ocf_metadata_hash_raw_names[segment]);
+					ocf_metadata_segment_names[segment]);
 			OCF_PL_FINISH_RET(pipeline, -OCF_ERR_INVAL);
 		}
 	}
@@ -1333,8 +1333,8 @@ static void ocf_medatata_hash_check_crc_if_clean(ocf_pipeline_t pipeline,
 static void ocf_medatata_hash_load_superblock_post(ocf_pipeline_t pipeline,
 		void *priv, ocf_pipeline_arg_t arg)
 {
-	struct ocf_metadata_hash_context *context = priv;
-	struct ocf_metadata_hash_ctrl *ctrl;
+	struct ocf_metadata_context *context = priv;
+	struct ocf_metadata_ctrl *ctrl;
 	struct ocf_superblock_config *sb_config;
 	ocf_cache_t cache = context->cache;
 	struct ocf_metadata_uuid *muuid;
@@ -1343,7 +1343,7 @@ static void ocf_medatata_hash_load_superblock_post(ocf_pipeline_t pipeline,
 	ocf_core_t core;
 	ocf_core_id_t core_id;
 
-	ctrl = (struct ocf_metadata_hash_ctrl *)cache->metadata.priv;
+	ctrl = (struct ocf_metadata_ctrl *)cache->metadata.priv;
 	sb_config = METADATA_MEM_POOL(ctrl, metadata_segment_sb_config);
 
 	for_each_core_metadata(cache, core, core_id) {
@@ -1376,14 +1376,14 @@ static void ocf_medatata_hash_load_superblock_post(ocf_pipeline_t pipeline,
 	ocf_pipeline_next(pipeline);
 }
 
-static void ocf_metadata_hash_load_sb_restore(
-		struct ocf_metadata_hash_context *context)
+static void ocf_metadata_load_sb_restore(
+		struct ocf_metadata_context *context)
 {
 	ocf_cache_t cache = context->cache;
-	struct ocf_metadata_hash_ctrl *ctrl;
+	struct ocf_metadata_ctrl *ctrl;
 	int segment, error;
 
-	ctrl = (struct ocf_metadata_hash_ctrl *)cache->metadata.priv;
+	ctrl = (struct ocf_metadata_ctrl *)cache->metadata.priv;
 
 	for (segment = metadata_segment_sb_config;
 			segment < metadata_segment_fixed_size_max; segment++) {
@@ -1401,14 +1401,14 @@ static void ocf_metadata_hash_load_sb_restore(
 static void ocf_metadata_load_superblock_finish(ocf_pipeline_t pipeline,
 		void *priv, int error)
 {
-	struct ocf_metadata_hash_context *context = priv;
+	struct ocf_metadata_context *context = priv;
 	ocf_cache_t cache = context->cache;
 	int segment;
 
 	if (error) {
 		ocf_cache_log(cache, log_err, "Metadata read FAILURE\n");
 		ocf_metadata_error(cache);
-		ocf_metadata_hash_load_sb_restore(context);
+		ocf_metadata_load_sb_restore(context);
 	}
 
 	for (segment = metadata_segment_sb_config;
@@ -1421,7 +1421,7 @@ static void ocf_metadata_load_superblock_finish(ocf_pipeline_t pipeline,
 	ocf_pipeline_destroy(pipeline);
 }
 
-struct ocf_pipeline_arg ocf_metadata_hash_load_sb_store_segment_args[] = {
+struct ocf_pipeline_arg ocf_metadata_load_sb_store_segment_args[] = {
 	OCF_PL_ARG_INT(metadata_segment_sb_config),
 	OCF_PL_ARG_INT(metadata_segment_sb_runtime),
 	OCF_PL_ARG_INT(metadata_segment_part_config),
@@ -1430,7 +1430,7 @@ struct ocf_pipeline_arg ocf_metadata_hash_load_sb_store_segment_args[] = {
 	OCF_PL_ARG_TERMINATOR(),
 };
 
-struct ocf_pipeline_arg ocf_metadata_hash_load_sb_load_segment_args[] = {
+struct ocf_pipeline_arg ocf_metadata_load_sb_load_segment_args[] = {
 	OCF_PL_ARG_INT(metadata_segment_sb_config),
 	OCF_PL_ARG_INT(metadata_segment_sb_runtime),
 	OCF_PL_ARG_INT(metadata_segment_part_config),
@@ -1440,32 +1440,32 @@ struct ocf_pipeline_arg ocf_metadata_hash_load_sb_load_segment_args[] = {
 	OCF_PL_ARG_TERMINATOR(),
 };
 
-struct ocf_pipeline_arg ocf_metadata_hash_load_sb_check_crc_args[] = {
+struct ocf_pipeline_arg ocf_metadata_load_sb_check_crc_args[] = {
 	OCF_PL_ARG_INT(metadata_segment_part_config),
 	OCF_PL_ARG_INT(metadata_segment_core_config),
 	OCF_PL_ARG_INT(metadata_segment_core_uuid),
 	OCF_PL_ARG_TERMINATOR(),
 };
 
-struct ocf_pipeline_arg ocf_metadata_hash_load_sb_check_crc_args_clean[] = {
+struct ocf_pipeline_arg ocf_metadata_load_sb_check_crc_args_clean[] = {
 	OCF_PL_ARG_INT(metadata_segment_sb_runtime),
 	OCF_PL_ARG_INT(metadata_segment_part_runtime),
 	OCF_PL_ARG_TERMINATOR(),
 };
 
-struct ocf_pipeline_properties ocf_metadata_hash_load_sb_pipeline_props = {
-	.priv_size = sizeof(struct ocf_metadata_hash_context),
+struct ocf_pipeline_properties ocf_metadata_load_sb_pipeline_props = {
+	.priv_size = sizeof(struct ocf_metadata_context),
 	.finish = ocf_metadata_load_superblock_finish,
 	.steps = {
 		OCF_PL_STEP_FOREACH(ocf_medatata_hash_store_segment,
-				ocf_metadata_hash_load_sb_store_segment_args),
+				ocf_metadata_load_sb_store_segment_args),
 		OCF_PL_STEP_FOREACH(ocf_medatata_hash_load_segment,
-				ocf_metadata_hash_load_sb_load_segment_args),
+				ocf_metadata_load_sb_load_segment_args),
 		OCF_PL_STEP(ocf_medatata_hash_check_crc_sb_config),
 		OCF_PL_STEP_FOREACH(ocf_medatata_hash_check_crc,
-				ocf_metadata_hash_load_sb_check_crc_args),
+				ocf_metadata_load_sb_check_crc_args),
 		OCF_PL_STEP_FOREACH(ocf_medatata_hash_check_crc_if_clean,
-				ocf_metadata_hash_load_sb_check_crc_args_clean),
+				ocf_metadata_load_sb_check_crc_args_clean),
 		OCF_PL_STEP(ocf_medatata_hash_load_superblock_post),
 		OCF_PL_STEP_TERMINATOR(),
 	},
@@ -1477,16 +1477,16 @@ struct ocf_pipeline_properties ocf_metadata_hash_load_sb_pipeline_props = {
 void ocf_metadata_load_superblock(ocf_cache_t cache, ocf_metadata_end_t cmpl,
 		void *priv)
 {
-	struct ocf_metadata_hash_context *context;
+	struct ocf_metadata_context *context;
 	ocf_pipeline_t pipeline;
-	struct ocf_metadata_hash_ctrl *ctrl;
+	struct ocf_metadata_ctrl *ctrl;
 	struct ocf_superblock_config *sb_config;
 	struct ocf_superblock_runtime *sb_runtime;
 	int result;
 
 	OCF_DEBUG_TRACE(cache);
 
-	ctrl = (struct ocf_metadata_hash_ctrl *) cache->metadata.priv;
+	ctrl = (struct ocf_metadata_ctrl *) cache->metadata.priv;
 	ENV_BUG_ON(!ctrl);
 
 	sb_config = METADATA_MEM_POOL(ctrl, metadata_segment_sb_config);
@@ -1496,7 +1496,7 @@ void ocf_metadata_load_superblock(ocf_cache_t cache, ocf_metadata_end_t cmpl,
 	ENV_BUG_ON(!sb_runtime);
 
 	result = ocf_pipeline_create(&pipeline, cache,
-			&ocf_metadata_hash_load_sb_pipeline_props);
+			&ocf_metadata_load_sb_pipeline_props);
 	if (result)
 		OCF_CMPL_RET(priv, result);
 
@@ -1513,7 +1513,7 @@ void ocf_metadata_load_superblock(ocf_cache_t cache, ocf_metadata_end_t cmpl,
 static void ocf_medatata_hash_flush_superblock_prepare(ocf_pipeline_t pipeline,
 		void *priv, ocf_pipeline_arg_t arg)
 {
-	struct ocf_metadata_hash_context *context = priv;
+	struct ocf_metadata_context *context = priv;
 	ocf_cache_t cache = context->cache;
 	ocf_core_t core;
 	ocf_core_id_t core_id;
@@ -1530,12 +1530,12 @@ static void ocf_medatata_hash_flush_superblock_prepare(ocf_pipeline_t pipeline,
 static void ocf_medatata_hash_calculate_crc_sb_config(ocf_pipeline_t pipeline,
 		void *priv, ocf_pipeline_arg_t arg)
 {
-	struct ocf_metadata_hash_context *context = priv;
-	struct ocf_metadata_hash_ctrl *ctrl;
+	struct ocf_metadata_context *context = priv;
+	struct ocf_metadata_ctrl *ctrl;
 	struct ocf_superblock_config *sb_config;
 	ocf_cache_t cache = context->cache;
 
-	ctrl = (struct ocf_metadata_hash_ctrl *)cache->metadata.priv;
+	ctrl = (struct ocf_metadata_ctrl *)cache->metadata.priv;
 	sb_config = METADATA_MEM_POOL(ctrl, metadata_segment_sb_config);
 
 	sb_config->checksum[metadata_segment_sb_config] = env_crc32(0,
@@ -1548,13 +1548,13 @@ static void ocf_medatata_hash_calculate_crc_sb_config(ocf_pipeline_t pipeline,
 static void ocf_medatata_hash_calculate_crc(ocf_pipeline_t pipeline,
 		void *priv, ocf_pipeline_arg_t arg)
 {
-	struct ocf_metadata_hash_context *context = priv;
+	struct ocf_metadata_context *context = priv;
 	int segment = ocf_pipeline_arg_get_int(arg);
-	struct ocf_metadata_hash_ctrl *ctrl;
+	struct ocf_metadata_ctrl *ctrl;
 	struct ocf_superblock_config *sb_config;
 	ocf_cache_t cache = context->cache;
 
-	ctrl = (struct ocf_metadata_hash_ctrl *)cache->metadata.priv;
+	ctrl = (struct ocf_metadata_ctrl *)cache->metadata.priv;
 	sb_config = METADATA_MEM_POOL(ctrl, metadata_segment_sb_config);
 
 	sb_config->checksum[segment] = ocf_metadata_raw_checksum(cache,
@@ -1566,21 +1566,21 @@ static void ocf_medatata_hash_calculate_crc(ocf_pipeline_t pipeline,
 static void ocf_medatata_hash_flush_segment(ocf_pipeline_t pipeline,
 		void *priv, ocf_pipeline_arg_t arg)
 {
-	struct ocf_metadata_hash_context *context = priv;
+	struct ocf_metadata_context *context = priv;
 	int segment = ocf_pipeline_arg_get_int(arg);
-	struct ocf_metadata_hash_ctrl *ctrl;
+	struct ocf_metadata_ctrl *ctrl;
 	ocf_cache_t cache = context->cache;
 
-	ctrl = (struct ocf_metadata_hash_ctrl *)cache->metadata.priv;
+	ctrl = (struct ocf_metadata_ctrl *)cache->metadata.priv;
 
 	ocf_metadata_raw_flush_all(cache, &ctrl->raw_desc[segment],
-			ocf_metadata_hash_generic_complete, context);
+			ocf_metadata_generic_complete, context);
 }
 
 static void ocf_metadata_flush_superblock_finish(ocf_pipeline_t pipeline,
 		void *priv, int error)
 {
-	struct ocf_metadata_hash_context *context = priv;
+	struct ocf_metadata_context *context = priv;
 	ocf_cache_t cache = context->cache;
 
 	if (error)
@@ -1590,9 +1590,9 @@ static void ocf_metadata_flush_superblock_finish(ocf_pipeline_t pipeline,
 	ocf_pipeline_destroy(pipeline);
 }
 
-static void ocf_metadata_hash_flush_disk_end(void *priv, int error)
+static void ocf_metadata_flush_disk_end(void *priv, int error)
 {
-	struct ocf_metadata_hash_context *context = priv;
+	struct ocf_metadata_context *context = priv;
 	ocf_pipeline_t pipeline = context->pipeline;
 
 	if (error) {
@@ -1603,24 +1603,24 @@ static void ocf_metadata_hash_flush_disk_end(void *priv, int error)
 	ocf_pipeline_next(pipeline);
 }
 
-static void ocf_metadata_hash_flush_disk(ocf_pipeline_t pipeline,
+static void ocf_metadata_flush_disk(ocf_pipeline_t pipeline,
 		void *priv, ocf_pipeline_arg_t arg)
 {
-	struct ocf_metadata_hash_context *context = priv;
+	struct ocf_metadata_context *context = priv;
 	ocf_cache_t cache = context->cache;
 
 	ocf_submit_volume_flush(ocf_cache_get_volume(cache),
-		ocf_metadata_hash_flush_disk_end, context);
+		ocf_metadata_flush_disk_end, context);
 }
 
-struct ocf_pipeline_arg ocf_metadata_hash_flush_sb_calculate_crc_args[] = {
+struct ocf_pipeline_arg ocf_metadata_flush_sb_calculate_crc_args[] = {
 	OCF_PL_ARG_INT(metadata_segment_part_config),
 	OCF_PL_ARG_INT(metadata_segment_core_config),
 	OCF_PL_ARG_INT(metadata_segment_core_uuid),
 	OCF_PL_ARG_TERMINATOR(),
 };
 
-struct ocf_pipeline_arg ocf_metadata_hash_flush_sb_flush_segment_args[] = {
+struct ocf_pipeline_arg ocf_metadata_flush_sb_flush_segment_args[] = {
 	OCF_PL_ARG_INT(metadata_segment_sb_config),
 	OCF_PL_ARG_INT(metadata_segment_part_config),
 	OCF_PL_ARG_INT(metadata_segment_core_config),
@@ -1628,17 +1628,17 @@ struct ocf_pipeline_arg ocf_metadata_hash_flush_sb_flush_segment_args[] = {
 	OCF_PL_ARG_TERMINATOR(),
 };
 
-struct ocf_pipeline_properties ocf_metadata_hash_flush_sb_pipeline_props = {
-	.priv_size = sizeof(struct ocf_metadata_hash_context),
+struct ocf_pipeline_properties ocf_metadata_flush_sb_pipeline_props = {
+	.priv_size = sizeof(struct ocf_metadata_context),
 	.finish = ocf_metadata_flush_superblock_finish,
 	.steps = {
 		OCF_PL_STEP(ocf_medatata_hash_flush_superblock_prepare),
 		OCF_PL_STEP(ocf_medatata_hash_calculate_crc_sb_config),
 		OCF_PL_STEP_FOREACH(ocf_medatata_hash_calculate_crc,
-				ocf_metadata_hash_flush_sb_calculate_crc_args),
+				ocf_metadata_flush_sb_calculate_crc_args),
 		OCF_PL_STEP_FOREACH(ocf_medatata_hash_flush_segment,
-				ocf_metadata_hash_flush_sb_flush_segment_args),
-		OCF_PL_STEP(ocf_metadata_hash_flush_disk),
+				ocf_metadata_flush_sb_flush_segment_args),
+		OCF_PL_STEP(ocf_metadata_flush_disk),
 		OCF_PL_STEP_TERMINATOR(),
 	},
 };
@@ -1649,14 +1649,14 @@ struct ocf_pipeline_properties ocf_metadata_hash_flush_sb_pipeline_props = {
 void ocf_metadata_flush_superblock(ocf_cache_t cache,
 		ocf_metadata_end_t cmpl, void *priv)
 {
-	struct ocf_metadata_hash_context *context;
+	struct ocf_metadata_context *context;
 	ocf_pipeline_t pipeline;
 	int result;
 
 	OCF_DEBUG_TRACE(cache);
 
 	result = ocf_pipeline_create(&pipeline, cache,
-			&ocf_metadata_hash_flush_sb_pipeline_props);
+			&ocf_metadata_flush_sb_pipeline_props);
 	if (result)
 		OCF_CMPL_RET(priv, result);
 
@@ -1682,7 +1682,7 @@ void ocf_metadata_set_shutdown_status(ocf_cache_t cache,
 		enum ocf_metadata_shutdown_status shutdown_status,
 		ocf_metadata_end_t cmpl, void *priv)
 {
-	struct ocf_metadata_hash_ctrl *ctrl;
+	struct ocf_metadata_ctrl *ctrl;
 	struct ocf_superblock_config *superblock;
 
 	OCF_DEBUG_TRACE(cache);
@@ -1690,7 +1690,7 @@ void ocf_metadata_set_shutdown_status(ocf_cache_t cache,
 	/*
 	 * Get metadata hash service control structure
 	 */
-	ctrl = (struct ocf_metadata_hash_ctrl *) cache->metadata.priv;
+	ctrl = (struct ocf_metadata_ctrl *) cache->metadata.priv;
 
 	/*
 	 * Get super block
@@ -1712,11 +1712,11 @@ void ocf_metadata_set_shutdown_status(ocf_cache_t cache,
 uint64_t ocf_metadata_get_reserved_lba(
 		struct ocf_cache *cache)
 {
-	struct ocf_metadata_hash_ctrl *ctrl;
+	struct ocf_metadata_ctrl *ctrl;
 
 	OCF_DEBUG_TRACE(cache);
 
-	ctrl = (struct ocf_metadata_hash_ctrl *) cache->metadata.priv;
+	ctrl = (struct ocf_metadata_ctrl *) cache->metadata.priv;
 	return ctrl->raw_desc[metadata_segment_reserved].ssd_pages_offset *
 			PAGE_SIZE;
 }
@@ -1728,7 +1728,7 @@ uint64_t ocf_metadata_get_reserved_lba(
 static void ocf_medatata_hash_flush_all_set_status_complete(
 		void *priv, int error)
 {
-	struct ocf_metadata_hash_context *context = priv;
+	struct ocf_metadata_context *context = priv;
 
 	OCF_PL_NEXT_ON_SUCCESS_RET(context->pipeline, error);
 }
@@ -1736,7 +1736,7 @@ static void ocf_medatata_hash_flush_all_set_status_complete(
 static void ocf_medatata_hash_flush_all_set_status(ocf_pipeline_t pipeline,
 		void *priv, ocf_pipeline_arg_t arg)
 {
-	struct ocf_metadata_hash_context *context = priv;
+	struct ocf_metadata_context *context = priv;
 	ocf_cache_t cache = context->cache;
 	enum ocf_metadata_shutdown_status shutdown_status =
 			ocf_pipeline_arg_get_int(arg);
@@ -1746,10 +1746,10 @@ static void ocf_medatata_hash_flush_all_set_status(ocf_pipeline_t pipeline,
 			context);
 }
 
-static void ocf_metadata_hash_flush_all_finish(ocf_pipeline_t pipeline,
+static void ocf_metadata_flush_all_finish(ocf_pipeline_t pipeline,
 		void *priv, int error)
 {
-	struct ocf_metadata_hash_context *context = priv;
+	struct ocf_metadata_context *context = priv;
 	ocf_cache_t cache = context->cache;
 
 	if (error) {
@@ -1765,7 +1765,7 @@ out:
 	ocf_pipeline_destroy(pipeline);
 }
 
-struct ocf_pipeline_arg ocf_metadata_hash_flush_all_args[] = {
+struct ocf_pipeline_arg ocf_metadata_flush_all_args[] = {
 	OCF_PL_ARG_INT(metadata_segment_sb_runtime),
 	OCF_PL_ARG_INT(metadata_segment_part_runtime),
 	OCF_PL_ARG_INT(metadata_segment_core_runtime),
@@ -1777,16 +1777,16 @@ struct ocf_pipeline_arg ocf_metadata_hash_flush_all_args[] = {
 	OCF_PL_ARG_TERMINATOR(),
 };
 
-struct ocf_pipeline_properties ocf_metadata_hash_flush_all_pipeline_props = {
-	.priv_size = sizeof(struct ocf_metadata_hash_context),
-	.finish = ocf_metadata_hash_flush_all_finish,
+struct ocf_pipeline_properties ocf_metadata_flush_all_pipeline_props = {
+	.priv_size = sizeof(struct ocf_metadata_context),
+	.finish = ocf_metadata_flush_all_finish,
 	.steps = {
 		OCF_PL_STEP_ARG_INT(ocf_medatata_hash_flush_all_set_status,
 				ocf_metadata_dirty_shutdown),
 		OCF_PL_STEP_FOREACH(ocf_medatata_hash_flush_segment,
-				ocf_metadata_hash_flush_all_args),
+				ocf_metadata_flush_all_args),
 		OCF_PL_STEP_FOREACH(ocf_medatata_hash_calculate_crc,
-				ocf_metadata_hash_flush_all_args),
+				ocf_metadata_flush_all_args),
 		OCF_PL_STEP_ARG_INT(ocf_medatata_hash_flush_all_set_status,
 				ocf_metadata_clean_shutdown),
 		OCF_PL_STEP_TERMINATOR(),
@@ -1799,14 +1799,14 @@ struct ocf_pipeline_properties ocf_metadata_hash_flush_all_pipeline_props = {
 void ocf_metadata_flush_all(ocf_cache_t cache,
 		ocf_metadata_end_t cmpl, void *priv)
 {
-	struct ocf_metadata_hash_context *context;
+	struct ocf_metadata_context *context;
 	ocf_pipeline_t pipeline;
 	int result;
 
 	OCF_DEBUG_TRACE(cache);
 
 	result = ocf_pipeline_create(&pipeline, cache,
-			&ocf_metadata_hash_flush_all_pipeline_props);
+			&ocf_metadata_flush_all_pipeline_props);
 	if (result)
 		OCF_CMPL_RET(priv, result);
 
@@ -1827,11 +1827,11 @@ void ocf_metadata_flush_mark(struct ocf_cache *cache,
 		struct ocf_request *req, uint32_t map_idx, int to_state,
 		uint8_t start, uint8_t stop)
 {
-	struct ocf_metadata_hash_ctrl *ctrl = NULL;
+	struct ocf_metadata_ctrl *ctrl = NULL;
 
 	OCF_DEBUG_TRACE(cache);
 
-	ctrl = (struct ocf_metadata_hash_ctrl *) cache->metadata.priv;
+	ctrl = (struct ocf_metadata_ctrl *) cache->metadata.priv;
 
 	/*
 	 * Mark all required metadata elements to make given metadata cache
@@ -1851,11 +1851,11 @@ void ocf_metadata_flush_do_asynch(struct ocf_cache *cache,
 		struct ocf_request *req, ocf_req_end_t complete)
 {
 	int result = 0;
-	struct ocf_metadata_hash_ctrl *ctrl = NULL;
+	struct ocf_metadata_ctrl *ctrl = NULL;
 
 	OCF_DEBUG_TRACE(cache);
 
-	ctrl = (struct ocf_metadata_hash_ctrl *) cache->metadata.priv;
+	ctrl = (struct ocf_metadata_ctrl *) cache->metadata.priv;
 
 	/*
 	 * Flush all required metadata elements to make given metadata cache
@@ -1874,10 +1874,10 @@ void ocf_metadata_flush_do_asynch(struct ocf_cache *cache,
 	}
 }
 
-static void ocf_metadata_hash_load_all_finish(ocf_pipeline_t pipeline,
+static void ocf_metadata_load_all_finish(ocf_pipeline_t pipeline,
 		void *priv, int error)
 {
-	struct ocf_metadata_hash_context *context = priv;
+	struct ocf_metadata_context *context = priv;
 	ocf_cache_t cache = context->cache;
 
 	if (error) {
@@ -1893,7 +1893,7 @@ out:
 	ocf_pipeline_destroy(pipeline);
 }
 
-struct ocf_pipeline_arg ocf_metadata_hash_load_all_args[] = {
+struct ocf_pipeline_arg ocf_metadata_load_all_args[] = {
 	OCF_PL_ARG_INT(metadata_segment_core_runtime),
 	OCF_PL_ARG_INT(metadata_segment_cleaning),
 	OCF_PL_ARG_INT(metadata_segment_eviction),
@@ -1903,14 +1903,14 @@ struct ocf_pipeline_arg ocf_metadata_hash_load_all_args[] = {
 	OCF_PL_ARG_TERMINATOR(),
 };
 
-struct ocf_pipeline_properties ocf_metadata_hash_load_all_pipeline_props = {
-	.priv_size = sizeof(struct ocf_metadata_hash_context),
-	.finish = ocf_metadata_hash_load_all_finish,
+struct ocf_pipeline_properties ocf_metadata_load_all_pipeline_props = {
+	.priv_size = sizeof(struct ocf_metadata_context),
+	.finish = ocf_metadata_load_all_finish,
 	.steps = {
 		OCF_PL_STEP_FOREACH(ocf_medatata_hash_load_segment,
-				ocf_metadata_hash_load_all_args),
+				ocf_metadata_load_all_args),
 		OCF_PL_STEP_FOREACH(ocf_medatata_hash_check_crc,
-				ocf_metadata_hash_load_all_args),
+				ocf_metadata_load_all_args),
 		OCF_PL_STEP_TERMINATOR(),
 	},
 };
@@ -1921,14 +1921,14 @@ struct ocf_pipeline_properties ocf_metadata_hash_load_all_pipeline_props = {
 void ocf_metadata_load_all(ocf_cache_t cache,
 		ocf_metadata_end_t cmpl, void *priv)
 {
-	struct ocf_metadata_hash_context *context;
+	struct ocf_metadata_context *context;
 	ocf_pipeline_t pipeline;
 	int result;
 
 	OCF_DEBUG_TRACE(cache);
 
 	result = ocf_pipeline_create(&pipeline, cache,
-			&ocf_metadata_hash_load_all_pipeline_props);
+			&ocf_metadata_load_all_pipeline_props);
 	if (result)
 		OCF_CMPL_RET(priv, result);
 
@@ -2010,7 +2010,7 @@ static void _recovery_reset_cline_metadata(struct ocf_cache *cache,
 static void _recovery_rebuild_metadata(ocf_pipeline_t pipeline,
 		void *priv, ocf_pipeline_arg_t arg)
 {
-	struct ocf_metadata_hash_context *context = priv;
+	struct ocf_metadata_context *context = priv;
 	bool dirty_only = ocf_pipeline_arg_get_int(arg);
 	ocf_cache_t cache = context->cache;
 	ocf_cache_line_t cline;
@@ -2045,10 +2045,10 @@ static void _recovery_rebuild_metadata(ocf_pipeline_t pipeline,
 	ocf_pipeline_next(pipeline);
 }
 
-static void ocf_metadata_hash_load_recovery_legacy_finish(
+static void ocf_metadata_load_recovery_legacy_finish(
 		ocf_pipeline_t pipeline, void *priv, int error)
 {
-	struct ocf_metadata_hash_context *context = priv;
+	struct ocf_metadata_context *context = priv;
 	ocf_cache_t cache = context->cache;
 
 	if (error) {
@@ -2066,9 +2066,9 @@ out:
 }
 
 struct ocf_pipeline_properties
-ocf_metadata_hash_load_recovery_legacy_pl_props = {
-	.priv_size = sizeof(struct ocf_metadata_hash_context),
-	.finish = ocf_metadata_hash_load_recovery_legacy_finish,
+ocf_metadata_load_recovery_legacy_pl_props = {
+	.priv_size = sizeof(struct ocf_metadata_context),
+	.finish = ocf_metadata_load_recovery_legacy_finish,
 	.steps = {
 		OCF_PL_STEP_ARG_INT(ocf_medatata_hash_load_segment,
 				metadata_segment_collision),
@@ -2077,17 +2077,17 @@ ocf_metadata_hash_load_recovery_legacy_pl_props = {
 	},
 };
 
-static void _ocf_metadata_hash_load_recovery_legacy(ocf_cache_t cache,
+static void _ocf_metadata_load_recovery_legacy(ocf_cache_t cache,
 		ocf_metadata_end_t cmpl, void *priv)
 {
-	struct ocf_metadata_hash_context *context;
+	struct ocf_metadata_context *context;
 	ocf_pipeline_t pipeline;
 	int result;
 
 	OCF_DEBUG_TRACE(cache);
 
 	result = ocf_pipeline_create(&pipeline, cache,
-			&ocf_metadata_hash_load_recovery_legacy_pl_props);
+			&ocf_metadata_load_recovery_legacy_pl_props);
 	if (result)
 		OCF_CMPL_RET(priv, result);
 
@@ -2101,7 +2101,7 @@ static void _ocf_metadata_hash_load_recovery_legacy(ocf_cache_t cache,
 	ocf_pipeline_next(pipeline);
 }
 
-static ocf_core_id_t _ocf_metadata_hash_find_core_by_seq(
+static ocf_core_id_t _ocf_metadata_find_core_by_seq(
 		struct ocf_cache *cache, ocf_seq_no_t seq_no)
 {
 	ocf_core_t core;
@@ -2118,18 +2118,18 @@ static ocf_core_id_t _ocf_metadata_hash_find_core_by_seq(
 	return core_id;
 }
 
-static void ocf_metadata_hash_load_atomic_metadata_complete(
+static void ocf_metadata_load_atomic_metadata_complete(
 		ocf_cache_t cache, void *priv, int error)
 {
-	struct ocf_metadata_hash_context *context = priv;
+	struct ocf_metadata_context *context = priv;
 
 	OCF_PL_NEXT_ON_SUCCESS_RET(context->pipeline, error);
 }
 
-static int ocf_metadata_hash_load_atomic_metadata_drain(void *priv,
+static int ocf_metadata_load_atomic_metadata_drain(void *priv,
 		uint64_t sector_addr, uint32_t sector_no, ctx_data_t *data)
 {
-	struct ocf_metadata_hash_context *context = priv;
+	struct ocf_metadata_context *context = priv;
 	ocf_cache_t cache = context->cache;
 	struct ocf_atomic_metadata meta;
 	ocf_cache_line_t line = 0;
@@ -2150,7 +2150,7 @@ static int ocf_metadata_hash_load_atomic_metadata_drain(void *priv,
 		core_line = meta.core_line;
 
 		/* Look for core with sequence number same as cache line */
-		core_id = _ocf_metadata_hash_find_core_by_seq(
+		core_id = _ocf_metadata_find_core_by_seq(
 				cache, core_seq_no);
 
 		if (pos == 0)
@@ -2176,13 +2176,13 @@ static int ocf_metadata_hash_load_atomic_metadata_drain(void *priv,
 static void ocf_medatata_hash_load_atomic_metadata(
 		ocf_pipeline_t pipeline, void *priv, ocf_pipeline_arg_t arg)
 {
-	struct ocf_metadata_hash_context *context = priv;
+	struct ocf_metadata_context *context = priv;
 	ocf_cache_t cache = context->cache;
 	int result;
 
 	result = metadata_io_read_i_atomic(cache, cache->mngt_queue,
-			context, ocf_metadata_hash_load_atomic_metadata_drain,
-			ocf_metadata_hash_load_atomic_metadata_complete);
+			context, ocf_metadata_load_atomic_metadata_drain,
+			ocf_metadata_load_atomic_metadata_complete);
 	if (result) {
 		ocf_metadata_error(cache);
 		ocf_cache_log(cache, log_err,
@@ -2191,10 +2191,10 @@ static void ocf_medatata_hash_load_atomic_metadata(
 	}
 }
 
-static void ocf_metadata_hash_load_recovery_atomic_finish(
+static void ocf_metadata_load_recovery_atomic_finish(
 		ocf_pipeline_t pipeline, void *priv, int error)
 {
-	struct ocf_metadata_hash_context *context = priv;
+	struct ocf_metadata_context *context = priv;
 	ocf_cache_t cache = context->cache;
 
 	if (error) {
@@ -2208,9 +2208,9 @@ static void ocf_metadata_hash_load_recovery_atomic_finish(
 }
 
 struct ocf_pipeline_properties
-ocf_metadata_hash_load_recovery_atomic_pl_props = {
-	.priv_size = sizeof(struct ocf_metadata_hash_context),
-	.finish = ocf_metadata_hash_load_recovery_atomic_finish,
+ocf_metadata_load_recovery_atomic_pl_props = {
+	.priv_size = sizeof(struct ocf_metadata_context),
+	.finish = ocf_metadata_load_recovery_atomic_finish,
 	.steps = {
 		OCF_PL_STEP(ocf_medatata_hash_load_atomic_metadata),
 		OCF_PL_STEP_ARG_INT(_recovery_rebuild_metadata, false),
@@ -2221,17 +2221,17 @@ ocf_metadata_hash_load_recovery_atomic_pl_props = {
 /*
  * RAM Implementation - Load all metadata elements from SSD
  */
-static void _ocf_metadata_hash_load_recovery_atomic(ocf_cache_t cache,
+static void _ocf_metadata_load_recovery_atomic(ocf_cache_t cache,
 		ocf_metadata_end_t cmpl, void *priv)
 {
-	struct ocf_metadata_hash_context *context;
+	struct ocf_metadata_context *context;
 	ocf_pipeline_t pipeline;
 	int result;
 
 	OCF_DEBUG_TRACE(cache);
 
 	result = ocf_pipeline_create(&pipeline, cache,
-			&ocf_metadata_hash_load_recovery_atomic_pl_props);
+			&ocf_metadata_load_recovery_atomic_pl_props);
 	if (result)
 		OCF_CMPL_RET(priv, result);
 
@@ -2254,9 +2254,9 @@ void ocf_metadata_load_recovery(ocf_cache_t cache,
 	OCF_DEBUG_TRACE(cache);
 
 	if (ocf_volume_is_atomic(&cache->device->volume))
-		_ocf_metadata_hash_load_recovery_atomic(cache, cmpl, priv);
+		_ocf_metadata_load_recovery_atomic(cache, cmpl, priv);
 	else
-		_ocf_metadata_hash_load_recovery_legacy(cache, cmpl, priv);
+		_ocf_metadata_load_recovery_legacy(cache, cmpl, priv);
 }
 
 /*******************************************************************************
@@ -2267,8 +2267,8 @@ void ocf_metadata_get_core_info(struct ocf_cache *cache,
 		uint64_t *core_sector)
 {
 	const struct ocf_metadata_map *collision;
-	struct ocf_metadata_hash_ctrl *ctrl =
-		(struct ocf_metadata_hash_ctrl *) cache->metadata.priv;
+	struct ocf_metadata_ctrl *ctrl =
+		(struct ocf_metadata_ctrl *) cache->metadata.priv;
 
 	collision = ocf_metadata_raw_rd_access(cache,
 			&(ctrl->raw_desc[metadata_segment_collision]), line);
@@ -2292,8 +2292,8 @@ void ocf_metadata_set_core_info(struct ocf_cache *cache,
 		uint64_t core_sector)
 {
 	struct ocf_metadata_map *collision;
-	struct ocf_metadata_hash_ctrl *ctrl =
-		(struct ocf_metadata_hash_ctrl *) cache->metadata.priv;
+	struct ocf_metadata_ctrl *ctrl =
+		(struct ocf_metadata_ctrl *) cache->metadata.priv;
 
 	collision = ocf_metadata_raw_wr_access(cache,
 			&(ctrl->raw_desc[metadata_segment_collision]), line);
@@ -2310,8 +2310,8 @@ ocf_core_id_t ocf_metadata_get_core_id(struct ocf_cache *cache,
 		ocf_cache_line_t line)
 {
 	const struct ocf_metadata_map *collision;
-	struct ocf_metadata_hash_ctrl *ctrl =
-		(struct ocf_metadata_hash_ctrl *) cache->metadata.priv;
+	struct ocf_metadata_ctrl *ctrl =
+		(struct ocf_metadata_ctrl *) cache->metadata.priv;
 
 	collision = ocf_metadata_raw_rd_access(cache,
 			&(ctrl->raw_desc[metadata_segment_collision]), line);
@@ -2327,8 +2327,8 @@ struct ocf_metadata_uuid *ocf_metadata_get_core_uuid(
 		struct ocf_cache *cache, ocf_core_id_t core_id)
 {
 	struct ocf_metadata_uuid *muuid;
-	struct ocf_metadata_hash_ctrl *ctrl =
-		(struct ocf_metadata_hash_ctrl *) cache->metadata.priv;
+	struct ocf_metadata_ctrl *ctrl =
+		(struct ocf_metadata_ctrl *) cache->metadata.priv;
 
 	muuid = ocf_metadata_raw_wr_access(cache,
 			&(ctrl->raw_desc[metadata_segment_core_uuid]), core_id);
@@ -2349,8 +2349,8 @@ void ocf_metadata_get_core_and_part_id(struct ocf_cache *cache,
 {
 	const struct ocf_metadata_map *collision;
 	const struct ocf_metadata_list_info *info;
-	struct ocf_metadata_hash_ctrl *ctrl =
-		(struct ocf_metadata_hash_ctrl *) cache->metadata.priv;
+	struct ocf_metadata_ctrl *ctrl =
+		(struct ocf_metadata_ctrl *) cache->metadata.priv;
 
 	collision = ocf_metadata_raw_rd_access(cache,
 			&(ctrl->raw_desc[metadata_segment_collision]), line);
@@ -2381,8 +2381,8 @@ void ocf_metadata_get_core_and_part_id(struct ocf_cache *cache,
 ocf_cache_line_t ocf_metadata_get_hash(struct ocf_cache *cache,
 		ocf_cache_line_t index)
 {
-	struct ocf_metadata_hash_ctrl *ctrl
-		= (struct ocf_metadata_hash_ctrl *) cache->metadata.priv;
+	struct ocf_metadata_ctrl *ctrl
+		= (struct ocf_metadata_ctrl *) cache->metadata.priv;
 
 	return *(ocf_cache_line_t *)ocf_metadata_raw_rd_access(cache,
 			&(ctrl->raw_desc[metadata_segment_hash]), index);
@@ -2394,8 +2394,8 @@ ocf_cache_line_t ocf_metadata_get_hash(struct ocf_cache *cache,
 void ocf_metadata_set_hash(struct ocf_cache *cache, ocf_cache_line_t index,
 		ocf_cache_line_t line)
 {
-	struct ocf_metadata_hash_ctrl *ctrl
-		= (struct ocf_metadata_hash_ctrl *) cache->metadata.priv;
+	struct ocf_metadata_ctrl *ctrl
+		= (struct ocf_metadata_ctrl *) cache->metadata.priv;
 
 	*(ocf_cache_line_t *)ocf_metadata_raw_wr_access(cache,
 			&(ctrl->raw_desc[metadata_segment_hash]), index) = line;
@@ -2412,8 +2412,8 @@ struct cleaning_policy_meta *
 ocf_metadata_get_cleaning_policy(struct ocf_cache *cache,
 		ocf_cache_line_t line)
 {
-	struct ocf_metadata_hash_ctrl *ctrl
-		= (struct ocf_metadata_hash_ctrl *) cache->metadata.priv;
+	struct ocf_metadata_ctrl *ctrl
+		= (struct ocf_metadata_ctrl *) cache->metadata.priv;
 
 	return ocf_metadata_raw_wr_access(cache,
 			&(ctrl->raw_desc[metadata_segment_cleaning]), line);
@@ -2430,8 +2430,8 @@ union eviction_policy_meta *
 ocf_metadata_get_eviction_policy(struct ocf_cache *cache,
 		ocf_cache_line_t line)
 {
-	struct ocf_metadata_hash_ctrl *ctrl
-		= (struct ocf_metadata_hash_ctrl *) cache->metadata.priv;
+	struct ocf_metadata_ctrl *ctrl
+		= (struct ocf_metadata_ctrl *) cache->metadata.priv;
 
 	return ocf_metadata_raw_wr_access(cache,
 			&(ctrl->raw_desc[metadata_segment_eviction]), line);
@@ -2440,13 +2440,13 @@ ocf_metadata_get_eviction_policy(struct ocf_cache *cache,
 /*******************************************************************************
  *  Collision
  ******************************************************************************/
-static ocf_cache_line_t ocf_metadata_hash_map_lg2phy_seq(
+static ocf_cache_line_t ocf_metadata_map_lg2phy_seq(
 		struct ocf_cache *cache, ocf_cache_line_t coll_idx)
 {
 	return coll_idx;
 }
 
-static ocf_cache_line_t ocf_metadata_hash_map_phy2lg_seq(
+static ocf_cache_line_t ocf_metadata_map_phy2lg_seq(
 		struct ocf_cache *cache, ocf_cache_line_t cache_line)
 {
 	return cache_line;
@@ -2480,12 +2480,12 @@ static ocf_cache_line_t ocf_metadata_hash_map_phy2lg_seq(
  * @param idx - index in collision list
  * @return mapped cache line
  */
-static ocf_cache_line_t ocf_metadata_hash_map_lg2phy_striping(
+static ocf_cache_line_t ocf_metadata_map_lg2phy_striping(
 		struct ocf_cache *cache, ocf_cache_line_t coll_idx)
 {
 	ocf_cache_line_t cache_line = 0, offset = 0;
-	struct ocf_metadata_hash_ctrl *ctrl =
-		(struct ocf_metadata_hash_ctrl *) cache->metadata.priv;
+	struct ocf_metadata_ctrl *ctrl =
+		(struct ocf_metadata_ctrl *) cache->metadata.priv;
 	unsigned int entries_in_page =
 		ctrl->raw_desc[metadata_segment_collision].entries_in_page;
 	unsigned int pages =
@@ -2513,13 +2513,13 @@ static ocf_cache_line_t ocf_metadata_hash_map_lg2phy_striping(
  * @param phy Physical cache line of cache device
  * @return Logical cache line
  */
-static ocf_cache_line_t ocf_metadata_hash_map_phy2lg_striping(
+static ocf_cache_line_t ocf_metadata_map_phy2lg_striping(
 		struct ocf_cache *cache, ocf_cache_line_t cache_line)
 {
 	ocf_cache_line_t coll_idx = 0;
 
-	struct ocf_metadata_hash_ctrl *ctrl =
-		(struct ocf_metadata_hash_ctrl *) cache->metadata.priv;
+	struct ocf_metadata_ctrl *ctrl =
+		(struct ocf_metadata_ctrl *) cache->metadata.priv;
 
 	struct ocf_metadata_raw *raw =
 		&ctrl->raw_desc[metadata_segment_collision];
@@ -2552,10 +2552,10 @@ ocf_cache_line_t ocf_metadata_map_lg2phy(
 {
 	switch (cache->metadata.layout) {
 	case ocf_metadata_layout_striping:
-		return ocf_metadata_hash_map_lg2phy_striping(
+		return ocf_metadata_map_lg2phy_striping(
 				cache, coll_idx);
 	case ocf_metadata_layout_seq:
-		return ocf_metadata_hash_map_lg2phy_seq(
+		return ocf_metadata_map_lg2phy_seq(
 				cache, coll_idx);
 	default:
 		ENV_BUG();
@@ -2568,10 +2568,10 @@ ocf_cache_line_t ocf_metadata_map_phy2lg(
 {
 	switch (cache->metadata.layout) {
 	case ocf_metadata_layout_striping:
-		return ocf_metadata_hash_map_phy2lg_striping(
+		return ocf_metadata_map_phy2lg_striping(
 				cache, cache_line);
 	case ocf_metadata_layout_seq:
-		return ocf_metadata_hash_map_phy2lg_seq(
+		return ocf_metadata_map_phy2lg_seq(
 				cache, cache_line);
 	default:
 		ENV_BUG();
@@ -2584,8 +2584,8 @@ void ocf_metadata_set_collision_info(struct ocf_cache *cache,
 		ocf_cache_line_t prev)
 {
 	struct ocf_metadata_list_info *info;
-	struct ocf_metadata_hash_ctrl *ctrl =
-		(struct ocf_metadata_hash_ctrl *) cache->metadata.priv;
+	struct ocf_metadata_ctrl *ctrl =
+		(struct ocf_metadata_ctrl *) cache->metadata.priv;
 
 	info = ocf_metadata_raw_wr_access(cache,
 			&(ctrl->raw_desc[metadata_segment_list_info]), line);
@@ -2602,8 +2602,8 @@ void ocf_metadata_set_collision_next(struct ocf_cache *cache,
 		ocf_cache_line_t line, ocf_cache_line_t next)
 {
 	struct ocf_metadata_list_info *info;
-	struct ocf_metadata_hash_ctrl *ctrl =
-		(struct ocf_metadata_hash_ctrl *) cache->metadata.priv;
+	struct ocf_metadata_ctrl *ctrl =
+		(struct ocf_metadata_ctrl *) cache->metadata.priv;
 
 	info = ocf_metadata_raw_wr_access(cache,
 			&(ctrl->raw_desc[metadata_segment_list_info]), line);
@@ -2618,8 +2618,8 @@ void ocf_metadata_set_collision_prev(struct ocf_cache *cache,
 		ocf_cache_line_t line, ocf_cache_line_t prev)
 {
 	struct ocf_metadata_list_info *info;
-	struct ocf_metadata_hash_ctrl *ctrl =
-		(struct ocf_metadata_hash_ctrl *) cache->metadata.priv;
+	struct ocf_metadata_ctrl *ctrl =
+		(struct ocf_metadata_ctrl *) cache->metadata.priv;
 
 	info = ocf_metadata_raw_wr_access(cache,
 			&(ctrl->raw_desc[metadata_segment_list_info]), line);
@@ -2635,8 +2635,8 @@ void ocf_metadata_get_collision_info(struct ocf_cache *cache,
 		ocf_cache_line_t *prev)
 {
 	const struct ocf_metadata_list_info *info;
-	struct ocf_metadata_hash_ctrl *ctrl =
-		(struct ocf_metadata_hash_ctrl *) cache->metadata.priv;
+	struct ocf_metadata_ctrl *ctrl =
+		(struct ocf_metadata_ctrl *) cache->metadata.priv;
 
 	ENV_BUG_ON(NULL == next && NULL == prev);
 
@@ -2660,8 +2660,8 @@ void ocf_metadata_get_collision_info(struct ocf_cache *cache,
 void ocf_metadata_start_collision_shared_access(struct ocf_cache *cache,
 		ocf_cache_line_t line)
 {
-	struct ocf_metadata_hash_ctrl *ctrl =
-		(struct ocf_metadata_hash_ctrl *) cache->metadata.priv;
+	struct ocf_metadata_ctrl *ctrl =
+		(struct ocf_metadata_ctrl *) cache->metadata.priv;
 	struct ocf_metadata_raw *raw =
 			&ctrl->raw_desc[metadata_segment_collision];
 	uint32_t page = ocf_metadata_raw_page(raw, line);
@@ -2672,8 +2672,8 @@ void ocf_metadata_start_collision_shared_access(struct ocf_cache *cache,
 void ocf_metadata_end_collision_shared_access(struct ocf_cache *cache,
 		ocf_cache_line_t line)
 {
-	struct ocf_metadata_hash_ctrl *ctrl =
-		(struct ocf_metadata_hash_ctrl *) cache->metadata.priv;
+	struct ocf_metadata_ctrl *ctrl =
+		(struct ocf_metadata_ctrl *) cache->metadata.priv;
 	struct ocf_metadata_raw *raw =
 			&ctrl->raw_desc[metadata_segment_collision];
 	uint32_t page = ocf_metadata_raw_page(raw, line);
@@ -2690,8 +2690,8 @@ void ocf_metadata_get_partition_info(struct ocf_cache *cache,
 		ocf_cache_line_t *next_line, ocf_cache_line_t *prev_line)
 {
 	const struct ocf_metadata_list_info *info;
-	struct ocf_metadata_hash_ctrl *ctrl =
-		(struct ocf_metadata_hash_ctrl *) cache->metadata.priv;
+	struct ocf_metadata_ctrl *ctrl =
+		(struct ocf_metadata_ctrl *) cache->metadata.priv;
 
 	info = ocf_metadata_raw_rd_access(cache,
 			&(ctrl->raw_desc[metadata_segment_list_info]), line);
@@ -2718,8 +2718,8 @@ void ocf_metadata_set_partition_next(struct ocf_cache *cache,
 		ocf_cache_line_t line, ocf_cache_line_t next_line)
 {
 	struct ocf_metadata_list_info *info;
-	struct ocf_metadata_hash_ctrl *ctrl =
-		(struct ocf_metadata_hash_ctrl *) cache->metadata.priv;
+	struct ocf_metadata_ctrl *ctrl =
+		(struct ocf_metadata_ctrl *) cache->metadata.priv;
 
 	info = ocf_metadata_raw_wr_access(cache,
 			&(ctrl->raw_desc[metadata_segment_list_info]), line);
@@ -2734,8 +2734,8 @@ void ocf_metadata_set_partition_prev(struct ocf_cache *cache,
 		ocf_cache_line_t line, ocf_cache_line_t prev_line)
 {
 	struct ocf_metadata_list_info *info;
-	struct ocf_metadata_hash_ctrl *ctrl =
-		(struct ocf_metadata_hash_ctrl *) cache->metadata.priv;
+	struct ocf_metadata_ctrl *ctrl =
+		(struct ocf_metadata_ctrl *) cache->metadata.priv;
 
 	info = ocf_metadata_raw_wr_access(cache,
 			&(ctrl->raw_desc[metadata_segment_list_info]), line);
@@ -2751,8 +2751,8 @@ void ocf_metadata_set_partition_info(struct ocf_cache *cache,
 		ocf_cache_line_t next_line, ocf_cache_line_t prev_line)
 {
 	struct ocf_metadata_list_info *info;
-	struct ocf_metadata_hash_ctrl *ctrl =
-		(struct ocf_metadata_hash_ctrl *) cache->metadata.priv;
+	struct ocf_metadata_ctrl *ctrl =
+		(struct ocf_metadata_ctrl *) cache->metadata.priv;
 
 	info = ocf_metadata_raw_wr_access(cache,
 			&(ctrl->raw_desc[metadata_segment_list_info]), line);

From 02405e989def7bb81f8889d210426d9a27d73ad4 Mon Sep 17 00:00:00 2001
From: Adam Rutkowski <adam.j.rutkowski@intel.com>
Date: Tue, 1 Dec 2020 16:52:32 +0100
Subject: [PATCH 10/13] Removing 'hash' word from misspelled metadata functions

Signed-off-by: Adam Rutkowski <adam.j.rutkowski@intel.com>
---
 src/metadata/metadata_hash.c | 70 ++++++++++++++++++------------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/src/metadata/metadata_hash.c b/src/metadata/metadata_hash.c
index 872e04d..6d9cc75 100644
--- a/src/metadata/metadata_hash.c
+++ b/src/metadata/metadata_hash.c
@@ -1214,7 +1214,7 @@ static void ocf_metadata_generic_complete(void *priv, int error)
 	OCF_PL_NEXT_ON_SUCCESS_RET(context->pipeline, error);
 }
 
-static void ocf_medatata_hash_load_segment(ocf_pipeline_t pipeline,
+static void ocf_metadata_load_segment(ocf_pipeline_t pipeline,
 		void *priv, ocf_pipeline_arg_t arg)
 {
 	struct ocf_metadata_context *context = priv;
@@ -1228,7 +1228,7 @@ static void ocf_medatata_hash_load_segment(ocf_pipeline_t pipeline,
 			ocf_metadata_generic_complete, context);
 }
 
-static void ocf_medatata_hash_store_segment(ocf_pipeline_t pipeline,
+static void ocf_metadata_store_segment(ocf_pipeline_t pipeline,
 		void *priv, ocf_pipeline_arg_t arg)
 {
 	struct ocf_metadata_context *context = priv;
@@ -1256,7 +1256,7 @@ static void ocf_medatata_hash_store_segment(ocf_pipeline_t pipeline,
 	ocf_pipeline_next(pipeline);
 }
 
-static void ocf_medatata_hash_check_crc_sb_config(ocf_pipeline_t pipeline,
+static void ocf_metadata_check_crc_sb_config(ocf_pipeline_t pipeline,
 		void *priv, ocf_pipeline_arg_t arg)
 {
 	struct ocf_metadata_context *context = priv;
@@ -1283,7 +1283,7 @@ static void ocf_medatata_hash_check_crc_sb_config(ocf_pipeline_t pipeline,
 	ocf_pipeline_next(pipeline);
 }
 
-static void ocf_medatata_hash_check_crc_skip(ocf_pipeline_t pipeline,
+static void ocf_metadata_check_crc_skip(ocf_pipeline_t pipeline,
 		void *priv, ocf_pipeline_arg_t arg, bool skip_on_dirty_shutdown)
 {
 	struct ocf_metadata_context *context = priv;
@@ -1318,19 +1318,19 @@ static void ocf_medatata_hash_check_crc_skip(ocf_pipeline_t pipeline,
 	ocf_pipeline_next(pipeline);
 }
 
-static void ocf_medatata_hash_check_crc(ocf_pipeline_t pipeline,
+static void ocf_metadata_check_crc(ocf_pipeline_t pipeline,
 		void *priv, ocf_pipeline_arg_t arg)
 {
-	ocf_medatata_hash_check_crc_skip(pipeline, priv, arg, false);
+	ocf_metadata_check_crc_skip(pipeline, priv, arg, false);
 }
 
-static void ocf_medatata_hash_check_crc_if_clean(ocf_pipeline_t pipeline,
+static void ocf_metadata_check_crc_if_clean(ocf_pipeline_t pipeline,
 		void *priv, ocf_pipeline_arg_t arg)
 {
-	ocf_medatata_hash_check_crc_skip(pipeline, priv, arg, true);
+	ocf_metadata_check_crc_skip(pipeline, priv, arg, true);
 }
 
-static void ocf_medatata_hash_load_superblock_post(ocf_pipeline_t pipeline,
+static void ocf_metadata_load_superblock_post(ocf_pipeline_t pipeline,
 		void *priv, ocf_pipeline_arg_t arg)
 {
 	struct ocf_metadata_context *context = priv;
@@ -1457,16 +1457,16 @@ struct ocf_pipeline_properties ocf_metadata_load_sb_pipeline_props = {
 	.priv_size = sizeof(struct ocf_metadata_context),
 	.finish = ocf_metadata_load_superblock_finish,
 	.steps = {
-		OCF_PL_STEP_FOREACH(ocf_medatata_hash_store_segment,
+		OCF_PL_STEP_FOREACH(ocf_metadata_store_segment,
 				ocf_metadata_load_sb_store_segment_args),
-		OCF_PL_STEP_FOREACH(ocf_medatata_hash_load_segment,
+		OCF_PL_STEP_FOREACH(ocf_metadata_load_segment,
 				ocf_metadata_load_sb_load_segment_args),
-		OCF_PL_STEP(ocf_medatata_hash_check_crc_sb_config),
-		OCF_PL_STEP_FOREACH(ocf_medatata_hash_check_crc,
+		OCF_PL_STEP(ocf_metadata_check_crc_sb_config),
+		OCF_PL_STEP_FOREACH(ocf_metadata_check_crc,
 				ocf_metadata_load_sb_check_crc_args),
-		OCF_PL_STEP_FOREACH(ocf_medatata_hash_check_crc_if_clean,
+		OCF_PL_STEP_FOREACH(ocf_metadata_check_crc_if_clean,
 				ocf_metadata_load_sb_check_crc_args_clean),
-		OCF_PL_STEP(ocf_medatata_hash_load_superblock_post),
+		OCF_PL_STEP(ocf_metadata_load_superblock_post),
 		OCF_PL_STEP_TERMINATOR(),
 	},
 };
@@ -1510,7 +1510,7 @@ void ocf_metadata_load_superblock(ocf_cache_t cache, ocf_metadata_end_t cmpl,
 	ocf_pipeline_next(pipeline);
 }
 
-static void ocf_medatata_hash_flush_superblock_prepare(ocf_pipeline_t pipeline,
+static void ocf_metadata_flush_superblock_prepare(ocf_pipeline_t pipeline,
 		void *priv, ocf_pipeline_arg_t arg)
 {
 	struct ocf_metadata_context *context = priv;
@@ -1527,7 +1527,7 @@ static void ocf_medatata_hash_flush_superblock_prepare(ocf_pipeline_t pipeline,
 	ocf_pipeline_next(pipeline);
 }
 
-static void ocf_medatata_hash_calculate_crc_sb_config(ocf_pipeline_t pipeline,
+static void ocf_metadata_calculate_crc_sb_config(ocf_pipeline_t pipeline,
 		void *priv, ocf_pipeline_arg_t arg)
 {
 	struct ocf_metadata_context *context = priv;
@@ -1545,7 +1545,7 @@ static void ocf_medatata_hash_calculate_crc_sb_config(ocf_pipeline_t pipeline,
 	ocf_pipeline_next(pipeline);
 }
 
-static void ocf_medatata_hash_calculate_crc(ocf_pipeline_t pipeline,
+static void ocf_metadata_calculate_crc(ocf_pipeline_t pipeline,
 		void *priv, ocf_pipeline_arg_t arg)
 {
 	struct ocf_metadata_context *context = priv;
@@ -1563,7 +1563,7 @@ static void ocf_medatata_hash_calculate_crc(ocf_pipeline_t pipeline,
 	ocf_pipeline_next(pipeline);
 }
 
-static void ocf_medatata_hash_flush_segment(ocf_pipeline_t pipeline,
+static void ocf_metadata_flush_segment(ocf_pipeline_t pipeline,
 		void *priv, ocf_pipeline_arg_t arg)
 {
 	struct ocf_metadata_context *context = priv;
@@ -1632,11 +1632,11 @@ struct ocf_pipeline_properties ocf_metadata_flush_sb_pipeline_props = {
 	.priv_size = sizeof(struct ocf_metadata_context),
 	.finish = ocf_metadata_flush_superblock_finish,
 	.steps = {
-		OCF_PL_STEP(ocf_medatata_hash_flush_superblock_prepare),
-		OCF_PL_STEP(ocf_medatata_hash_calculate_crc_sb_config),
-		OCF_PL_STEP_FOREACH(ocf_medatata_hash_calculate_crc,
+		OCF_PL_STEP(ocf_metadata_flush_superblock_prepare),
+		OCF_PL_STEP(ocf_metadata_calculate_crc_sb_config),
+		OCF_PL_STEP_FOREACH(ocf_metadata_calculate_crc,
 				ocf_metadata_flush_sb_calculate_crc_args),
-		OCF_PL_STEP_FOREACH(ocf_medatata_hash_flush_segment,
+		OCF_PL_STEP_FOREACH(ocf_metadata_flush_segment,
 				ocf_metadata_flush_sb_flush_segment_args),
 		OCF_PL_STEP(ocf_metadata_flush_disk),
 		OCF_PL_STEP_TERMINATOR(),
@@ -1725,7 +1725,7 @@ uint64_t ocf_metadata_get_reserved_lba(
  * FLUSH AND LOAD ALL
  ******************************************************************************/
 
-static void ocf_medatata_hash_flush_all_set_status_complete(
+static void ocf_metadata_flush_all_set_status_complete(
 		void *priv, int error)
 {
 	struct ocf_metadata_context *context = priv;
@@ -1733,7 +1733,7 @@ static void ocf_medatata_hash_flush_all_set_status_complete(
 	OCF_PL_NEXT_ON_SUCCESS_RET(context->pipeline, error);
 }
 
-static void ocf_medatata_hash_flush_all_set_status(ocf_pipeline_t pipeline,
+static void ocf_metadata_flush_all_set_status(ocf_pipeline_t pipeline,
 		void *priv, ocf_pipeline_arg_t arg)
 {
 	struct ocf_metadata_context *context = priv;
@@ -1742,7 +1742,7 @@ static void ocf_medatata_hash_flush_all_set_status(ocf_pipeline_t pipeline,
 			ocf_pipeline_arg_get_int(arg);
 
 	ocf_metadata_set_shutdown_status(cache, shutdown_status,
-			ocf_medatata_hash_flush_all_set_status_complete,
+			ocf_metadata_flush_all_set_status_complete,
 			context);
 }
 
@@ -1781,13 +1781,13 @@ struct ocf_pipeline_properties ocf_metadata_flush_all_pipeline_props = {
 	.priv_size = sizeof(struct ocf_metadata_context),
 	.finish = ocf_metadata_flush_all_finish,
 	.steps = {
-		OCF_PL_STEP_ARG_INT(ocf_medatata_hash_flush_all_set_status,
+		OCF_PL_STEP_ARG_INT(ocf_metadata_flush_all_set_status,
 				ocf_metadata_dirty_shutdown),
-		OCF_PL_STEP_FOREACH(ocf_medatata_hash_flush_segment,
+		OCF_PL_STEP_FOREACH(ocf_metadata_flush_segment,
 				ocf_metadata_flush_all_args),
-		OCF_PL_STEP_FOREACH(ocf_medatata_hash_calculate_crc,
+		OCF_PL_STEP_FOREACH(ocf_metadata_calculate_crc,
 				ocf_metadata_flush_all_args),
-		OCF_PL_STEP_ARG_INT(ocf_medatata_hash_flush_all_set_status,
+		OCF_PL_STEP_ARG_INT(ocf_metadata_flush_all_set_status,
 				ocf_metadata_clean_shutdown),
 		OCF_PL_STEP_TERMINATOR(),
 	},
@@ -1907,9 +1907,9 @@ struct ocf_pipeline_properties ocf_metadata_load_all_pipeline_props = {
 	.priv_size = sizeof(struct ocf_metadata_context),
 	.finish = ocf_metadata_load_all_finish,
 	.steps = {
-		OCF_PL_STEP_FOREACH(ocf_medatata_hash_load_segment,
+		OCF_PL_STEP_FOREACH(ocf_metadata_load_segment,
 				ocf_metadata_load_all_args),
-		OCF_PL_STEP_FOREACH(ocf_medatata_hash_check_crc,
+		OCF_PL_STEP_FOREACH(ocf_metadata_check_crc,
 				ocf_metadata_load_all_args),
 		OCF_PL_STEP_TERMINATOR(),
 	},
@@ -2070,7 +2070,7 @@ ocf_metadata_load_recovery_legacy_pl_props = {
 	.priv_size = sizeof(struct ocf_metadata_context),
 	.finish = ocf_metadata_load_recovery_legacy_finish,
 	.steps = {
-		OCF_PL_STEP_ARG_INT(ocf_medatata_hash_load_segment,
+		OCF_PL_STEP_ARG_INT(ocf_metadata_load_segment,
 				metadata_segment_collision),
 		OCF_PL_STEP_ARG_INT(_recovery_rebuild_metadata, true),
 		OCF_PL_STEP_TERMINATOR(),
@@ -2173,7 +2173,7 @@ static int ocf_metadata_load_atomic_metadata_drain(void *priv,
 	return 0;
 }
 
-static void ocf_medatata_hash_load_atomic_metadata(
+static void ocf_metadata_load_atomic_metadata(
 		ocf_pipeline_t pipeline, void *priv, ocf_pipeline_arg_t arg)
 {
 	struct ocf_metadata_context *context = priv;
@@ -2212,7 +2212,7 @@ ocf_metadata_load_recovery_atomic_pl_props = {
 	.priv_size = sizeof(struct ocf_metadata_context),
 	.finish = ocf_metadata_load_recovery_atomic_finish,
 	.steps = {
-		OCF_PL_STEP(ocf_medatata_hash_load_atomic_metadata),
+		OCF_PL_STEP(ocf_metadata_load_atomic_metadata),
 		OCF_PL_STEP_ARG_INT(_recovery_rebuild_metadata, false),
 		OCF_PL_STEP_TERMINATOR(),
 	},

From b074d7779775e6af337e42e25d9aefdecc55b2c0 Mon Sep 17 00:00:00 2001
From: Adam Rutkowski <adam.j.rutkowski@intel.com>
Date: Mon, 23 Nov 2020 22:35:52 -0600
Subject: [PATCH 11/13] Spliting metadata implementation to match header files

Moving metadata implementation out of obsolete metadata_hash.c
to .c files corresponding to function declaration header files.
This requires adding shared header for metadata implementation
metadata_internal.h. Some metadata header files did not have
a corresponding .c file - in this case it is added in this
commit.

Signed-off-by: Adam Rutkowski <adam.j.rutkowski@intel.com>
---
 src/metadata/metadata.c                 | 1858 ++++++++++++++-
 src/metadata/metadata_cleaning_policy.c |   23 +
 src/metadata/metadata_collision.c       |  243 ++
 src/metadata/metadata_collision.h       |    4 +-
 src/metadata/metadata_core.c            |   88 +
 src/metadata/metadata_core.h            |    2 +
 src/metadata/metadata_eviction_policy.c |   25 +
 src/metadata/metadata_hash.c            | 2829 -----------------------
 src/metadata/metadata_internal.h        |   38 +
 src/metadata/metadata_partition.c       |   81 +
 src/metadata/metadata_segment_ops.c     |  107 +
 src/metadata/metadata_segment_ops.h     |   27 +
 src/metadata/metadata_superblock.c      |  424 ++++
 13 files changed, 2904 insertions(+), 2845 deletions(-)
 create mode 100644 src/metadata/metadata_cleaning_policy.c
 create mode 100644 src/metadata/metadata_core.c
 create mode 100644 src/metadata/metadata_eviction_policy.c
 delete mode 100644 src/metadata/metadata_hash.c
 create mode 100644 src/metadata/metadata_internal.h
 create mode 100644 src/metadata/metadata_segment_ops.c
 create mode 100644 src/metadata/metadata_segment_ops.h
 create mode 100644 src/metadata/metadata_superblock.c

diff --git a/src/metadata/metadata.c b/src/metadata/metadata.c
index 07795bb..56e58cd 100644
--- a/src/metadata/metadata.c
+++ b/src/metadata/metadata.c
@@ -6,29 +6,1557 @@
 #include "ocf/ocf.h"
 
 #include "metadata.h"
+#include "metadata_collision.h"
 #include "metadata_hash.h"
+#include "metadata_internal.h"
 #include "metadata_io.h"
+#include "metadata_raw.h"
+#include "metadata_segment_ops.h"
+#include "../concurrency/ocf_concurrency.h"
+#include "../ocf_def_priv.h"
+#include "../ocf_freelist.h"
 #include "../ocf_priv.h"
-#include "../utils/utils_io.h"
 #include "../utils/utils_cache_line.h"
+#include "../utils/utils_io.h"
+#include "../utils/utils_pipeline.h"
+
 
 #define OCF_METADATA_DEBUG 0
 
 #if 1 == OCF_METADATA_DEBUG
 #define OCF_DEBUG_TRACE(cache) \
-	ocf_cache_log(cache, log_info, "[Metadata][Hash] %s\n", __func__)
+	ocf_cache_log(cache, log_info, "[Metadata] %s\n", __func__)
+#define OCF_DEBUG_PARAM(cache, format, ...) \
+	ocf_cache_log(cache, log_info, "[Metadata] %s - "format"\n", \
+			__func__, ##__VA_ARGS__)
 #else
 #define OCF_DEBUG_TRACE(cache)
+#define OCF_DEBUG_PARAM(cache, format, ...)
 #endif
 
-/* TODO: temporarily still in metadata_hash.c, definition will
- be moved to this file */
-int ocf_metadata_init_fixed_size(struct ocf_cache *cache,
-		ocf_cache_line_size_t cache_line_size);
-void ocf_metadata_deinit_fixed_size(struct ocf_cache *cache);
-void ocf_metadata_query_cores(ocf_ctx_t owner, ocf_volume_t volume,
-		struct ocf_volume_uuid *uuid, uint32_t count,
-		ocf_metadata_query_cores_end_t cmpl, void *priv);
+#define OCF_METADATA_HASH_DIFF_MAX 1000
+
+enum {
+	ocf_metadata_status_type_valid = 0,
+	ocf_metadata_status_type_dirty,
+
+	ocf_metadata_status_type_max
+};
+
+static inline size_t ocf_metadata_status_sizeof(
+		const struct ocf_cache_line_settings *settings) {
+	/* Number of bytes required to mark cache line status */
+	size_t size = settings->sector_count / 8;
+
+	/* Number of types of status (valid, dirty, etc...) */
+	size *= ocf_metadata_status_type_max;
+
+	/* At the end we have size */
+	return size;
+}
+
+/*
+ * get entries for specified metadata hash type
+ */
+static ocf_cache_line_t ocf_metadata_get_entries(
+		enum ocf_metadata_segment type,
+		ocf_cache_line_t cache_lines)
+{
+	ENV_BUG_ON(type >= metadata_segment_variable_size_start && cache_lines == 0);
+
+	switch (type) {
+	case metadata_segment_collision:
+	case metadata_segment_cleaning:
+	case metadata_segment_eviction:
+	case metadata_segment_list_info:
+		return cache_lines;
+
+	case metadata_segment_hash:
+		return OCF_DIV_ROUND_UP(cache_lines, 4);
+
+	case metadata_segment_sb_config:
+		return OCF_DIV_ROUND_UP(sizeof(struct ocf_superblock_config),
+				PAGE_SIZE);
+
+	case metadata_segment_sb_runtime:
+		return OCF_DIV_ROUND_UP(sizeof(struct ocf_superblock_runtime),
+				PAGE_SIZE);
+
+	case metadata_segment_reserved:
+		return 32;
+
+	case metadata_segment_part_config:
+		return OCF_IO_CLASS_MAX + 1;
+
+	case metadata_segment_part_runtime:
+		return OCF_IO_CLASS_MAX + 1;
+
+	case metadata_segment_core_config:
+		return OCF_CORE_MAX;
+
+	case metadata_segment_core_runtime:
+		return OCF_CORE_MAX;
+
+	case metadata_segment_core_uuid:
+		return OCF_CORE_MAX;
+
+	default:
+		break;
+	}
+
+	ENV_BUG();
+	return 0;
+}
+
+/*
+ * Get size of particular hash metadata type element
+ */
+static int64_t ocf_metadata_get_element_size(
+		enum ocf_metadata_segment type,
+		const struct ocf_cache_line_settings *settings)
+{
+	int64_t size = 0;
+
+	ENV_BUG_ON(type >= metadata_segment_variable_size_start && !settings);
+
+	switch (type) {
+	case metadata_segment_eviction:
+		size = sizeof(union eviction_policy_meta);
+		break;
+
+	case metadata_segment_cleaning:
+		size = sizeof(struct cleaning_policy_meta);
+		break;
+
+	case metadata_segment_collision:
+		size = sizeof(struct ocf_metadata_map)
+			+ ocf_metadata_status_sizeof(settings);
+		break;
+
+	case metadata_segment_list_info:
+		size = sizeof(struct ocf_metadata_list_info);
+		break;
+
+	case metadata_segment_sb_config:
+		size = PAGE_SIZE;
+		break;
+
+	case metadata_segment_sb_runtime:
+		size = PAGE_SIZE;
+		break;
+
+	case metadata_segment_reserved:
+		size = PAGE_SIZE;
+		break;
+
+	case metadata_segment_part_config:
+		size = sizeof(struct ocf_user_part_config);
+		break;
+
+	case metadata_segment_part_runtime:
+		size = sizeof(struct ocf_user_part_runtime);
+		break;
+
+	case metadata_segment_hash:
+		size = sizeof(ocf_cache_line_t);
+		break;
+
+	case metadata_segment_core_config:
+		size = sizeof(struct ocf_core_meta_config);
+		break;
+
+	case metadata_segment_core_runtime:
+		size = sizeof(struct ocf_core_meta_runtime);
+		break;
+
+	case metadata_segment_core_uuid:
+		size = sizeof(struct ocf_metadata_uuid);
+		break;
+
+	default:
+		break;
+
+	}
+
+	ENV_BUG_ON(size > PAGE_SIZE);
+
+	return size;
+}
+
+/*
+ * Metadata calculation exception handling.
+ *
+ * @param unused_lines - Unused pages
+ * @param device_lines - SSD Cache device pages amount
+ *
+ * @return true - Accept unused sapce
+ * @return false - unused space is not acceptable
+ */
+static bool ocf_metadata_calculate_exception_hndl(ocf_cache_t cache,
+		int64_t unused_lines, int64_t device_lines)
+{
+	static bool warn;
+	int64_t utilization = 0;
+
+	if (!warn) {
+		ocf_cache_log(cache, log_warn,
+				"Metadata size calculation problem\n");
+		warn = true;
+	}
+
+	if (unused_lines < 0)
+		return false;
+
+	/*
+	 * Accepted disk utilization is 90 % off SSD space
+	 */
+	utilization = (device_lines - unused_lines) * 100 / device_lines;
+
+	if (utilization < 90)
+		return false;
+
+	return true;
+}
+
+/*
+ * Algorithm to calculate amount of cache lines taking into account required
+ * space for metadata
+ */
+static int ocf_metadata_calculate_metadata_size(
+		struct ocf_cache *cache,
+		struct ocf_metadata_ctrl *ctrl,
+		const struct ocf_cache_line_settings *settings)
+{
+	int64_t i_diff = 0, diff_lines = 0, cache_lines = ctrl->device_lines;
+	int64_t lowest_diff;
+	ocf_cache_line_t count_pages;
+	uint32_t i;
+
+	OCF_DEBUG_PARAM(cache, "Cache lines = %lld", cache_lines);
+
+	lowest_diff = cache_lines;
+
+	do {
+		count_pages = ctrl->count_pages;
+		for (i = metadata_segment_variable_size_start;
+				i < metadata_segment_max; i++) {
+			struct ocf_metadata_raw *raw = &ctrl->raw_desc[i];
+
+			/* Setup number of entries */
+			raw->entries
+				= ocf_metadata_get_entries(i, cache_lines);
+
+			/*
+			 * Setup SSD location and size
+			 */
+			raw->ssd_pages_offset = count_pages;
+			raw->ssd_pages = OCF_DIV_ROUND_UP(raw->entries,
+					raw->entries_in_page);
+
+			/* Update offset for next container */
+			count_pages += ocf_metadata_raw_size_on_ssd(raw);
+		}
+
+		/*
+		 * Check if max allowed iteration exceeded
+		 */
+		if (i_diff >= OCF_METADATA_HASH_DIFF_MAX) {
+			/*
+			 * Never should be here but try handle this exception
+			 */
+			if (ocf_metadata_calculate_exception_hndl(cache,
+					diff_lines, ctrl->device_lines)) {
+				break;
+			}
+
+			if (i_diff > (2 * OCF_METADATA_HASH_DIFF_MAX)) {
+				/*
+				 * We tried, but we fallen, have to return error
+				 */
+				ocf_cache_log(cache, log_err,
+					"Metadata size calculation ERROR\n");
+				return -1;
+			}
+		}
+
+		/* Calculate diff of cache lines */
+
+		/* Cache size in bytes */
+		diff_lines = ctrl->device_lines * settings->size;
+		/* Sub metadata size which is in 4 kiB unit */
+		diff_lines -= count_pages * PAGE_SIZE;
+		/* Convert back to cache lines */
+		diff_lines /= settings->size;
+		/* Calculate difference */
+		diff_lines -= cache_lines;
+
+		if (diff_lines > 0) {
+			if (diff_lines < lowest_diff)
+				lowest_diff = diff_lines;
+			else if (diff_lines == lowest_diff)
+				break;
+		}
+
+		/* Update new value of cache lines */
+		cache_lines += diff_lines;
+
+		OCF_DEBUG_PARAM(cache, "Diff pages = %lld", diff_lines);
+		OCF_DEBUG_PARAM(cache, "Cache lines = %lld", cache_lines);
+
+		i_diff++;
+
+	} while (diff_lines);
+
+	ctrl->count_pages = count_pages;
+	ctrl->cachelines = cache_lines;
+	OCF_DEBUG_PARAM(cache, "Cache lines = %u", ctrl->cachelines);
+
+	if (ctrl->device_lines < ctrl->cachelines)
+		return -1;
+
+	return 0;
+}
+
+const char * const ocf_metadata_segment_names[] = {
+		[metadata_segment_sb_config]		= "Super block config",
+		[metadata_segment_sb_runtime]		= "Super block runtime",
+		[metadata_segment_reserved]		= "Reserved",
+		[metadata_segment_part_config]		= "Part config",
+		[metadata_segment_part_runtime]		= "Part runtime",
+		[metadata_segment_cleaning]		= "Cleaning",
+		[metadata_segment_eviction]		= "Eviction",
+		[metadata_segment_collision]		= "Collision",
+		[metadata_segment_list_info]		= "List info",
+		[metadata_segment_hash]			= "Hash",
+		[metadata_segment_core_config]		= "Core config",
+		[metadata_segment_core_runtime]		= "Core runtime",
+		[metadata_segment_core_uuid]		= "Core UUID",
+};
+#if 1 == OCF_METADATA_DEBUG
+/*
+ * Debug info functions prints metadata and raw containers information
+ */
+static void ocf_metadata_raw_info(struct ocf_cache *cache,
+		struct ocf_metadata_ctrl *ctrl)
+{
+	uint64_t capacity = 0;
+	uint64_t capacity_sum = 0;
+	uint32_t i = 0;
+	const char *unit;
+
+	for (i = 0; i < metadata_segment_max; i++) {
+		struct ocf_metadata_raw *raw = &(ctrl->raw_desc[i]);
+
+		OCF_DEBUG_PARAM(cache, "Raw : name            = %s",
+				ocf_metadata_segment_names[i]);
+		OCF_DEBUG_PARAM(cache, "    : metadata type   = %u", i);
+		OCF_DEBUG_PARAM(cache, "    : raw type        = %u",
+				raw->raw_type);
+		OCF_DEBUG_PARAM(cache, "    : entry size      = %u",
+				raw->entry_size);
+		OCF_DEBUG_PARAM(cache, "    : entries         = %llu",
+				raw->entries);
+		OCF_DEBUG_PARAM(cache, "    : entries in page = %u",
+				raw->entries_in_page);
+		OCF_DEBUG_PARAM(cache, "    : page offset     = %llu",
+				raw->ssd_pages_offset);
+		OCF_DEBUG_PARAM(cache, "    : pages           = %llu",
+				raw->ssd_pages);
+	}
+
+	/* Provide capacity info */
+	for (i = 0; i < metadata_segment_max; i++) {
+		capacity = ocf_metadata_raw_size_of(cache,
+				&(ctrl->raw_desc[i]));
+
+		capacity_sum += capacity;
+
+		if (capacity / MiB) {
+			capacity = capacity / MiB;
+			unit = "MiB";
+		} else {
+			unit = "KiB";
+			capacity = capacity / KiB;
+
+		}
+
+		OCF_DEBUG_PARAM(cache, "%s capacity %llu %s",
+			ocf_metadata_segment_names[i], capacity, unit);
+	}
+}
+#else
+#define ocf_metadata_raw_info(cache, ctrl)
+#endif
+
+/*
+ * Deinitialize hash metadata interface
+ */
+void ocf_metadata_deinit_variable_size(struct ocf_cache *cache)
+{
+
+	int result = 0;
+	uint32_t i = 0;
+
+	struct ocf_metadata_ctrl *ctrl = (struct ocf_metadata_ctrl *)
+			cache->metadata.priv;
+
+	OCF_DEBUG_TRACE(cache);
+
+	ocf_metadata_concurrency_attached_deinit(&cache->metadata.lock);
+
+	/*
+	 * De initialize RAW types
+	 */
+	for (i = metadata_segment_variable_size_start;
+			i < metadata_segment_max; i++) {
+		result |= ocf_metadata_raw_deinit(cache,
+				&(ctrl->raw_desc[i]));
+	}
+}
+
+static inline void ocf_metadata_config_init(struct ocf_cache *cache,
+		struct ocf_cache_line_settings *settings, size_t size)
+{
+	ENV_BUG_ON(!ocf_cache_line_size_is_valid(size));
+
+	ENV_BUG_ON(env_memset(settings, sizeof(*settings), 0));
+
+	settings->size = size;
+	settings->sector_count = BYTES_TO_SECTORS(settings->size);
+	settings->sector_start = 0;
+	settings->sector_end = settings->sector_count - 1;
+
+	OCF_DEBUG_PARAM(cache, "Cache line size = %lu, bits count = %llu, "
+			"status size = %lu",
+			settings->size, settings->sector_count,
+			ocf_metadata_status_sizeof(settings));
+}
+
+static void ocf_metadata_deinit_fixed_size(struct ocf_cache *cache)
+{
+	int result = 0;
+	uint32_t i;
+
+	struct ocf_metadata_ctrl *ctrl = (struct ocf_metadata_ctrl *)
+			cache->metadata.priv;
+
+	for (i = 0; i < metadata_segment_fixed_size_max; i++) {
+		result |= ocf_metadata_raw_deinit(cache,
+				&(ctrl->raw_desc[i]));
+	}
+
+	env_vfree(ctrl);
+	cache->metadata.priv = NULL;
+
+	if (result)
+		ENV_BUG();
+}
+
+static struct ocf_metadata_ctrl *ocf_metadata_ctrl_init(
+		bool metadata_volatile)
+{
+	struct ocf_metadata_ctrl *ctrl = NULL;
+	uint32_t page = 0;
+	uint32_t i = 0;
+
+	ctrl = env_vzalloc(sizeof(*ctrl));
+	if (!ctrl)
+		return NULL;
+
+	/* Initial setup of RAW containers */
+	for (i = 0; i < metadata_segment_fixed_size_max; i++) {
+		struct ocf_metadata_raw *raw = &ctrl->raw_desc[i];
+
+		raw->metadata_segment = i;
+
+		/* Default type for metadata RAW container */
+		raw->raw_type = metadata_raw_type_ram;
+
+		if (metadata_volatile) {
+			raw->raw_type = metadata_raw_type_volatile;
+		} else if (i == metadata_segment_core_uuid) {
+			raw->raw_type = metadata_raw_type_dynamic;
+		}
+
+		/* Entry size configuration */
+		raw->entry_size
+			= ocf_metadata_get_element_size(i, NULL);
+		raw->entries_in_page = PAGE_SIZE / raw->entry_size;
+
+		/* Setup number of entries */
+		raw->entries = ocf_metadata_get_entries(i, 0);
+
+		/*
+		 * Setup SSD location and size
+		 */
+		raw->ssd_pages_offset = page;
+		raw->ssd_pages = OCF_DIV_ROUND_UP(raw->entries,
+				raw->entries_in_page);
+
+		/* Update offset for next container */
+		page += ocf_metadata_raw_size_on_ssd(raw);
+	}
+
+	ctrl->count_pages = page;
+
+	return ctrl;
+}
+
+static int ocf_metadata_init_fixed_size(struct ocf_cache *cache,
+		ocf_cache_line_size_t cache_line_size)
+{
+	struct ocf_metadata_ctrl *ctrl = NULL;
+	struct ocf_metadata *metadata = &cache->metadata;
+	struct ocf_cache_line_settings *settings =
+		(struct ocf_cache_line_settings *)&metadata->settings;
+	struct ocf_core_meta_config *core_meta_config;
+	struct ocf_core_meta_runtime *core_meta_runtime;
+	struct ocf_user_part_config *part_config;
+	struct ocf_user_part_runtime *part_runtime;
+	ocf_core_t core;
+	ocf_core_id_t core_id;
+	uint32_t i = 0;
+	int result = 0;
+
+	OCF_DEBUG_TRACE(cache);
+
+	ENV_WARN_ON(metadata->priv);
+
+	ocf_metadata_config_init(cache, settings, cache_line_size);
+
+	ctrl = ocf_metadata_ctrl_init(metadata->is_volatile);
+	if (!ctrl)
+		return -OCF_ERR_NO_MEM;
+	metadata->priv = ctrl;
+
+	for (i = 0; i < metadata_segment_fixed_size_max; i++) {
+		result |= ocf_metadata_raw_init(cache, NULL, NULL,
+				&(ctrl->raw_desc[i]));
+		if (result)
+			break;
+	}
+
+	if (result) {
+		ocf_metadata_deinit_fixed_size(cache);
+		return result;
+	}
+
+	cache->conf_meta = METADATA_MEM_POOL(ctrl, metadata_segment_sb_config);
+
+	/* Set partition metadata */
+	part_config = METADATA_MEM_POOL(ctrl, metadata_segment_part_config);
+	part_runtime = METADATA_MEM_POOL(ctrl, metadata_segment_part_runtime);
+
+	for (i = 0; i < OCF_IO_CLASS_MAX + 1; i++) {
+		cache->user_parts[i].config = &part_config[i];
+		cache->user_parts[i].runtime = &part_runtime[i];
+	}
+
+	/* Set core metadata */
+	core_meta_config = METADATA_MEM_POOL(ctrl,
+			metadata_segment_core_config);
+	core_meta_runtime = METADATA_MEM_POOL(ctrl,
+			metadata_segment_core_runtime);
+
+	for_each_core_all(cache, core, core_id) {
+		core->conf_meta = &core_meta_config[core_id];
+		core->runtime_meta = &core_meta_runtime[core_id];
+	}
+
+	return 0;
+}
+
+static void ocf_metadata_flush_lock_collision_page(struct ocf_cache *cache,
+		struct ocf_metadata_raw *raw, uint32_t page)
+
+{
+	ocf_collision_start_exclusive_access(&cache->metadata.lock,
+			page);
+}
+
+static void ocf_metadata_flush_unlock_collision_page(
+		struct ocf_cache *cache, struct ocf_metadata_raw *raw,
+		uint32_t page)
+
+{
+	ocf_collision_end_exclusive_access(&cache->metadata.lock,
+			page);
+}
+
+static void ocf_metadata_init_layout(struct ocf_cache *cache,
+		ocf_metadata_layout_t layout)
+{
+	ENV_BUG_ON(layout >= ocf_metadata_layout_max || layout < 0);
+
+	/* Initialize metadata location interface*/
+	if (cache->device->init_mode == ocf_init_mode_metadata_volatile)
+		layout = ocf_metadata_layout_seq;
+	cache->metadata.layout = layout;
+}
+
+/*
+ * Initialize hash metadata interface
+ */
+int ocf_metadata_init_variable_size(struct ocf_cache *cache,
+		uint64_t device_size, ocf_cache_line_size_t cache_line_size,
+		ocf_metadata_layout_t layout)
+{
+	int result = 0;
+	uint32_t i = 0;
+	ocf_cache_line_t line;
+	struct ocf_metadata_ctrl *ctrl = NULL;
+	struct ocf_cache_line_settings *settings =
+		(struct ocf_cache_line_settings *)&cache->metadata.settings;
+	ocf_flush_page_synch_t lock_page, unlock_page;
+	uint64_t device_lines;
+
+	OCF_DEBUG_TRACE(cache);
+
+	ENV_WARN_ON(!cache->metadata.priv);
+
+	ctrl = cache->metadata.priv;
+
+	device_lines = device_size / cache_line_size;
+	if (device_lines >= (ocf_cache_line_t)(-1)){
+		/* TODO: This is just a rough check. Most optimal one would be
+		 * located in calculate_metadata_size. */
+		ocf_cache_log(cache, log_err, "Device exceeds maximum suported size "
+				"with this cache line size. Try bigger cache line size.");
+		return -OCF_ERR_INVAL_CACHE_DEV;
+	}
+
+	ctrl->device_lines = device_lines;
+
+	if (settings->size != cache_line_size)
+		/* Re-initialize settings with different cache line size */
+		ocf_metadata_config_init(cache, settings, cache_line_size);
+
+	ctrl->mapping_size = ocf_metadata_status_sizeof(settings)
+		+ sizeof(struct ocf_metadata_map);
+
+	ocf_metadata_init_layout(cache, layout);
+
+	/* Initial setup of dynamic size RAW containers */
+	for (i = metadata_segment_variable_size_start;
+			i < metadata_segment_max; i++) {
+		struct ocf_metadata_raw *raw = &ctrl->raw_desc[i];
+
+		raw->metadata_segment = i;
+
+		/* Default type for metadata RAW container */
+		raw->raw_type = metadata_raw_type_ram;
+
+		if (cache->device->init_mode == ocf_init_mode_metadata_volatile) {
+			raw->raw_type = metadata_raw_type_volatile;
+		} else if (i == metadata_segment_collision &&
+				ocf_volume_is_atomic(&cache->device->volume)) {
+			raw->raw_type = metadata_raw_type_atomic;
+		}
+
+		/* Entry size configuration */
+		raw->entry_size
+			= ocf_metadata_get_element_size(i, settings);
+		raw->entries_in_page = PAGE_SIZE / raw->entry_size;
+	}
+
+	if (0 != ocf_metadata_calculate_metadata_size(cache, ctrl,
+			settings)) {
+		return -1;
+	}
+
+	OCF_DEBUG_PARAM(cache, "Metadata begin pages = %u", ctrl->start_page);
+	OCF_DEBUG_PARAM(cache, "Metadata count pages = %u", ctrl->count_pages);
+	OCF_DEBUG_PARAM(cache, "Metadata end pages = %u", ctrl->start_page
+			+ ctrl->count_pages);
+
+	/*
+	 * Initialize all dynamic size  RAW types
+	 */
+	for (i = metadata_segment_variable_size_start;
+			i < metadata_segment_max; i++) {
+		if (i == metadata_segment_collision) {
+			lock_page =
+				ocf_metadata_flush_lock_collision_page;
+			unlock_page =
+				ocf_metadata_flush_unlock_collision_page;
+		} else {
+			lock_page = unlock_page = NULL;
+		}
+
+		result |= ocf_metadata_raw_init(cache, lock_page, unlock_page,
+				&(ctrl->raw_desc[i]));
+
+		if (result)
+			goto finalize;
+	}
+
+	for (i = 0; i < metadata_segment_max; i++) {
+		ocf_cache_log(cache, log_info, "%s offset : %llu kiB\n",
+				ocf_metadata_segment_names[i],
+				ctrl->raw_desc[i].ssd_pages_offset
+				* PAGE_SIZE / KiB);
+		if (i == metadata_segment_sb_config) {
+			ocf_cache_log(cache, log_info, "%s size : %lu B\n",
+				ocf_metadata_segment_names[i],
+				offsetof(struct ocf_superblock_config, checksum)
+				+ sizeof(((struct ocf_superblock_config *)0)
+						->checksum));
+		} else if (i == metadata_segment_sb_runtime) {
+			ocf_cache_log(cache, log_info, "%s size : %lu B\n",
+				ocf_metadata_segment_names[i],
+				sizeof(struct ocf_superblock_runtime));
+		} else {
+			ocf_cache_log(cache, log_info, "%s size : %llu kiB\n",
+					ocf_metadata_segment_names[i],
+					ctrl->raw_desc[i].ssd_pages
+					* PAGE_SIZE / KiB);
+		}
+	}
+
+finalize:
+	if (result) {
+		/*
+		 * Hash De-Init also contains RAW deinitialization
+		 */
+		ocf_metadata_deinit_variable_size(cache);
+		return result;
+	}
+
+	cache->device->runtime_meta = METADATA_MEM_POOL(ctrl,
+			metadata_segment_sb_runtime);
+
+	cache->device->collision_table_entries = ctrl->cachelines;
+
+	cache->device->hash_table_entries =
+			ctrl->raw_desc[metadata_segment_hash].entries;
+
+	cache->device->metadata_offset = ctrl->count_pages * PAGE_SIZE;
+
+	cache->conf_meta->cachelines = ctrl->cachelines;
+	cache->conf_meta->line_size = cache_line_size;
+
+	ocf_metadata_raw_info(cache, ctrl);
+
+	ocf_cache_log(cache, log_info, "Cache line size: %llu kiB\n",
+			settings->size / KiB);
+
+	ocf_cache_log(cache, log_info, "Metadata capacity: %llu MiB\n",
+			(uint64_t)ocf_metadata_size_of(cache) / MiB);
+
+	/*
+	 * Self test of metadata
+	 */
+	for (line = 0; line < cache->device->collision_table_entries; line++) {
+		ocf_cache_line_t phy, lg;
+
+		phy = ocf_metadata_map_lg2phy(cache, line);
+		lg = ocf_metadata_map_phy2lg(cache, phy);
+
+		if (line != lg) {
+			result = -OCF_ERR_INVAL;
+			break;
+		}
+		env_cond_resched();
+	}
+
+	if (result == 0) {
+		ocf_cache_log(cache, log_info,
+				"OCF metadata self-test PASSED\n");
+	} else {
+		ocf_cache_log(cache, log_err,
+				"OCF metadata self-test ERROR\n");
+	}
+
+	result = ocf_metadata_concurrency_attached_init(&cache->metadata.lock,
+			cache, ctrl->raw_desc[metadata_segment_hash].entries,
+			(uint32_t)ctrl->raw_desc[metadata_segment_collision].
+			ssd_pages);
+	if (result) {
+		ocf_cache_log(cache, log_err, "Failed to initialize attached "
+				"metadata concurrency\n");
+		ocf_metadata_deinit_variable_size(cache);
+		return  result;
+	}
+
+	return 0;
+}
+
+static inline void _ocf_init_collision_entry(struct ocf_cache *cache,
+		ocf_cache_line_t idx)
+{
+	ocf_cache_line_t invalid_idx = cache->device->collision_table_entries;
+
+	ocf_metadata_set_collision_info(cache, idx, invalid_idx, invalid_idx);
+	ocf_metadata_set_core_info(cache, idx,
+			OCF_CORE_MAX, ULONG_MAX);
+	metadata_init_status_bits(cache, idx);
+}
+
+/*
+ * Initialize collision table
+ */
+void ocf_metadata_init_collision(struct ocf_cache *cache)
+{
+	unsigned int i;
+	unsigned int step = 0;
+
+	for (i = 0; i < cache->device->collision_table_entries; i++) {
+		_ocf_init_collision_entry(cache, i);
+		OCF_COND_RESCHED_DEFAULT(step);
+	}
+}
+
+/*
+ * Initialize hash table
+ */
+void ocf_metadata_init_hash_table(struct ocf_cache *cache)
+{
+	unsigned int i;
+	unsigned int hash_table_entries = cache->device->hash_table_entries;
+	ocf_cache_line_t invalid_idx = cache->device->collision_table_entries;
+
+	/* Init hash table */
+	for (i = 0; i < hash_table_entries; i++) {
+		/* hash_table contains indexes from collision_table
+		 * thus it shall be initialized in improper values
+		 * from collision_table
+		 **/
+		ocf_metadata_set_hash(cache, i, invalid_idx);
+	}
+
+}
+
+/*
+ * Get count of pages that is dedicated for metadata
+ */
+ocf_cache_line_t ocf_metadata_get_pages_count(struct ocf_cache *cache)
+{
+	struct ocf_metadata_ctrl *ctrl = NULL;
+
+	OCF_DEBUG_TRACE(cache);
+
+	ctrl = (struct ocf_metadata_ctrl *) cache->metadata.priv;
+
+	return ctrl->count_pages;
+}
+
+/*
+ * Get amount of cache lines
+ */
+ocf_cache_line_t ocf_metadata_get_cachelines_count(
+		struct ocf_cache *cache)
+{
+	struct ocf_metadata_ctrl *ctrl = NULL;
+
+	OCF_DEBUG_TRACE(cache);
+
+	ctrl = (struct ocf_metadata_ctrl *) cache->metadata.priv;
+
+	return ctrl->cachelines;
+}
+
+size_t ocf_metadata_size_of(struct ocf_cache *cache)
+{
+	uint32_t i = 0;
+	size_t size = 0;
+	struct ocf_metadata_ctrl *ctrl = NULL;
+
+	OCF_DEBUG_TRACE(cache);
+
+	ctrl = (struct ocf_metadata_ctrl *) cache->metadata.priv;
+
+	/*
+	 * Get size of all RAW metadata container
+	 */
+	for (i = 0; i < metadata_segment_max; i++) {
+		size += ocf_metadata_raw_size_of(cache,
+				&(ctrl->raw_desc[i]));
+	}
+
+	/* Get additional part of memory footprint */
+
+	/* Cache concurrency mechnism */
+	size += ocf_cache_line_concurrency_size_of(cache);
+
+	return size;
+}
+/*******************************************************************************
+ * RESERVED AREA
+ ******************************************************************************/
+
+uint64_t ocf_metadata_get_reserved_lba(
+		struct ocf_cache *cache)
+{
+	struct ocf_metadata_ctrl *ctrl;
+
+	OCF_DEBUG_TRACE(cache);
+
+	ctrl = (struct ocf_metadata_ctrl *) cache->metadata.priv;
+	return ctrl->raw_desc[metadata_segment_reserved].ssd_pages_offset *
+			PAGE_SIZE;
+}
+
+/*******************************************************************************
+ * FLUSH AND LOAD ALL
+ ******************************************************************************/
+
+static void ocf_metadata_flush_all_set_status_complete(
+		void *priv, int error)
+{
+	struct ocf_metadata_context *context = priv;
+
+	OCF_PL_NEXT_ON_SUCCESS_RET(context->pipeline, error);
+}
+
+static void ocf_metadata_flush_all_set_status(ocf_pipeline_t pipeline,
+		void *priv, ocf_pipeline_arg_t arg)
+{
+	struct ocf_metadata_context *context = priv;
+	ocf_cache_t cache = context->cache;
+	enum ocf_metadata_shutdown_status shutdown_status =
+			ocf_pipeline_arg_get_int(arg);
+
+	ocf_metadata_set_shutdown_status(cache, shutdown_status,
+			ocf_metadata_flush_all_set_status_complete,
+			context);
+}
+
+static void ocf_metadata_flush_all_finish(ocf_pipeline_t pipeline,
+		void *priv, int error)
+{
+	struct ocf_metadata_context *context = priv;
+	ocf_cache_t cache = context->cache;
+
+	if (error) {
+		ocf_cache_log(cache, log_err, "Metadata Flush ERROR\n");
+		ocf_metadata_error(cache);
+		goto out;
+	}
+
+	ocf_cache_log(cache, log_info, "Done saving cache state!\n");
+
+out:
+	context->cmpl(context->priv, error);
+	ocf_pipeline_destroy(pipeline);
+}
+
+struct ocf_pipeline_arg ocf_metadata_flush_all_args[] = {
+	OCF_PL_ARG_INT(metadata_segment_sb_runtime),
+	OCF_PL_ARG_INT(metadata_segment_part_runtime),
+	OCF_PL_ARG_INT(metadata_segment_core_runtime),
+	OCF_PL_ARG_INT(metadata_segment_cleaning),
+	OCF_PL_ARG_INT(metadata_segment_eviction),
+	OCF_PL_ARG_INT(metadata_segment_collision),
+	OCF_PL_ARG_INT(metadata_segment_list_info),
+	OCF_PL_ARG_INT(metadata_segment_hash),
+	OCF_PL_ARG_TERMINATOR(),
+};
+
+struct ocf_pipeline_properties ocf_metadata_flush_all_pipeline_props = {
+	.priv_size = sizeof(struct ocf_metadata_context),
+	.finish = ocf_metadata_flush_all_finish,
+	.steps = {
+		OCF_PL_STEP_ARG_INT(ocf_metadata_flush_all_set_status,
+				ocf_metadata_dirty_shutdown),
+		OCF_PL_STEP_FOREACH(ocf_metadata_flush_segment,
+				ocf_metadata_flush_all_args),
+		OCF_PL_STEP_FOREACH(ocf_metadata_calculate_crc,
+				ocf_metadata_flush_all_args),
+		OCF_PL_STEP_ARG_INT(ocf_metadata_flush_all_set_status,
+				ocf_metadata_clean_shutdown),
+		OCF_PL_STEP_TERMINATOR(),
+	},
+};
+
+/*
+ * Flush all metadata
+ */
+void ocf_metadata_flush_all(ocf_cache_t cache,
+		ocf_metadata_end_t cmpl, void *priv)
+{
+	struct ocf_metadata_context *context;
+	ocf_pipeline_t pipeline;
+	int result;
+
+	OCF_DEBUG_TRACE(cache);
+
+	result = ocf_pipeline_create(&pipeline, cache,
+			&ocf_metadata_flush_all_pipeline_props);
+	if (result)
+		OCF_CMPL_RET(priv, result);
+
+	context = ocf_pipeline_get_priv(pipeline);
+
+	context->cmpl = cmpl;
+	context->priv = priv;
+	context->pipeline = pipeline;
+	context->cache = cache;
+
+	ocf_pipeline_next(pipeline);
+}
+
+/*
+ * Flush specified cache line
+ */
+void ocf_metadata_flush_mark(struct ocf_cache *cache,
+		struct ocf_request *req, uint32_t map_idx, int to_state,
+		uint8_t start, uint8_t stop)
+{
+	struct ocf_metadata_ctrl *ctrl = NULL;
+
+	OCF_DEBUG_TRACE(cache);
+
+	ctrl = (struct ocf_metadata_ctrl *) cache->metadata.priv;
+
+	/*
+	 * Mark all required metadata elements to make given metadata cache
+	 * line persistent in case of recovery
+	 */
+
+	/* Collision table to get mapping cache line to HDD sector*/
+	ocf_metadata_raw_flush_mark(cache,
+			&(ctrl->raw_desc[metadata_segment_collision]),
+			req, map_idx, to_state, start, stop);
+}
+
+/*
+ * Flush specified cache lines asynchronously
+ */
+void ocf_metadata_flush_do_asynch(struct ocf_cache *cache,
+		struct ocf_request *req, ocf_req_end_t complete)
+{
+	int result = 0;
+	struct ocf_metadata_ctrl *ctrl = NULL;
+
+	OCF_DEBUG_TRACE(cache);
+
+	ctrl = (struct ocf_metadata_ctrl *) cache->metadata.priv;
+
+	/*
+	 * Flush all required metadata elements to make given metadata cache
+	 * line persistent in case of recovery
+	 */
+
+	env_atomic_inc(&req->req_remaining); /* Core device IO */
+
+	result |= ocf_metadata_raw_flush_do_asynch(cache, req,
+			&(ctrl->raw_desc[metadata_segment_collision]),
+			complete);
+
+	if (result) {
+		ocf_metadata_error(cache);
+		ocf_cache_log(cache, log_err, "Metadata Flush ERROR\n");
+	}
+}
+
+static void ocf_metadata_load_all_finish(ocf_pipeline_t pipeline,
+		void *priv, int error)
+{
+	struct ocf_metadata_context *context = priv;
+	ocf_cache_t cache = context->cache;
+
+	if (error) {
+		ocf_cache_log(cache, log_err, "Metadata read FAILURE\n");
+		ocf_metadata_error(cache);
+		goto out;
+	}
+
+	ocf_cache_log(cache, log_info, "Done loading cache state\n");
+
+out:
+	context->cmpl(context->priv, error);
+	ocf_pipeline_destroy(pipeline);
+}
+
+struct ocf_pipeline_arg ocf_metadata_load_all_args[] = {
+	OCF_PL_ARG_INT(metadata_segment_core_runtime),
+	OCF_PL_ARG_INT(metadata_segment_cleaning),
+	OCF_PL_ARG_INT(metadata_segment_eviction),
+	OCF_PL_ARG_INT(metadata_segment_collision),
+	OCF_PL_ARG_INT(metadata_segment_list_info),
+	OCF_PL_ARG_INT(metadata_segment_hash),
+	OCF_PL_ARG_TERMINATOR(),
+};
+
+struct ocf_pipeline_properties ocf_metadata_load_all_pipeline_props = {
+	.priv_size = sizeof(struct ocf_metadata_context),
+	.finish = ocf_metadata_load_all_finish,
+	.steps = {
+		OCF_PL_STEP_FOREACH(ocf_metadata_load_segment,
+				ocf_metadata_load_all_args),
+		OCF_PL_STEP_FOREACH(ocf_metadata_check_crc,
+				ocf_metadata_load_all_args),
+		OCF_PL_STEP_TERMINATOR(),
+	},
+};
+
+/*
+ * Load all metadata
+ */
+void ocf_metadata_load_all(ocf_cache_t cache,
+		ocf_metadata_end_t cmpl, void *priv)
+{
+	struct ocf_metadata_context *context;
+	ocf_pipeline_t pipeline;
+	int result;
+
+	OCF_DEBUG_TRACE(cache);
+
+	result = ocf_pipeline_create(&pipeline, cache,
+			&ocf_metadata_load_all_pipeline_props);
+	if (result)
+		OCF_CMPL_RET(priv, result);
+
+	context = ocf_pipeline_get_priv(pipeline);
+
+	context->cmpl = cmpl;
+	context->priv = priv;
+	context->pipeline = pipeline;
+	context->cache = cache;
+
+	ocf_pipeline_next(pipeline);
+}
+
+static void _recovery_rebuild_cline_metadata(ocf_cache_t cache,
+		ocf_core_id_t core_id, uint64_t core_line,
+		ocf_cache_line_t cache_line)
+{
+	ocf_core_t core = ocf_cache_get_core(cache, core_id);
+	ocf_part_id_t part_id;
+	ocf_cache_line_t hash_index;
+
+	part_id = PARTITION_DEFAULT;
+
+	ocf_metadata_add_to_partition(cache, part_id, cache_line);
+
+	hash_index = ocf_metadata_hash_func(cache, core_line, core_id);
+	ocf_metadata_add_to_collision(cache, core_id, core_line, hash_index,
+			cache_line);
+
+	ocf_eviction_init_cache_line(cache, cache_line);
+
+	ocf_eviction_set_hot_cache_line(cache, cache_line);
+
+	env_atomic_inc(&core->runtime_meta->cached_clines);
+	env_atomic_inc(&core->runtime_meta->
+			part_counters[part_id].cached_clines);
+
+	if (metadata_test_dirty(cache, cache_line)) {
+		env_atomic_inc(&core->runtime_meta->dirty_clines);
+		env_atomic_inc(&core->runtime_meta->
+				part_counters[part_id].dirty_clines);
+		env_atomic64_cmpxchg(&core->runtime_meta->dirty_since,
+				0, env_get_tick_count());
+	}
+}
+
+static void _recovery_invalidate_clean_sec(struct ocf_cache *cache,
+		ocf_cache_line_t cline)
+{
+	uint8_t i;
+
+	for (i = ocf_line_start_sector(cache);
+	     i <= ocf_line_end_sector(cache); i++) {
+		if (!metadata_test_dirty_one(cache, cline, i)) {
+			/* Invalidate clear sectors */
+			metadata_clear_valid_sec_one(cache, cline, i);
+		}
+	}
+}
+
+static void _recovery_reset_cline_metadata(struct ocf_cache *cache,
+		ocf_cache_line_t cline)
+{
+	ocf_cleaning_t clean_policy_type;
+
+	ocf_metadata_set_core_info(cache, cline, OCF_CORE_MAX, ULLONG_MAX);
+
+	metadata_clear_valid(cache, cline);
+
+	clean_policy_type = cache->conf_meta->cleaning_policy_type;
+
+	ENV_BUG_ON(clean_policy_type >= ocf_cleaning_max);
+
+	if (cleaning_policy_ops[clean_policy_type].init_cache_block != NULL)
+		cleaning_policy_ops[clean_policy_type].
+			init_cache_block(cache, cline);
+}
+
+static void _recovery_rebuild_metadata(ocf_pipeline_t pipeline,
+		void *priv, ocf_pipeline_arg_t arg)
+{
+	struct ocf_metadata_context *context = priv;
+	bool dirty_only = ocf_pipeline_arg_get_int(arg);
+	ocf_cache_t cache = context->cache;
+	ocf_cache_line_t cline;
+	ocf_core_id_t core_id;
+	uint64_t core_line;
+	unsigned char step = 0;
+	const uint64_t collision_table_entries =
+			ocf_metadata_collision_table_entries(cache);
+
+	ocf_metadata_start_exclusive_access(&cache->metadata.lock);
+
+	for (cline = 0; cline < collision_table_entries; cline++) {
+		ocf_metadata_get_core_info(cache, cline, &core_id, &core_line);
+		if (core_id != OCF_CORE_MAX &&
+				(!dirty_only || metadata_test_dirty(cache,
+						cline))) {
+			/* Rebuild metadata for mapped cache line */
+			_recovery_rebuild_cline_metadata(cache, core_id,
+					core_line, cline);
+			if (dirty_only)
+				_recovery_invalidate_clean_sec(cache, cline);
+		} else {
+			/* Reset metadata for not mapped or clean cache line */
+			_recovery_reset_cline_metadata(cache, cline);
+		}
+
+		OCF_COND_RESCHED(step, 128);
+	}
+
+	ocf_metadata_end_exclusive_access(&cache->metadata.lock);
+
+	ocf_pipeline_next(pipeline);
+}
+
+static void ocf_metadata_load_recovery_legacy_finish(
+		ocf_pipeline_t pipeline, void *priv, int error)
+{
+	struct ocf_metadata_context *context = priv;
+	ocf_cache_t cache = context->cache;
+
+	if (error) {
+		ocf_cache_log(cache, log_err,
+				"Metadata read for recovery FAILURE\n");
+		ocf_metadata_error(cache);
+		goto out;
+	}
+
+	ocf_cache_log(cache, log_info, "Done loading cache state\n");
+
+out:
+	context->cmpl(context->priv, error);
+	ocf_pipeline_destroy(pipeline);
+}
+
+struct ocf_pipeline_properties
+ocf_metadata_load_recovery_legacy_pl_props = {
+	.priv_size = sizeof(struct ocf_metadata_context),
+	.finish = ocf_metadata_load_recovery_legacy_finish,
+	.steps = {
+		OCF_PL_STEP_ARG_INT(ocf_metadata_load_segment,
+				metadata_segment_collision),
+		OCF_PL_STEP_ARG_INT(_recovery_rebuild_metadata, true),
+		OCF_PL_STEP_TERMINATOR(),
+	},
+};
+
+static void _ocf_metadata_load_recovery_legacy(ocf_cache_t cache,
+		ocf_metadata_end_t cmpl, void *priv)
+{
+	struct ocf_metadata_context *context;
+	ocf_pipeline_t pipeline;
+	int result;
+
+	OCF_DEBUG_TRACE(cache);
+
+	result = ocf_pipeline_create(&pipeline, cache,
+			&ocf_metadata_load_recovery_legacy_pl_props);
+	if (result)
+		OCF_CMPL_RET(priv, result);
+
+	context = ocf_pipeline_get_priv(pipeline);
+
+	context->cmpl = cmpl;
+	context->priv = priv;
+	context->pipeline = pipeline;
+	context->cache = cache;
+
+	ocf_pipeline_next(pipeline);
+}
+
+static ocf_core_id_t _ocf_metadata_find_core_by_seq(
+		struct ocf_cache *cache, ocf_seq_no_t seq_no)
+{
+	ocf_core_t core;
+	ocf_core_id_t core_id;
+
+	if (seq_no == OCF_SEQ_NO_INVALID)
+		return OCF_CORE_ID_INVALID;
+
+	for_each_core_all(cache, core, core_id) {
+		if (core->conf_meta->seq_no == seq_no)
+			break;
+	}
+
+	return core_id;
+}
+
+static void ocf_metadata_load_atomic_metadata_complete(
+		ocf_cache_t cache, void *priv, int error)
+{
+	struct ocf_metadata_context *context = priv;
+
+	OCF_PL_NEXT_ON_SUCCESS_RET(context->pipeline, error);
+}
+
+static int ocf_metadata_load_atomic_metadata_drain(void *priv,
+		uint64_t sector_addr, uint32_t sector_no, ctx_data_t *data)
+{
+	struct ocf_metadata_context *context = priv;
+	ocf_cache_t cache = context->cache;
+	struct ocf_atomic_metadata meta;
+	ocf_cache_line_t line = 0;
+	uint8_t pos = 0;
+	ocf_seq_no_t core_seq_no = OCF_SEQ_NO_INVALID;
+	ocf_core_id_t core_id = OCF_CORE_ID_INVALID;
+	uint64_t core_line = 0;
+	bool core_line_ok = false;
+	uint32_t i;
+
+	for (i = 0; i < sector_no; i++) {
+		ctx_data_rd_check(cache->owner, &meta, data, sizeof(meta));
+
+		line = (sector_addr + i) / ocf_line_sectors(cache);
+		line = ocf_metadata_map_phy2lg(cache, line);
+		pos = (sector_addr + i) % ocf_line_sectors(cache);
+		core_seq_no = meta.core_seq_no;
+		core_line = meta.core_line;
+
+		/* Look for core with sequence number same as cache line */
+		core_id = _ocf_metadata_find_core_by_seq(
+				cache, core_seq_no);
+
+		if (pos == 0)
+			core_line_ok = false;
+
+		if (meta.valid && core_id != OCF_CORE_ID_INVALID) {
+			if (!core_line_ok) {
+				ocf_metadata_set_core_info(cache, line,
+							core_id, core_line);
+				core_line_ok = true;
+			}
+
+			metadata_set_valid_sec_one(cache, line, pos);
+			meta.dirty ?
+				metadata_set_dirty_sec_one(cache, line, pos) :
+				metadata_clear_dirty_sec_one(cache, line, pos);
+		}
+	}
+
+	return 0;
+}
+
+static void ocf_metadata_load_atomic_metadata(
+		ocf_pipeline_t pipeline, void *priv, ocf_pipeline_arg_t arg)
+{
+	struct ocf_metadata_context *context = priv;
+	ocf_cache_t cache = context->cache;
+	int result;
+
+	result = metadata_io_read_i_atomic(cache, cache->mngt_queue,
+			context, ocf_metadata_load_atomic_metadata_drain,
+			ocf_metadata_load_atomic_metadata_complete);
+	if (result) {
+		ocf_metadata_error(cache);
+		ocf_cache_log(cache, log_err,
+				"Metadata read for recovery FAILURE\n");
+		OCF_PL_FINISH_RET(pipeline, result);
+	}
+}
+
+static void ocf_metadata_load_recovery_atomic_finish(
+		ocf_pipeline_t pipeline, void *priv, int error)
+{
+	struct ocf_metadata_context *context = priv;
+	ocf_cache_t cache = context->cache;
+
+	if (error) {
+		ocf_cache_log(cache, log_err,
+				"Metadata read for recovery FAILURE\n");
+		ocf_metadata_error(cache);
+	}
+
+	context->cmpl(context->priv, error);
+	ocf_pipeline_destroy(pipeline);
+}
+
+struct ocf_pipeline_properties
+ocf_metadata_load_recovery_atomic_pl_props = {
+	.priv_size = sizeof(struct ocf_metadata_context),
+	.finish = ocf_metadata_load_recovery_atomic_finish,
+	.steps = {
+		OCF_PL_STEP(ocf_metadata_load_atomic_metadata),
+		OCF_PL_STEP_ARG_INT(_recovery_rebuild_metadata, false),
+		OCF_PL_STEP_TERMINATOR(),
+	},
+};
+
+/*
+ * RAM Implementation - Load all metadata elements from SSD
+ */
+static void _ocf_metadata_load_recovery_atomic(ocf_cache_t cache,
+		ocf_metadata_end_t cmpl, void *priv)
+{
+	struct ocf_metadata_context *context;
+	ocf_pipeline_t pipeline;
+	int result;
+
+	OCF_DEBUG_TRACE(cache);
+
+	result = ocf_pipeline_create(&pipeline, cache,
+			&ocf_metadata_load_recovery_atomic_pl_props);
+	if (result)
+		OCF_CMPL_RET(priv, result);
+
+	context = ocf_pipeline_get_priv(pipeline);
+
+	context->cmpl = cmpl;
+	context->priv = priv;
+	context->pipeline = pipeline;
+	context->cache = cache;
+
+	ocf_pipeline_next(pipeline);
+}
+
+/*
+ * Load for recovery - Load only data that is required for recovery procedure
+ */
+void ocf_metadata_load_recovery(ocf_cache_t cache,
+		ocf_metadata_end_t cmpl, void *priv)
+{
+	OCF_DEBUG_TRACE(cache);
+
+	if (ocf_volume_is_atomic(&cache->device->volume))
+		_ocf_metadata_load_recovery_atomic(cache, cmpl, priv);
+	else
+		_ocf_metadata_load_recovery_legacy(cache, cmpl, priv);
+}
+
+/*******************************************************************************
+ * Core and part id
+ ******************************************************************************/
+
+void ocf_metadata_get_core_and_part_id(struct ocf_cache *cache,
+		ocf_cache_line_t line, ocf_core_id_t *core_id,
+		ocf_part_id_t *part_id)
+{
+	const struct ocf_metadata_map *collision;
+	const struct ocf_metadata_list_info *info;
+	struct ocf_metadata_ctrl *ctrl =
+		(struct ocf_metadata_ctrl *) cache->metadata.priv;
+
+	collision = ocf_metadata_raw_rd_access(cache,
+			&(ctrl->raw_desc[metadata_segment_collision]), line);
+
+	info =  ocf_metadata_raw_rd_access(cache,
+			&(ctrl->raw_desc[metadata_segment_list_info]), line);
+
+	if (collision && info) {
+		if (core_id)
+			*core_id = collision->core_id;
+		if (part_id)
+			*part_id = info->partition_id;
+	} else {
+		ocf_metadata_error(cache);
+		if (core_id)
+			*core_id = OCF_CORE_MAX;
+		if (part_id)
+			*part_id = PARTITION_DEFAULT;
+	}
+}
+/*******************************************************************************
+ * Hash Table
+ ******************************************************************************/
+
+/*
+ * Hash Table - Get
+ */
+ocf_cache_line_t ocf_metadata_get_hash(struct ocf_cache *cache,
+		ocf_cache_line_t index)
+{
+	struct ocf_metadata_ctrl *ctrl
+		= (struct ocf_metadata_ctrl *) cache->metadata.priv;
+
+	return *(ocf_cache_line_t *)ocf_metadata_raw_rd_access(cache,
+			&(ctrl->raw_desc[metadata_segment_hash]), index);
+}
+
+/*
+ * Hash Table - Set
+ */
+void ocf_metadata_set_hash(struct ocf_cache *cache, ocf_cache_line_t index,
+		ocf_cache_line_t line)
+{
+	struct ocf_metadata_ctrl *ctrl
+		= (struct ocf_metadata_ctrl *) cache->metadata.priv;
+
+	*(ocf_cache_line_t *)ocf_metadata_raw_wr_access(cache,
+			&(ctrl->raw_desc[metadata_segment_hash]), index) = line;
+}
+
+/*******************************************************************************
+ *  Bitmap status
+ ******************************************************************************/
+
+#include "metadata_bit.h"
+
+#define _ocf_metadata_funcs_5arg(what) \
+bool ocf_metadata_##what(struct ocf_cache *cache, \
+	 ocf_cache_line_t line, uint8_t start, uint8_t stop, bool all) \
+{ \
+	switch (cache->metadata.settings.size) { \
+		case ocf_cache_line_size_4: \
+			return _ocf_metadata_##what##_u8(cache, line, start, stop, all); \
+		case ocf_cache_line_size_8: \
+			return _ocf_metadata_##what##_u16(cache, line, start, stop, all); \
+		case ocf_cache_line_size_16: \
+			return _ocf_metadata_##what##_u32(cache, line, start, stop, all); \
+		case ocf_cache_line_size_32: \
+			return _ocf_metadata_##what##_u64(cache, line, start, stop, all); \
+		case ocf_cache_line_size_64: \
+			return _ocf_metadata_##what##_u128(cache, line, start, stop, all); \
+		case ocf_cache_line_size_none: \
+		default: \
+			ENV_BUG_ON(1); \
+			return false; \
+	} \
+} \
+
+
+#define _ocf_metadata_funcs_4arg(what) \
+bool ocf_metadata_##what(struct ocf_cache *cache, \
+	 ocf_cache_line_t line, uint8_t start, uint8_t stop) \
+{ \
+	switch (cache->metadata.settings.size) { \
+		case ocf_cache_line_size_4: \
+			return _ocf_metadata_##what##_u8(cache, line, start, stop); \
+		case ocf_cache_line_size_8: \
+			return _ocf_metadata_##what##_u16(cache, line, start, stop); \
+		case ocf_cache_line_size_16: \
+			return _ocf_metadata_##what##_u32(cache, line, start, stop); \
+		case ocf_cache_line_size_32: \
+			return _ocf_metadata_##what##_u64(cache, line, start, stop); \
+		case ocf_cache_line_size_64: \
+			return _ocf_metadata_##what##_u128(cache, line, start, stop); \
+		case ocf_cache_line_size_none: \
+		default: \
+			ENV_BUG_ON(1); \
+			return false; \
+	} \
+} \
+
+#define _ocf_metadata_funcs(what) \
+	_ocf_metadata_funcs_5arg(test_##what) \
+	_ocf_metadata_funcs_4arg(test_out_##what) \
+	_ocf_metadata_funcs_4arg(clear_##what) \
+	_ocf_metadata_funcs_4arg(set_##what) \
+	_ocf_metadata_funcs_5arg(test_and_set_##what) \
+	_ocf_metadata_funcs_5arg(test_and_clear_##what)
+
+_ocf_metadata_funcs(dirty)
+_ocf_metadata_funcs(valid)
 
 int ocf_metadata_init(struct ocf_cache *cache,
 		ocf_cache_line_size_t cache_line_size)
@@ -235,6 +1763,310 @@ void ocf_metadata_load_properties(ocf_volume_t volume,
 		OCF_CMPL_RET(priv, result, NULL);
 }
 
+/* metadata segment data + iterators */
+struct query_cores_data
+{
+	/* array of data */
+	ctx_data_t *data;
+	/* current metadata entry counter */
+	uint32_t entry;
+	/* number of entries per page */
+	uint32_t entries_in_page;
+};
+
+/* query cores context */
+struct query_cores_context
+{
+	ocf_ctx_t ctx;
+
+	struct ocf_superblock_config superblock;
+	struct ocf_metadata_uuid muuid;
+
+	struct {
+		struct query_cores_data core_uuids;
+		struct query_cores_data core_config;
+		struct query_cores_data superblock;
+	} data;
+
+	env_atomic count;
+	env_atomic error;
+
+	/* OCF entry point parameters */
+	struct {
+		struct ocf_volume_uuid *uuids;
+		uint32_t uuids_count;
+		void *priv;
+		ocf_metadata_query_cores_end_t cmpl;
+	} params;
+};
+
+/* copy next metadata entry from data to memory buffer */
+static void ocf_metadata_query_cores_data_read(ocf_ctx_t ctx,
+		struct query_cores_data *data,
+		void *buf, uint32_t size)
+{
+	if (data->entry > 0 && data->entry % data->entries_in_page == 0) {
+		ctx_data_seek_check(ctx, data->data,
+				ctx_data_seek_current,
+				PAGE_SIZE - data->entries_in_page * size);
+	}
+
+	ctx_data_rd_check(ctx, buf, data->data, size);
+
+	++data->entry;
+}
+
+static void ocf_metadata_query_cores_end(struct query_cores_context *context,
+		int error)
+{
+	ocf_ctx_t ctx = context->ctx;
+	unsigned i, core_idx;
+	struct ocf_metadata_uuid *muuid = &context->muuid;
+	struct ocf_core_meta_config core_config;
+	unsigned core_count = 0;
+	unsigned long valid_core_bitmap[(OCF_CORE_MAX /
+			(sizeof(unsigned long) * 8)) + 1];
+	unsigned out_cores;
+
+	if (error)
+		env_atomic_cmpxchg(&context->error, 0, error);
+
+	if (env_atomic_dec_return(&context->count))
+		return;
+
+	error = env_atomic_read(&context->error);
+	if (error)
+		goto exit;
+
+	/* read superblock */
+	ctx_data_rd_check(ctx, &context->superblock,
+			context->data.superblock.data,
+			sizeof(context->superblock));
+
+	if (context->superblock.magic_number != CACHE_MAGIC_NUMBER) {
+		error = -OCF_ERR_NO_METADATA;
+		goto exit;
+	}
+
+	env_memset(&valid_core_bitmap, sizeof(valid_core_bitmap), 0);
+
+	/* read valid cores from core config segment */
+	for (i = 0; i < OCF_CORE_MAX; i++) {
+		ocf_metadata_query_cores_data_read(ctx,
+				&context->data.core_config,
+				&core_config, sizeof(core_config));
+		if (core_config.valid) {
+			env_bit_set(i, valid_core_bitmap);
+			++core_count;
+		}
+	}
+
+	/* read core uuids */
+	out_cores = OCF_MIN(core_count, context->params.uuids_count);
+	for (i = 0, core_idx = 0; i < OCF_CORE_MAX && core_idx < out_cores;
+			i++) {
+		ocf_metadata_query_cores_data_read(ctx,
+				&context->data.core_uuids,
+				muuid, sizeof(*muuid));
+
+		if (!env_bit_test(i, valid_core_bitmap))
+			continue;
+
+		if (muuid->size > OCF_VOLUME_UUID_MAX_SIZE) {
+			error = -OCF_ERR_INVAL;
+			goto exit;
+		}
+		if (muuid->size > context->params.uuids[core_idx].size) {
+			error = -OCF_ERR_INVAL;
+			goto exit;
+		}
+
+		error = env_memcpy(context->params.uuids[core_idx].data,
+				context->params.uuids[core_idx].size,
+				muuid->data, muuid->size);
+		if (error)
+			goto exit;
+		context->params.uuids[core_idx].size = muuid->size;
+
+		++core_idx;
+	}
+
+exit:
+	/* provide actual core count to completion */
+	context->params.cmpl(context->params.priv, error, core_count);
+
+	/* free data */
+	ctx_data_free(ctx, context->data.core_uuids.data);
+	ctx_data_free(ctx, context->data.core_config.data);
+	ctx_data_free(ctx, context->data.superblock.data);
+
+	env_secure_free(context, sizeof(*context));
+}
+
+static void ocf_metadata_query_cores_end_io(struct ocf_io *io, int error)
+{
+	struct query_cores_context *context = io->priv1;
+
+	ocf_io_put(io);
+	ocf_metadata_query_cores_end(context, error);
+}
+
+static int ocf_metadata_query_cores_io(ocf_volume_t volume,
+		struct query_cores_context *context, ctx_data_t *data,
+		uint32_t offset, uint64_t page, uint32_t num_pages)
+{
+	struct ocf_io *io;
+	int err;
+
+	env_atomic_inc(&context->count);
+
+	/* Allocate new IO */
+	io = ocf_volume_new_io(volume, NULL,
+			PAGES_TO_BYTES(page),
+			PAGES_TO_BYTES(num_pages),
+			OCF_READ, 0, 0);
+	if (!io) {
+		err = -OCF_ERR_NO_MEM;
+		goto exit_error;
+	}
+
+	/* Setup IO */
+	ocf_io_set_cmpl(io, context, NULL,
+			ocf_metadata_query_cores_end_io);
+	err = ocf_io_set_data(io, data, PAGES_TO_BYTES(offset));
+	if (err) {
+		ocf_io_put(io);
+		goto exit_error;
+	}
+
+	ocf_volume_submit_io(io);
+
+	return 0;
+
+exit_error:
+	env_atomic_dec(&context->count);
+	return err;
+}
+
+int ocf_metadata_query_cores_segment_io(
+		 struct query_cores_context *context,
+		ocf_ctx_t owner,
+		ocf_volume_t volume,
+		enum ocf_metadata_segment segment,
+		struct ocf_metadata_ctrl *ctrl,
+		struct query_cores_data *segment_data)
+{
+	uint32_t pages_left;
+	uint32_t pages;
+	uint32_t addr;
+	uint32_t offset;
+	uint32_t io_count;
+	uint32_t i;
+	uint32_t max_pages_per_io;
+	int err = 0;
+	unsigned int max_io_size = ocf_volume_get_max_io_size(volume);
+
+	if (!max_io_size) {
+		err = -OCF_ERR_INVAL;
+		goto exit;
+	}
+
+	max_pages_per_io = max_io_size / PAGE_SIZE;
+
+	/* Allocate data */
+	segment_data->data = ctx_data_alloc(owner,
+			ctrl->raw_desc[segment].ssd_pages);
+	if (!segment_data->data) {
+		err = -OCF_ERR_NO_MEM;
+		goto exit;
+	}
+
+	segment_data->entries_in_page = ctrl->raw_desc[segment].entries_in_page;
+
+	io_count = OCF_DIV_ROUND_UP(ctrl->raw_desc[segment].ssd_pages,
+			max_pages_per_io);
+
+	/* submit segment data I/O */
+	pages_left = ctrl->raw_desc[segment].ssd_pages;
+	addr = ctrl->raw_desc[segment].ssd_pages_offset;
+	offset = 0;
+	i = 0;
+	while (pages_left) {
+		ENV_BUG_ON(i >= io_count);
+
+		pages = OCF_MIN(pages_left, max_pages_per_io);
+
+		err = ocf_metadata_query_cores_io(volume, context,
+				segment_data->data, offset, addr, pages);
+		if (err)
+			goto exit;
+
+		addr += pages;
+		offset += pages;
+		pages_left -= pages;
+		++i;
+	}
+
+exit:
+	return err;
+}
+
+void ocf_metadata_query_cores(ocf_ctx_t owner, ocf_volume_t volume,
+		struct ocf_volume_uuid *uuid, uint32_t count,
+		ocf_metadata_query_cores_end_t cmpl, void *priv)
+{
+	struct ocf_metadata_ctrl *ctrl = NULL;
+	struct query_cores_context *context;
+	int err;
+
+	if (count > OCF_CORE_MAX)
+		OCF_CMPL_RET(priv, -OCF_ERR_INVAL, 0);
+
+	/* intialize query context */
+	context = env_secure_alloc(sizeof(*context));
+	if (!context)
+		OCF_CMPL_RET(priv, -OCF_ERR_NO_MEM, 0);
+
+	ENV_BUG_ON(env_memset(context, sizeof(*context), 0));
+	context->ctx = owner;
+	context->params.cmpl = cmpl;
+	context->params.priv = priv;
+	context->params.uuids = uuid;
+	context->params.uuids_count = count;
+	env_atomic_set(&context->count, 1);
+
+	ctrl = ocf_metadata_ctrl_init(false);
+	if (!ctrl) {
+		err = -OCF_ERR_NO_MEM;
+		goto exit;
+	}
+
+	/* superblock I/O */
+	err = ocf_metadata_query_cores_segment_io(context, owner,
+			volume, metadata_segment_sb_config, ctrl,
+			&context->data.superblock);
+	if (err)
+		goto exit;
+
+	/* core config I/O */
+	err = ocf_metadata_query_cores_segment_io(context, owner,
+			volume, metadata_segment_core_uuid, ctrl,
+			&context->data.core_uuids);
+	if (err)
+		goto exit;
+
+	/* core uuid I/O */
+	err = ocf_metadata_query_cores_segment_io(context, owner,
+			volume, metadata_segment_core_config, ctrl,
+			&context->data.core_config);
+	if (err)
+		goto exit;
+exit:
+	env_vfree(ctrl);
+	ocf_metadata_query_cores_end(context, err);
+}
+
+
 static void ocf_metadata_probe_cmpl(struct ocf_metadata_read_sb_ctx *context)
 {
 	struct ocf_metadata_probe_status status;
@@ -284,7 +2116,7 @@ struct ocf_metadata_query_cores_context
 	void *priv;
 };
 
-static void ocf_metadata_query_cores_end(void *_context, int error,
+static void ocf_metadata_probe_cores_end(void *_context, int error,
 		unsigned num_cores)
 {
 	struct ocf_metadata_query_cores_context *context = _context;
@@ -307,7 +2139,5 @@ void ocf_metadata_probe_cores(ocf_ctx_t ctx, ocf_volume_t volume,
 	context->priv = priv;
 
 	ocf_metadata_query_cores(ctx, volume, uuids, uuids_count,
-			ocf_metadata_query_cores_end, context);
+			ocf_metadata_probe_cores_end, context);
 }
-
-
diff --git a/src/metadata/metadata_cleaning_policy.c b/src/metadata/metadata_cleaning_policy.c
new file mode 100644
index 0000000..98a2589
--- /dev/null
+++ b/src/metadata/metadata_cleaning_policy.c
@@ -0,0 +1,23 @@
+/*
+ * copyright(c) 2020 intel corporation
+ * spdx-license-identifier: bsd-3-clause-clear
+ */
+
+#include "ocf/ocf.h"
+#include "metadata.h"
+#include "metadata_cleaning_policy.h"
+#include "metadata_internal.h"
+
+/*
+ * Cleaning policy - Get
+ */
+struct cleaning_policy_meta *
+ocf_metadata_get_cleaning_policy(struct ocf_cache *cache,
+		ocf_cache_line_t line)
+{
+	struct ocf_metadata_ctrl *ctrl
+		= (struct ocf_metadata_ctrl *) cache->metadata.priv;
+
+	return ocf_metadata_raw_wr_access(cache,
+			&(ctrl->raw_desc[metadata_segment_cleaning]), line);
+}
diff --git a/src/metadata/metadata_collision.c b/src/metadata/metadata_collision.c
index 4f5ecd9..3f921ff 100644
--- a/src/metadata/metadata_collision.c
+++ b/src/metadata/metadata_collision.c
@@ -5,8 +5,225 @@
 
 #include "ocf/ocf.h"
 #include "metadata.h"
+#include "metadata_internal.h"
 #include "../utils/utils_cache_line.h"
 
+static ocf_cache_line_t ocf_metadata_map_lg2phy_seq(
+		struct ocf_cache *cache, ocf_cache_line_t coll_idx)
+{
+	return coll_idx;
+}
+
+static ocf_cache_line_t ocf_metadata_map_phy2lg_seq(
+		struct ocf_cache *cache, ocf_cache_line_t cache_line)
+{
+	return cache_line;
+}
+
+/**
+ * This function is mapping collision index to appropriate cache line
+ * (logical cache line to physical one mapping).
+ *
+ * It is necessary because we want to generate sequential workload with
+ * data to cache device.
+ *	Our collision list, for example, looks:
+ *			0 3 6 9
+ *			1 4 7 10
+ *			2 5 8
+ *	All collision index in each column is on the same page
+ *	on cache device. We don't want send request x times to the same
+ *	page. To don't do it we use collision index by row, but in this
+ *	case we can't use collision index directly as cache line,
+ *	because we will generate non sequential workload (we will write
+ *	pages: 0 -> 3 -> 6 ...). To map collision index in correct way
+ *	we use this function.
+ *
+ *	After use this function, collision index in the above array
+ *	corresponds with below cache line:
+ *			0 1 2 3
+ *			4 5 6 7
+ *			8 9 10
+ *
+ * @param cache - cache instance
+ * @param idx - index in collision list
+ * @return mapped cache line
+ */static ocf_cache_line_t ocf_metadata_map_lg2phy_striping(
+		struct ocf_cache *cache, ocf_cache_line_t coll_idx)
+{
+	ocf_cache_line_t cache_line = 0, offset = 0;
+	struct ocf_metadata_ctrl *ctrl =
+		(struct ocf_metadata_ctrl *) cache->metadata.priv;
+	unsigned int entries_in_page =
+		ctrl->raw_desc[metadata_segment_collision].entries_in_page;
+	unsigned int pages =
+		ctrl->raw_desc[metadata_segment_collision].ssd_pages;
+	ocf_cache_line_t collision_table_entries =
+			cache->device->collision_table_entries;
+	ocf_cache_line_t delta =
+			(entries_in_page * pages) - collision_table_entries;
+	unsigned int row = coll_idx % entries_in_page;
+
+	if (row > entries_in_page - delta)
+		offset = row - (entries_in_page - delta);
+	else
+		offset = 0;
+
+	cache_line = (row * pages) +  (coll_idx / entries_in_page) - offset;
+	return cache_line;
+}
+
+/**
+ * @brief Map physical cache line on cache device to logical one
+ * @note This function is the inverse of map_coll_idx_to_cache_line
+ *
+ * @param cache Cache instance
+ * @param phy Physical cache line of cache device
+ * @return Logical cache line
+ */
+static ocf_cache_line_t ocf_metadata_map_phy2lg_striping(
+		struct ocf_cache *cache, ocf_cache_line_t cache_line)
+{
+	ocf_cache_line_t coll_idx = 0;
+
+	struct ocf_metadata_ctrl *ctrl =
+		(struct ocf_metadata_ctrl *) cache->metadata.priv;
+
+	struct ocf_metadata_raw *raw =
+		&ctrl->raw_desc[metadata_segment_collision];
+
+	unsigned int pages = raw->ssd_pages;
+	unsigned int entries_in_page = raw->entries_in_page;
+	unsigned int entries_in_last_page = raw->entries % entries_in_page ?:
+			entries_in_page;
+
+	unsigned int row = 0, coll = 0;
+
+	unsigned int last = entries_in_last_page * pages;
+
+	if (cache_line < last) {
+		row = cache_line % pages;
+		coll = cache_line / pages;
+	} else {
+		cache_line -= last;
+		row = cache_line % (pages - 1);
+		coll = cache_line / (pages - 1) + entries_in_last_page;
+	}
+
+	coll_idx = (row * entries_in_page) + coll;
+
+	return coll_idx;
+}
+ocf_cache_line_t ocf_metadata_map_lg2phy(
+		struct ocf_cache *cache, ocf_cache_line_t coll_idx)
+{
+	switch (cache->metadata.layout) {
+	case ocf_metadata_layout_striping:
+		return ocf_metadata_map_lg2phy_striping(
+				cache, coll_idx);
+	case ocf_metadata_layout_seq:
+		return ocf_metadata_map_lg2phy_seq(
+				cache, coll_idx);
+	default:
+		ENV_BUG();
+		return 0;
+	}
+}
+
+ocf_cache_line_t ocf_metadata_map_phy2lg(
+		struct ocf_cache *cache, ocf_cache_line_t cache_line)
+{
+	switch (cache->metadata.layout) {
+	case ocf_metadata_layout_striping:
+		return ocf_metadata_map_phy2lg_striping(
+				cache, cache_line);
+	case ocf_metadata_layout_seq:
+		return ocf_metadata_map_phy2lg_seq(
+				cache, cache_line);
+	default:
+		ENV_BUG();
+		return 0;
+	}
+}
+
+void ocf_metadata_set_collision_info(struct ocf_cache *cache,
+		ocf_cache_line_t line, ocf_cache_line_t next,
+		ocf_cache_line_t prev)
+{
+	struct ocf_metadata_list_info *info;
+	struct ocf_metadata_ctrl *ctrl =
+		(struct ocf_metadata_ctrl *) cache->metadata.priv;
+
+	info = ocf_metadata_raw_wr_access(cache,
+			&(ctrl->raw_desc[metadata_segment_list_info]), line);
+
+	if (info) {
+		info->next_col = next;
+		info->prev_col = prev;
+	} else {
+		ocf_metadata_error(cache);
+	}
+}
+
+void ocf_metadata_set_collision_next(struct ocf_cache *cache,
+		ocf_cache_line_t line, ocf_cache_line_t next)
+{
+	struct ocf_metadata_list_info *info;
+	struct ocf_metadata_ctrl *ctrl =
+		(struct ocf_metadata_ctrl *) cache->metadata.priv;
+
+	info = ocf_metadata_raw_wr_access(cache,
+			&(ctrl->raw_desc[metadata_segment_list_info]), line);
+
+	if (info)
+		info->next_col = next;
+	else
+		ocf_metadata_error(cache);
+}
+
+void ocf_metadata_set_collision_prev(struct ocf_cache *cache,
+		ocf_cache_line_t line, ocf_cache_line_t prev)
+{
+	struct ocf_metadata_list_info *info;
+	struct ocf_metadata_ctrl *ctrl =
+		(struct ocf_metadata_ctrl *) cache->metadata.priv;
+
+	info = ocf_metadata_raw_wr_access(cache,
+			&(ctrl->raw_desc[metadata_segment_list_info]), line);
+
+	if (info)
+		info->prev_col = prev;
+	else
+		ocf_metadata_error(cache);
+}
+
+void ocf_metadata_get_collision_info(struct ocf_cache *cache,
+		ocf_cache_line_t line, ocf_cache_line_t *next,
+		ocf_cache_line_t *prev)
+{
+	const struct ocf_metadata_list_info *info;
+	struct ocf_metadata_ctrl *ctrl =
+		(struct ocf_metadata_ctrl *) cache->metadata.priv;
+
+	ENV_BUG_ON(NULL == next && NULL == prev);
+
+	info = ocf_metadata_raw_rd_access(cache,
+			&(ctrl->raw_desc[metadata_segment_list_info]), line);
+	if (info) {
+		if (next)
+			*next = info->next_col;
+		if (prev)
+			*prev = info->prev_col;
+	} else {
+		ocf_metadata_error(cache);
+
+		if (next)
+			*next = cache->device->collision_table_entries;
+		if (prev)
+			*prev = cache->device->collision_table_entries;
+	}
+}
+
+
 /*
  *
  */
@@ -86,3 +303,29 @@ void ocf_metadata_remove_from_collision(struct ocf_cache *cache,
 	ocf_metadata_set_core_info(cache, line,
 			OCF_CORE_MAX, ULLONG_MAX);
 }
+
+void ocf_metadata_start_collision_shared_access(struct ocf_cache *cache,
+		ocf_cache_line_t line)
+{
+	struct ocf_metadata_ctrl *ctrl =
+		(struct ocf_metadata_ctrl *) cache->metadata.priv;
+	struct ocf_metadata_raw *raw =
+			&ctrl->raw_desc[metadata_segment_collision];
+	uint32_t page = ocf_metadata_raw_page(raw, line);
+
+	ocf_collision_start_shared_access(&cache->metadata.lock, page);
+}
+
+void ocf_metadata_end_collision_shared_access(struct ocf_cache *cache,
+		ocf_cache_line_t line)
+{
+	struct ocf_metadata_ctrl *ctrl =
+		(struct ocf_metadata_ctrl *) cache->metadata.priv;
+	struct ocf_metadata_raw *raw =
+			&ctrl->raw_desc[metadata_segment_collision];
+	uint32_t page = ocf_metadata_raw_page(raw, line);
+
+	ocf_collision_end_shared_access(&cache->metadata.lock, page);
+}
+
+
diff --git a/src/metadata/metadata_collision.h b/src/metadata/metadata_collision.h
index e7f4ccc..b2c931f 100644
--- a/src/metadata/metadata_collision.h
+++ b/src/metadata/metadata_collision.h
@@ -85,10 +85,10 @@ void ocf_metadata_add_to_collision(struct ocf_cache *cache,
 void ocf_metadata_remove_from_collision(struct ocf_cache *cache,
 		ocf_cache_line_t line, ocf_part_id_t part_id);
 
- void ocf_metadata_start_collision_shared_access(
+void ocf_metadata_start_collision_shared_access(
 		struct ocf_cache *cache, ocf_cache_line_t line);
 
- void ocf_metadata_end_collision_shared_access(
+void ocf_metadata_end_collision_shared_access(
 		struct ocf_cache *cache, ocf_cache_line_t line);
 
 #endif /* METADATA_COLLISION_H_ */
diff --git a/src/metadata/metadata_core.c b/src/metadata/metadata_core.c
new file mode 100644
index 0000000..9f49c94
--- /dev/null
+++ b/src/metadata/metadata_core.c
@@ -0,0 +1,88 @@
+/*
+ * Copyright(c) 2020 Intel Corporation
+ * SPDX-License-Identifier: BSD-3-Clause-Clear
+ */
+
+#include "ocf/ocf.h"
+#include "../ocf_priv.h"
+#include "metadata.h"
+#include "metadata_core.h"
+#include "metadata_internal.h"
+#include "metadata_raw.h"
+
+void ocf_metadata_get_core_info(struct ocf_cache *cache,
+		ocf_cache_line_t line, ocf_core_id_t *core_id,
+		uint64_t *core_sector)
+{
+	const struct ocf_metadata_map *collision;
+	struct ocf_metadata_ctrl *ctrl =
+		(struct ocf_metadata_ctrl *) cache->metadata.priv;
+
+	collision = ocf_metadata_raw_rd_access(cache,
+			&(ctrl->raw_desc[metadata_segment_collision]), line);
+	if (collision) {
+		if (core_id)
+			*core_id = collision->core_id;
+		if (core_sector)
+			*core_sector = collision->core_line;
+	} else {
+		ocf_metadata_error(cache);
+
+		if (core_id)
+			*core_id = OCF_CORE_MAX;
+		if (core_sector)
+			*core_sector = ULLONG_MAX;
+	}
+}
+
+void ocf_metadata_set_core_info(struct ocf_cache *cache,
+		ocf_cache_line_t line, ocf_core_id_t core_id,
+		uint64_t core_sector)
+{
+	struct ocf_metadata_map *collision;
+	struct ocf_metadata_ctrl *ctrl =
+		(struct ocf_metadata_ctrl *) cache->metadata.priv;
+
+	collision = ocf_metadata_raw_wr_access(cache,
+			&(ctrl->raw_desc[metadata_segment_collision]), line);
+
+	if (collision) {
+		collision->core_id = core_id;
+		collision->core_line = core_sector;
+	} else {
+		ocf_metadata_error(cache);
+	}
+}
+
+ocf_core_id_t ocf_metadata_get_core_id(struct ocf_cache *cache,
+		ocf_cache_line_t line)
+{
+	const struct ocf_metadata_map *collision;
+	struct ocf_metadata_ctrl *ctrl =
+		(struct ocf_metadata_ctrl *) cache->metadata.priv;
+
+	collision = ocf_metadata_raw_rd_access(cache,
+			&(ctrl->raw_desc[metadata_segment_collision]), line);
+
+	if (collision)
+		return collision->core_id;
+
+	ocf_metadata_error(cache);
+	return OCF_CORE_MAX;
+}
+
+struct ocf_metadata_uuid *ocf_metadata_get_core_uuid(
+		struct ocf_cache *cache, ocf_core_id_t core_id)
+{
+	struct ocf_metadata_uuid *muuid;
+	struct ocf_metadata_ctrl *ctrl =
+		(struct ocf_metadata_ctrl *) cache->metadata.priv;
+
+	muuid = ocf_metadata_raw_wr_access(cache,
+			&(ctrl->raw_desc[metadata_segment_core_uuid]), core_id);
+
+	if (!muuid)
+		ocf_metadata_error(cache);
+
+	return muuid;
+}
diff --git a/src/metadata/metadata_core.h b/src/metadata/metadata_core.h
index 2e8ba73..249d444 100644
--- a/src/metadata/metadata_core.h
+++ b/src/metadata/metadata_core.h
@@ -6,6 +6,8 @@
 #ifndef __METADATA_CORE_H__
 #define __METADATA_CORE_H__
 
+#include <ocf/ocf_types.h>
+
 void ocf_metadata_get_core_info(struct ocf_cache *cache,
 		ocf_cache_line_t line, ocf_core_id_t *core_id,
 		uint64_t *core_sector);
diff --git a/src/metadata/metadata_eviction_policy.c b/src/metadata/metadata_eviction_policy.c
new file mode 100644
index 0000000..240c113
--- /dev/null
+++ b/src/metadata/metadata_eviction_policy.c
@@ -0,0 +1,25 @@
+/*
+ * copyright(c )2020 intel corporation
+ * spdx-license-identifier: bsd-3-clause-clear
+ */
+
+#include "ocf/ocf.h"
+#include "metadata.h"
+#include "metadata_eviction_policy.h"
+#include "metadata_internal.h"
+
+/*
+ * Eviction policy - Get
+ */
+union eviction_policy_meta *
+ocf_metadata_get_eviction_policy(struct ocf_cache *cache,
+		ocf_cache_line_t line)
+{
+	struct ocf_metadata_ctrl *ctrl
+		= (struct ocf_metadata_ctrl *) cache->metadata.priv;
+
+	return ocf_metadata_raw_wr_access(cache,
+			&(ctrl->raw_desc[metadata_segment_eviction]), line);
+}
+
+
diff --git a/src/metadata/metadata_hash.c b/src/metadata/metadata_hash.c
deleted file mode 100644
index 6d9cc75..0000000
--- a/src/metadata/metadata_hash.c
+++ /dev/null
@@ -1,2829 +0,0 @@
-/*
- * Copyright(c) 2012-2020 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
- */
-
-#include "metadata.h"
-#include "metadata_hash.h"
-#include "metadata_raw.h"
-#include "metadata_io.h"
-#include "metadata_status.h"
-#include "../concurrency/ocf_concurrency.h"
-#include "../utils/utils_cache_line.h"
-#include "../utils/utils_io.h"
-#include "../utils/utils_pipeline.h"
-#include "../ocf_def_priv.h"
-#include "../ocf_priv.h"
-#include "../ocf_freelist.h"
-
-#define OCF_METADATA_HASH_DEBUG 0
-
-#if 1 == OCF_METADATA_HASH_DEBUG
-#define OCF_DEBUG_TRACE(cache) \
-	ocf_cache_log(cache, log_info, "[Metadata][Hash] %s\n", __func__)
-
-#define OCF_DEBUG_PARAM(cache, format, ...) \
-	ocf_cache_log(cache, log_info, "[Metadata][Hash] %s - "format"\n", \
-			__func__, ##__VA_ARGS__)
-#else
-#define OCF_DEBUG_TRACE(cache)
-#define OCF_DEBUG_PARAM(cache, format, ...)
-#endif
-
-#define METADATA_MEM_POOL(ctrl, section) ctrl->raw_desc[section].mem_pool
-
-#define OCF_METADATA_HASH_DIFF_MAX 1000
-
-enum {
-	ocf_metadata_status_type_valid = 0,
-	ocf_metadata_status_type_dirty,
-
-	ocf_metadata_status_type_max
-};
-
-static inline size_t ocf_metadata_status_sizeof(
-		const struct ocf_cache_line_settings *settings) {
-	/* Number of bytes required to mark cache line status */
-	size_t size = settings->sector_count / 8;
-
-	/* Number of types of status (valid, dirty, etc...) */
-	size *= ocf_metadata_status_type_max;
-
-	/* At the end we have size */
-	return size;
-}
-
-/*
- * Hash metadata control structure
- */
-struct ocf_metadata_ctrl {
-	ocf_cache_line_t cachelines;
-	ocf_cache_line_t start_page;
-	ocf_cache_line_t count_pages;
-	uint32_t device_lines;
-	size_t mapping_size;
-	struct ocf_metadata_raw raw_desc[metadata_segment_max];
-};
-
-/*
- * get entries for specified metadata hash type
- */
-static ocf_cache_line_t ocf_metadata_get_entries(
-		enum ocf_metadata_segment type,
-		ocf_cache_line_t cache_lines)
-{
-	ENV_BUG_ON(type >= metadata_segment_variable_size_start && cache_lines == 0);
-
-	switch (type) {
-	case metadata_segment_collision:
-	case metadata_segment_cleaning:
-	case metadata_segment_eviction:
-	case metadata_segment_list_info:
-		return cache_lines;
-
-	case metadata_segment_hash:
-		return OCF_DIV_ROUND_UP(cache_lines, 4);
-
-	case metadata_segment_sb_config:
-		return OCF_DIV_ROUND_UP(sizeof(struct ocf_superblock_config),
-				PAGE_SIZE);
-
-	case metadata_segment_sb_runtime:
-		return OCF_DIV_ROUND_UP(sizeof(struct ocf_superblock_runtime),
-				PAGE_SIZE);
-
-	case metadata_segment_reserved:
-		return 32;
-
-	case metadata_segment_part_config:
-		return OCF_IO_CLASS_MAX + 1;
-
-	case metadata_segment_part_runtime:
-		return OCF_IO_CLASS_MAX + 1;
-
-	case metadata_segment_core_config:
-		return OCF_CORE_MAX;
-
-	case metadata_segment_core_runtime:
-		return OCF_CORE_MAX;
-
-	case metadata_segment_core_uuid:
-		return OCF_CORE_MAX;
-
-	default:
-		break;
-	}
-
-	ENV_BUG();
-	return 0;
-}
-
-/*
- * Get size of particular hash metadata type element
- */
-static int64_t ocf_metadata_get_element_size(
-		enum ocf_metadata_segment type,
-		const struct ocf_cache_line_settings *settings)
-{
-	int64_t size = 0;
-
-	ENV_BUG_ON(type >= metadata_segment_variable_size_start && !settings);
-
-	switch (type) {
-	case metadata_segment_eviction:
-		size = sizeof(union eviction_policy_meta);
-		break;
-
-	case metadata_segment_cleaning:
-		size = sizeof(struct cleaning_policy_meta);
-		break;
-
-	case metadata_segment_collision:
-		size = sizeof(struct ocf_metadata_map)
-			+ ocf_metadata_status_sizeof(settings);
-		break;
-
-	case metadata_segment_list_info:
-		size = sizeof(struct ocf_metadata_list_info);
-		break;
-
-	case metadata_segment_sb_config:
-		size = PAGE_SIZE;
-		break;
-
-	case metadata_segment_sb_runtime:
-		size = PAGE_SIZE;
-		break;
-
-	case metadata_segment_reserved:
-		size = PAGE_SIZE;
-		break;
-
-	case metadata_segment_part_config:
-		size = sizeof(struct ocf_user_part_config);
-		break;
-
-	case metadata_segment_part_runtime:
-		size = sizeof(struct ocf_user_part_runtime);
-		break;
-
-	case metadata_segment_hash:
-		size = sizeof(ocf_cache_line_t);
-		break;
-
-	case metadata_segment_core_config:
-		size = sizeof(struct ocf_core_meta_config);
-		break;
-
-	case metadata_segment_core_runtime:
-		size = sizeof(struct ocf_core_meta_runtime);
-		break;
-
-	case metadata_segment_core_uuid:
-		size = sizeof(struct ocf_metadata_uuid);
-		break;
-
-	default:
-		break;
-
-	}
-
-	ENV_BUG_ON(size > PAGE_SIZE);
-
-	return size;
-}
-
-/*
- * Metadata calculation exception handling.
- *
- * @param unused_lines - Unused pages
- * @param device_lines - SSD Cache device pages amount
- *
- * @return true - Accept unused sapce
- * @return false - unused space is not acceptable
- */
-static bool ocf_metadata_calculate_exception_hndl(ocf_cache_t cache,
-		int64_t unused_lines, int64_t device_lines)
-{
-	static bool warn;
-	int64_t utilization = 0;
-
-	if (!warn) {
-		ocf_cache_log(cache, log_warn,
-				"Metadata size calculation problem\n");
-		warn = true;
-	}
-
-	if (unused_lines < 0)
-		return false;
-
-	/*
-	 * Accepted disk utilization is 90 % off SSD space
-	 */
-	utilization = (device_lines - unused_lines) * 100 / device_lines;
-
-	if (utilization < 90)
-		return false;
-
-	return true;
-}
-
-/*
- * Algorithm to calculate amount of cache lines taking into account required
- * space for metadata
- */
-static int ocf_metadata_calculate_metadata_size(
-		struct ocf_cache *cache,
-		struct ocf_metadata_ctrl *ctrl,
-		const struct ocf_cache_line_settings *settings)
-{
-	int64_t i_diff = 0, diff_lines = 0, cache_lines = ctrl->device_lines;
-	int64_t lowest_diff;
-	ocf_cache_line_t count_pages;
-	uint32_t i;
-
-	OCF_DEBUG_PARAM(cache, "Cache lines = %lld", cache_lines);
-
-	lowest_diff = cache_lines;
-
-	do {
-		count_pages = ctrl->count_pages;
-		for (i = metadata_segment_variable_size_start;
-				i < metadata_segment_max; i++) {
-			struct ocf_metadata_raw *raw = &ctrl->raw_desc[i];
-
-			/* Setup number of entries */
-			raw->entries
-				= ocf_metadata_get_entries(i, cache_lines);
-
-			/*
-			 * Setup SSD location and size
-			 */
-			raw->ssd_pages_offset = count_pages;
-			raw->ssd_pages = OCF_DIV_ROUND_UP(raw->entries,
-					raw->entries_in_page);
-
-			/* Update offset for next container */
-			count_pages += ocf_metadata_raw_size_on_ssd(raw);
-		}
-
-		/*
-		 * Check if max allowed iteration exceeded
-		 */
-		if (i_diff >= OCF_METADATA_HASH_DIFF_MAX) {
-			/*
-			 * Never should be here but try handle this exception
-			 */
-			if (ocf_metadata_calculate_exception_hndl(cache,
-					diff_lines, ctrl->device_lines)) {
-				break;
-			}
-
-			if (i_diff > (2 * OCF_METADATA_HASH_DIFF_MAX)) {
-				/*
-				 * We tried, but we fallen, have to return error
-				 */
-				ocf_cache_log(cache, log_err,
-					"Metadata size calculation ERROR\n");
-				return -1;
-			}
-		}
-
-		/* Calculate diff of cache lines */
-
-		/* Cache size in bytes */
-		diff_lines = ctrl->device_lines * settings->size;
-		/* Sub metadata size which is in 4 kiB unit */
-		diff_lines -= count_pages * PAGE_SIZE;
-		/* Convert back to cache lines */
-		diff_lines /= settings->size;
-		/* Calculate difference */
-		diff_lines -= cache_lines;
-
-		if (diff_lines > 0) {
-			if (diff_lines < lowest_diff)
-				lowest_diff = diff_lines;
-			else if (diff_lines == lowest_diff)
-				break;
-		}
-
-		/* Update new value of cache lines */
-		cache_lines += diff_lines;
-
-		OCF_DEBUG_PARAM(cache, "Diff pages = %lld", diff_lines);
-		OCF_DEBUG_PARAM(cache, "Cache lines = %lld", cache_lines);
-
-		i_diff++;
-
-	} while (diff_lines);
-
-	ctrl->count_pages = count_pages;
-	ctrl->cachelines = cache_lines;
-	OCF_DEBUG_PARAM(cache, "Cache lines = %u", ctrl->cachelines);
-
-	if (ctrl->device_lines < ctrl->cachelines)
-		return -1;
-
-	return 0;
-}
-
-static const char * const ocf_metadata_segment_names[] = {
-		[metadata_segment_sb_config]		= "Super block config",
-		[metadata_segment_sb_runtime]		= "Super block runtime",
-		[metadata_segment_reserved]		= "Reserved",
-		[metadata_segment_part_config]		= "Part config",
-		[metadata_segment_part_runtime]		= "Part runtime",
-		[metadata_segment_cleaning]		= "Cleaning",
-		[metadata_segment_eviction]		= "Eviction",
-		[metadata_segment_collision]		= "Collision",
-		[metadata_segment_list_info]		= "List info",
-		[metadata_segment_hash]			= "Hash",
-		[metadata_segment_core_config]		= "Core config",
-		[metadata_segment_core_runtime]		= "Core runtime",
-		[metadata_segment_core_uuid]		= "Core UUID",
-};
-#if 1 == OCF_METADATA_HASH_DEBUG
-/*
- * Debug info functions prints metadata and raw containers information
- */
-static void ocf_metadata_raw_info(struct ocf_cache *cache,
-		struct ocf_metadata_ctrl *ctrl)
-{
-	uint64_t capacity = 0;
-	uint64_t capacity_sum = 0;
-	uint32_t i = 0;
-	const char *unit;
-
-	for (i = 0; i < metadata_segment_max; i++) {
-		struct ocf_metadata_raw *raw = &(ctrl->raw_desc[i]);
-
-		OCF_DEBUG_PARAM(cache, "Raw : name            = %s",
-				ocf_metadata_segment_names[i]);
-		OCF_DEBUG_PARAM(cache, "    : metadata type   = %u", i);
-		OCF_DEBUG_PARAM(cache, "    : raw type        = %u",
-				raw->raw_type);
-		OCF_DEBUG_PARAM(cache, "    : entry size      = %u",
-				raw->entry_size);
-		OCF_DEBUG_PARAM(cache, "    : entries         = %llu",
-				raw->entries);
-		OCF_DEBUG_PARAM(cache, "    : entries in page = %u",
-				raw->entries_in_page);
-		OCF_DEBUG_PARAM(cache, "    : page offset     = %llu",
-				raw->ssd_pages_offset);
-		OCF_DEBUG_PARAM(cache, "    : pages           = %llu",
-				raw->ssd_pages);
-	}
-
-	/* Provide capacity info */
-	for (i = 0; i < metadata_segment_max; i++) {
-		capacity = ocf_metadata_raw_size_of(cache,
-				&(ctrl->raw_desc[i]));
-
-		capacity_sum += capacity;
-
-		if (capacity / MiB) {
-			capacity = capacity / MiB;
-			unit = "MiB";
-		} else {
-			unit = "KiB";
-			capacity = capacity / KiB;
-
-		}
-
-		OCF_DEBUG_PARAM(cache, "%s capacity %llu %s",
-			ocf_metadata_segment_names[i], capacity, unit);
-	}
-}
-#else
-#define ocf_metadata_raw_info(cache, ctrl)
-#endif
-
-/*
- * Deinitialize hash metadata interface
- */
-void ocf_metadata_deinit_variable_size(struct ocf_cache *cache)
-{
-
-	int result = 0;
-	uint32_t i = 0;
-
-	struct ocf_metadata_ctrl *ctrl = (struct ocf_metadata_ctrl *)
-			cache->metadata.priv;
-
-	OCF_DEBUG_TRACE(cache);
-
-	ocf_metadata_concurrency_attached_deinit(&cache->metadata.lock);
-
-	/*
-	 * De initialize RAW types
-	 */
-	for (i = metadata_segment_variable_size_start;
-			i < metadata_segment_max; i++) {
-		result |= ocf_metadata_raw_deinit(cache,
-				&(ctrl->raw_desc[i]));
-	}
-}
-
-static inline void ocf_metadata_config_init(struct ocf_cache *cache,
-		struct ocf_cache_line_settings *settings, size_t size)
-{
-	ENV_BUG_ON(!ocf_cache_line_size_is_valid(size));
-
-	ENV_BUG_ON(env_memset(settings, sizeof(*settings), 0));
-
-	settings->size = size;
-	settings->sector_count = BYTES_TO_SECTORS(settings->size);
-	settings->sector_start = 0;
-	settings->sector_end = settings->sector_count - 1;
-
-	OCF_DEBUG_PARAM(cache, "Cache line size = %lu, bits count = %llu, "
-			"status size = %lu",
-			settings->size, settings->sector_count,
-			ocf_metadata_status_sizeof(settings));
-}
-
-void ocf_metadata_deinit_fixed_size(struct ocf_cache *cache)
-{
-	int result = 0;
-	uint32_t i;
-
-	struct ocf_metadata_ctrl *ctrl = (struct ocf_metadata_ctrl *)
-			cache->metadata.priv;
-
-	for (i = 0; i < metadata_segment_fixed_size_max; i++) {
-		result |= ocf_metadata_raw_deinit(cache,
-				&(ctrl->raw_desc[i]));
-	}
-
-	env_vfree(ctrl);
-	cache->metadata.priv = NULL;
-
-	if (result)
-		ENV_BUG();
-}
-
-static struct ocf_metadata_ctrl *ocf_metadata_ctrl_init(
-		bool metadata_volatile)
-{
-	struct ocf_metadata_ctrl *ctrl = NULL;
-	uint32_t page = 0;
-	uint32_t i = 0;
-
-	ctrl = env_vzalloc(sizeof(*ctrl));
-	if (!ctrl)
-		return NULL;
-
-	/* Initial setup of RAW containers */
-	for (i = 0; i < metadata_segment_fixed_size_max; i++) {
-		struct ocf_metadata_raw *raw = &ctrl->raw_desc[i];
-
-		raw->metadata_segment = i;
-
-		/* Default type for metadata RAW container */
-		raw->raw_type = metadata_raw_type_ram;
-
-		if (metadata_volatile) {
-			raw->raw_type = metadata_raw_type_volatile;
-		} else if (i == metadata_segment_core_uuid) {
-			raw->raw_type = metadata_raw_type_dynamic;
-		}
-
-		/* Entry size configuration */
-		raw->entry_size
-			= ocf_metadata_get_element_size(i, NULL);
-		raw->entries_in_page = PAGE_SIZE / raw->entry_size;
-
-		/* Setup number of entries */
-		raw->entries = ocf_metadata_get_entries(i, 0);
-
-		/*
-		 * Setup SSD location and size
-		 */
-		raw->ssd_pages_offset = page;
-		raw->ssd_pages = OCF_DIV_ROUND_UP(raw->entries,
-				raw->entries_in_page);
-
-		/* Update offset for next container */
-		page += ocf_metadata_raw_size_on_ssd(raw);
-	}
-
-	ctrl->count_pages = page;
-
-	return ctrl;
-}
-
-int ocf_metadata_init_fixed_size(struct ocf_cache *cache,
-		ocf_cache_line_size_t cache_line_size)
-{
-	struct ocf_metadata_ctrl *ctrl = NULL;
-	struct ocf_metadata *metadata = &cache->metadata;
-	struct ocf_cache_line_settings *settings =
-		(struct ocf_cache_line_settings *)&metadata->settings;
-	struct ocf_core_meta_config *core_meta_config;
-	struct ocf_core_meta_runtime *core_meta_runtime;
-	struct ocf_user_part_config *part_config;
-	struct ocf_user_part_runtime *part_runtime;
-	ocf_core_t core;
-	ocf_core_id_t core_id;
-	uint32_t i = 0;
-	int result = 0;
-
-	OCF_DEBUG_TRACE(cache);
-
-	ENV_WARN_ON(metadata->priv);
-
-	ocf_metadata_config_init(cache, settings, cache_line_size);
-
-	ctrl = ocf_metadata_ctrl_init(metadata->is_volatile);
-	if (!ctrl)
-		return -OCF_ERR_NO_MEM;
-	metadata->priv = ctrl;
-
-	for (i = 0; i < metadata_segment_fixed_size_max; i++) {
-		result |= ocf_metadata_raw_init(cache, NULL, NULL,
-				&(ctrl->raw_desc[i]));
-		if (result)
-			break;
-	}
-
-	if (result) {
-		ocf_metadata_deinit_fixed_size(cache);
-		return result;
-	}
-
-	cache->conf_meta = METADATA_MEM_POOL(ctrl, metadata_segment_sb_config);
-
-	/* Set partition metadata */
-	part_config = METADATA_MEM_POOL(ctrl, metadata_segment_part_config);
-	part_runtime = METADATA_MEM_POOL(ctrl, metadata_segment_part_runtime);
-
-	for (i = 0; i < OCF_IO_CLASS_MAX + 1; i++) {
-		cache->user_parts[i].config = &part_config[i];
-		cache->user_parts[i].runtime = &part_runtime[i];
-		cache->user_parts[i].id = i;
-	}
-
-	/* Set core metadata */
-	core_meta_config = METADATA_MEM_POOL(ctrl,
-			metadata_segment_core_config);
-	core_meta_runtime = METADATA_MEM_POOL(ctrl,
-			metadata_segment_core_runtime);
-
-	for_each_core_all(cache, core, core_id) {
-		core->conf_meta = &core_meta_config[core_id];
-		core->runtime_meta = &core_meta_runtime[core_id];
-	}
-
-	return 0;
-}
-
-/* metadata segment data + iterators */
-struct query_cores_data
-{
-	/* array of data */
-	ctx_data_t *data;
-	/* current metadata entry counter */
-	uint32_t entry;
-	/* number of entries per page */
-	uint32_t entries_in_page;
-};
-
-/* query cores context */
-struct query_cores_context
-{
-	ocf_ctx_t ctx;
-
-	struct ocf_superblock_config superblock;
-	struct ocf_metadata_uuid muuid;
-
-	struct {
-		struct query_cores_data core_uuids;
-		struct query_cores_data core_config;
-		struct query_cores_data superblock;
-	} data;
-
-	env_atomic count;
-	env_atomic error;
-
-	/* OCF entry point parameters */
-	struct {
-		struct ocf_volume_uuid *uuids;
-		uint32_t uuids_count;
-		void *priv;
-		ocf_metadata_query_cores_end_t cmpl;
-	} params;
-};
-
-/* copy next metadata entry from data to memory buffer */
-static void ocf_metadata_query_cores_data_read(ocf_ctx_t ctx,
-		struct query_cores_data *data,
-		void *buf, uint32_t size)
-{
-	if (data->entry > 0 && data->entry % data->entries_in_page == 0) {
-		ctx_data_seek_check(ctx, data->data,
-				ctx_data_seek_current,
-				PAGE_SIZE - data->entries_in_page * size);
-	}
-
-	ctx_data_rd_check(ctx, buf, data->data, size);
-
-	++data->entry;
-}
-
-static void ocf_metadata_query_cores_end(struct query_cores_context *context,
-		int error)
-{
-	ocf_ctx_t ctx = context->ctx;
-	unsigned i, core_idx;
-	struct ocf_metadata_uuid *muuid = &context->muuid;
-	struct ocf_core_meta_config core_config;
-	unsigned core_count = 0;
-	unsigned long valid_core_bitmap[(OCF_CORE_MAX /
-			(sizeof(unsigned long) * 8)) + 1];
-	unsigned out_cores;
-
-	if (error)
-		env_atomic_cmpxchg(&context->error, 0, error);
-
-	if (env_atomic_dec_return(&context->count))
-		return;
-
-	error = env_atomic_read(&context->error);
-	if (error)
-		goto exit;
-
-	/* read superblock */
-	ctx_data_rd_check(ctx, &context->superblock,
-			context->data.superblock.data,
-			sizeof(context->superblock));
-
-	if (context->superblock.magic_number != CACHE_MAGIC_NUMBER) {
-		error = -OCF_ERR_NO_METADATA;
-		goto exit;
-	}
-
-	env_memset(&valid_core_bitmap, sizeof(valid_core_bitmap), 0);
-
-	/* read valid cores from core config segment */
-	for (i = 0; i < OCF_CORE_MAX; i++) {
-		ocf_metadata_query_cores_data_read(ctx,
-				&context->data.core_config,
-				&core_config, sizeof(core_config));
-		if (core_config.valid) {
-			env_bit_set(i, valid_core_bitmap);
-			++core_count;
-		}
-	}
-
-	/* read core uuids */
-	out_cores = OCF_MIN(core_count, context->params.uuids_count);
-	for (i = 0, core_idx = 0; i < OCF_CORE_MAX && core_idx < out_cores;
-			i++) {
-		ocf_metadata_query_cores_data_read(ctx,
-				&context->data.core_uuids,
-				muuid, sizeof(*muuid));
-
-		if (!env_bit_test(i, valid_core_bitmap))
-			continue;
-
-		if (muuid->size > OCF_VOLUME_UUID_MAX_SIZE) {
-			error = -OCF_ERR_INVAL;
-			goto exit;
-		}
-		if (muuid->size > context->params.uuids[core_idx].size) {
-			error = -OCF_ERR_INVAL;
-			goto exit;
-		}
-
-		error = env_memcpy(context->params.uuids[core_idx].data,
-				context->params.uuids[core_idx].size,
-				muuid->data, muuid->size);
-		if (error)
-			goto exit;
-		context->params.uuids[core_idx].size = muuid->size;
-
-		++core_idx;
-	}
-
-exit:
-	/* provide actual core count to completion */
-	context->params.cmpl(context->params.priv, error, core_count);
-
-	/* free data */
-	ctx_data_free(ctx, context->data.core_uuids.data);
-	ctx_data_free(ctx, context->data.core_config.data);
-	ctx_data_free(ctx, context->data.superblock.data);
-
-	env_secure_free(context, sizeof(*context));
-}
-
-static void ocf_metadata_query_cores_end_io(struct ocf_io *io, int error)
-{
-	struct query_cores_context *context = io->priv1;
-
-	ocf_io_put(io);
-	ocf_metadata_query_cores_end(context, error);
-}
-
-static int ocf_metadata_query_cores_io(ocf_volume_t volume,
-		struct query_cores_context *context, ctx_data_t *data,
-		uint32_t offset, uint64_t page, uint32_t num_pages)
-{
-	struct ocf_io *io;
-	int err;
-
-	env_atomic_inc(&context->count);
-
-	/* Allocate new IO */
-	io = ocf_volume_new_io(volume, NULL,
-			PAGES_TO_BYTES(page),
-			PAGES_TO_BYTES(num_pages),
-			OCF_READ, 0, 0);
-	if (!io) {
-		err = -OCF_ERR_NO_MEM;
-		goto exit_error;
-	}
-
-	/* Setup IO */
-	ocf_io_set_cmpl(io, context, NULL,
-			ocf_metadata_query_cores_end_io);
-	err = ocf_io_set_data(io, data, PAGES_TO_BYTES(offset));
-	if (err) {
-		ocf_io_put(io);
-		goto exit_error;
-	}
-
-	ocf_volume_submit_io(io);
-
-	return 0;
-
-exit_error:
-	env_atomic_dec(&context->count);
-	return err;
-}
-
-int ocf_metadata_query_cores_segment_io(
-		 struct query_cores_context *context,
-		ocf_ctx_t owner,
-		ocf_volume_t volume,
-		enum ocf_metadata_segment segment,
-		struct ocf_metadata_ctrl *ctrl,
-		struct query_cores_data *segment_data)
-{
-	uint32_t pages_left;
-	uint32_t pages;
-	uint32_t addr;
-	uint32_t offset;
-	uint32_t io_count;
-	uint32_t i;
-	uint32_t max_pages_per_io;
-	int err = 0;
-	unsigned int max_io_size = ocf_volume_get_max_io_size(volume);
-
-	if (!max_io_size) {
-		err = -OCF_ERR_INVAL;
-		goto exit;
-	}
-
-	max_pages_per_io = max_io_size / PAGE_SIZE;
-
-	/* Allocate data */
-	segment_data->data = ctx_data_alloc(owner,
-			ctrl->raw_desc[segment].ssd_pages);
-	if (!segment_data->data) {
-		err = -OCF_ERR_NO_MEM;
-		goto exit;
-	}
-
-	segment_data->entries_in_page = ctrl->raw_desc[segment].entries_in_page;
-
-	io_count = OCF_DIV_ROUND_UP(ctrl->raw_desc[segment].ssd_pages,
-			max_pages_per_io);
-
-	/* submit segment data I/O */
-	pages_left = ctrl->raw_desc[segment].ssd_pages;
-	addr = ctrl->raw_desc[segment].ssd_pages_offset;
-	offset = 0;
-	i = 0;
-	while (pages_left) {
-		ENV_BUG_ON(i >= io_count);
-
-		pages = OCF_MIN(pages_left, max_pages_per_io);
-
-		err = ocf_metadata_query_cores_io(volume, context,
-				segment_data->data, offset, addr, pages);
-		if (err)
-			goto exit;
-
-		addr += pages;
-		offset += pages;
-		pages_left -= pages;
-		++i;
-	}
-
-exit:
-	return err;
-}
-
-void ocf_metadata_query_cores(ocf_ctx_t owner, ocf_volume_t volume,
-		struct ocf_volume_uuid *uuid, uint32_t count,
-		ocf_metadata_query_cores_end_t cmpl, void *priv)
-{
-	struct ocf_metadata_ctrl *ctrl = NULL;
-	struct query_cores_context *context;
-	int err;
-
-	if (count > OCF_CORE_MAX)
-		OCF_CMPL_RET(priv, -OCF_ERR_INVAL, 0);
-
-	/* intialize query context */
-	context = env_secure_alloc(sizeof(*context));
-	if (!context)
-		OCF_CMPL_RET(priv, -OCF_ERR_NO_MEM, 0);
-
-	ENV_BUG_ON(env_memset(context, sizeof(*context), 0));
-	context->ctx = owner;
-	context->params.cmpl = cmpl;
-	context->params.priv = priv;
-	context->params.uuids = uuid;
-	context->params.uuids_count = count;
-	env_atomic_set(&context->count, 1);
-
-	ctrl = ocf_metadata_ctrl_init(false);
-	if (!ctrl) {
-		err = -OCF_ERR_NO_MEM;
-		goto exit;
-	}
-
-	/* superblock I/O */
-	err = ocf_metadata_query_cores_segment_io(context, owner,
-			volume, metadata_segment_sb_config, ctrl,
-			&context->data.superblock);
-	if (err)
-		goto exit;
-
-	/* core config I/O */
-	err = ocf_metadata_query_cores_segment_io(context, owner,
-			volume, metadata_segment_core_uuid, ctrl,
-			&context->data.core_uuids);
-	if (err)
-		goto exit;
-
-	/* core uuid I/O */
-	err = ocf_metadata_query_cores_segment_io(context, owner,
-			volume, metadata_segment_core_config, ctrl,
-			&context->data.core_config);
-	if (err)
-		goto exit;
-exit:
-	env_vfree(ctrl);
-	ocf_metadata_query_cores_end(context, err);
-}
-
-static void ocf_metadata_flush_lock_collision_page(struct ocf_cache *cache,
-		struct ocf_metadata_raw *raw, uint32_t page)
-
-{
-	ocf_collision_start_exclusive_access(&cache->metadata.lock,
-			page);
-}
-
-static void ocf_metadata_flush_unlock_collision_page(
-		struct ocf_cache *cache, struct ocf_metadata_raw *raw,
-		uint32_t page)
-
-{
-	ocf_collision_end_exclusive_access(&cache->metadata.lock,
-			page);
-}
-
-static void ocf_metadata_init_layout(struct ocf_cache *cache,
-		ocf_metadata_layout_t layout)
-{
-	ENV_BUG_ON(layout >= ocf_metadata_layout_max || layout < 0);
-
-	/* Initialize metadata location interface*/
-	if (cache->device->init_mode == ocf_init_mode_metadata_volatile)
-		layout = ocf_metadata_layout_seq;
-	cache->metadata.layout = layout;
-}
-
-/*
- * Initialize hash metadata interface
- */
-int ocf_metadata_init_variable_size(struct ocf_cache *cache,
-		uint64_t device_size, ocf_cache_line_size_t cache_line_size,
-		ocf_metadata_layout_t layout)
-{
-	int result = 0;
-	uint32_t i = 0;
-	ocf_cache_line_t line;
-	struct ocf_metadata_ctrl *ctrl = NULL;
-	struct ocf_cache_line_settings *settings =
-		(struct ocf_cache_line_settings *)&cache->metadata.settings;
-	ocf_flush_page_synch_t lock_page, unlock_page;
-	uint64_t device_lines;
-
-	OCF_DEBUG_TRACE(cache);
-
-	ENV_WARN_ON(!cache->metadata.priv);
-
-	ctrl = cache->metadata.priv;
-
-	device_lines = device_size / cache_line_size;
-	if (device_lines >= (ocf_cache_line_t)(-1)){
-		/* TODO: This is just a rough check. Most optimal one would be
-		 * located in calculate_metadata_size. */
-		ocf_cache_log(cache, log_err, "Device exceeds maximum suported size "
-				"with this cache line size. Try bigger cache line size.");
-		return -OCF_ERR_INVAL_CACHE_DEV;
-	}
-
-	ctrl->device_lines = device_lines;
-
-	if (settings->size != cache_line_size)
-		/* Re-initialize settings with different cache line size */
-		ocf_metadata_config_init(cache, settings, cache_line_size);
-
-	ctrl->mapping_size = ocf_metadata_status_sizeof(settings)
-		+ sizeof(struct ocf_metadata_map);
-
-	ocf_metadata_init_layout(cache, layout);
-
-	/* Initial setup of dynamic size RAW containers */
-	for (i = metadata_segment_variable_size_start;
-			i < metadata_segment_max; i++) {
-		struct ocf_metadata_raw *raw = &ctrl->raw_desc[i];
-
-		raw->metadata_segment = i;
-
-		/* Default type for metadata RAW container */
-		raw->raw_type = metadata_raw_type_ram;
-
-		if (cache->device->init_mode == ocf_init_mode_metadata_volatile) {
-			raw->raw_type = metadata_raw_type_volatile;
-		} else if (i == metadata_segment_collision &&
-				ocf_volume_is_atomic(&cache->device->volume)) {
-			raw->raw_type = metadata_raw_type_atomic;
-		}
-
-		/* Entry size configuration */
-		raw->entry_size
-			= ocf_metadata_get_element_size(i, settings);
-		raw->entries_in_page = PAGE_SIZE / raw->entry_size;
-	}
-
-	if (0 != ocf_metadata_calculate_metadata_size(cache, ctrl,
-			settings)) {
-		return -1;
-	}
-
-	OCF_DEBUG_PARAM(cache, "Metadata begin pages = %u", ctrl->start_page);
-	OCF_DEBUG_PARAM(cache, "Metadata count pages = %u", ctrl->count_pages);
-	OCF_DEBUG_PARAM(cache, "Metadata end pages = %u", ctrl->start_page
-			+ ctrl->count_pages);
-
-	/*
-	 * Initialize all dynamic size  RAW types
-	 */
-	for (i = metadata_segment_variable_size_start;
-			i < metadata_segment_max; i++) {
-		if (i == metadata_segment_collision) {
-			lock_page =
-				ocf_metadata_flush_lock_collision_page;
-			unlock_page =
-				ocf_metadata_flush_unlock_collision_page;
-		} else {
-			lock_page = unlock_page = NULL;
-		}
-
-		result |= ocf_metadata_raw_init(cache, lock_page, unlock_page,
-				&(ctrl->raw_desc[i]));
-
-		if (result)
-			goto finalize;
-	}
-
-	for (i = 0; i < metadata_segment_max; i++) {
-		ocf_cache_log(cache, log_info, "%s offset : %llu kiB\n",
-				ocf_metadata_segment_names[i],
-				ctrl->raw_desc[i].ssd_pages_offset
-				* PAGE_SIZE / KiB);
-		if (i == metadata_segment_sb_config) {
-			ocf_cache_log(cache, log_info, "%s size : %lu B\n",
-				ocf_metadata_segment_names[i],
-				offsetof(struct ocf_superblock_config, checksum)
-				+ sizeof(((struct ocf_superblock_config *)0)
-						->checksum));
-		} else if (i == metadata_segment_sb_runtime) {
-			ocf_cache_log(cache, log_info, "%s size : %lu B\n",
-				ocf_metadata_segment_names[i],
-				sizeof(struct ocf_superblock_runtime));
-		} else {
-			ocf_cache_log(cache, log_info, "%s size : %llu kiB\n",
-					ocf_metadata_segment_names[i],
-					ctrl->raw_desc[i].ssd_pages
-					* PAGE_SIZE / KiB);
-		}
-	}
-
-finalize:
-	if (result) {
-		/*
-		 * Hash De-Init also contains RAW deinitialization
-		 */
-		ocf_metadata_deinit_variable_size(cache);
-		return result;
-	}
-
-	cache->device->runtime_meta = METADATA_MEM_POOL(ctrl,
-			metadata_segment_sb_runtime);
-
-	cache->device->collision_table_entries = ctrl->cachelines;
-
-	cache->device->hash_table_entries =
-			ctrl->raw_desc[metadata_segment_hash].entries;
-
-	cache->device->metadata_offset = ctrl->count_pages * PAGE_SIZE;
-
-	cache->conf_meta->cachelines = ctrl->cachelines;
-	cache->conf_meta->line_size = cache_line_size;
-
-	ocf_metadata_raw_info(cache, ctrl);
-
-	ocf_cache_log(cache, log_info, "Cache line size: %llu kiB\n",
-			settings->size / KiB);
-
-	ocf_cache_log(cache, log_info, "Metadata capacity: %llu MiB\n",
-			(uint64_t)ocf_metadata_size_of(cache) / MiB);
-
-	/*
-	 * Self test of metadata
-	 */
-	for (line = 0; line < cache->device->collision_table_entries; line++) {
-		ocf_cache_line_t phy, lg;
-
-		phy = ocf_metadata_map_lg2phy(cache, line);
-		lg = ocf_metadata_map_phy2lg(cache, phy);
-
-		if (line != lg) {
-			result = -OCF_ERR_INVAL;
-			break;
-		}
-		env_cond_resched();
-	}
-
-	if (result == 0) {
-		ocf_cache_log(cache, log_info,
-				"OCF metadata self-test PASSED\n");
-	} else {
-		ocf_cache_log(cache, log_err,
-				"OCF metadata self-test ERROR\n");
-	}
-
-	result = ocf_metadata_concurrency_attached_init(&cache->metadata.lock,
-			cache, ctrl->raw_desc[metadata_segment_hash].entries,
-			(uint32_t)ctrl->raw_desc[metadata_segment_collision].
-			ssd_pages);
-	if (result) {
-		ocf_cache_log(cache, log_err, "Failed to initialize attached "
-				"metadata concurrency\n");
-		ocf_metadata_deinit_variable_size(cache);
-		return  result;
-	}
-
-	return 0;
-}
-
-static inline void _ocf_init_collision_entry(struct ocf_cache *cache,
-		ocf_cache_line_t idx)
-{
-	ocf_cache_line_t invalid_idx = cache->device->collision_table_entries;
-
-	ocf_metadata_set_collision_info(cache, idx, invalid_idx, invalid_idx);
-	ocf_metadata_set_core_info(cache, idx,
-			OCF_CORE_MAX, ULONG_MAX);
-	metadata_init_status_bits(cache, idx);
-}
-
-/*
- * Initialize collision table
- */
-void ocf_metadata_init_collision(struct ocf_cache *cache)
-{
-	unsigned int i;
-	unsigned int step = 0;
-
-	for (i = 0; i < cache->device->collision_table_entries; i++) {
-		_ocf_init_collision_entry(cache, i);
-		OCF_COND_RESCHED_DEFAULT(step);
-	}
-}
-
-/*
- * Initialize hash table
- */
-void ocf_metadata_init_hash_table(struct ocf_cache *cache)
-{
-	unsigned int i;
-	unsigned int hash_table_entries = cache->device->hash_table_entries;
-	ocf_cache_line_t invalid_idx = cache->device->collision_table_entries;
-
-	/* Init hash table */
-	for (i = 0; i < hash_table_entries; i++) {
-		/* hash_table contains indexes from collision_table
-		 * thus it shall be initialized in improper values
-		 * from collision_table
-		 **/
-		ocf_metadata_set_hash(cache, i, invalid_idx);
-	}
-
-}
-
-/*
- * Get count of pages that is dedicated for metadata
- */
-ocf_cache_line_t ocf_metadata_get_pages_count(struct ocf_cache *cache)
-{
-	struct ocf_metadata_ctrl *ctrl = NULL;
-
-	OCF_DEBUG_TRACE(cache);
-
-	ctrl = (struct ocf_metadata_ctrl *) cache->metadata.priv;
-
-	return ctrl->count_pages;
-}
-
-/*
- * Get amount of cache lines
- */
-ocf_cache_line_t ocf_metadata_get_cachelines_count(
-		struct ocf_cache *cache)
-{
-	struct ocf_metadata_ctrl *ctrl = NULL;
-
-	OCF_DEBUG_TRACE(cache);
-
-	ctrl = (struct ocf_metadata_ctrl *) cache->metadata.priv;
-
-	return ctrl->cachelines;
-}
-
-size_t ocf_metadata_size_of(struct ocf_cache *cache)
-{
-	uint32_t i = 0;
-	size_t size = 0;
-	struct ocf_metadata_ctrl *ctrl = NULL;
-
-	OCF_DEBUG_TRACE(cache);
-
-	ctrl = (struct ocf_metadata_ctrl *) cache->metadata.priv;
-
-	/*
-	 * Get size of all RAW metadata container
-	 */
-	for (i = 0; i < metadata_segment_max; i++) {
-		size += ocf_metadata_raw_size_of(cache,
-				&(ctrl->raw_desc[i]));
-	}
-
-	/* Get additional part of memory footprint */
-
-	/* Cache concurrency mechnism */
-	size += ocf_cache_line_concurrency_size_of(cache);
-
-	return size;
-}
-
-/*******************************************************************************
- * Super Block
- ******************************************************************************/
-
-struct ocf_metadata_context {
-	ocf_metadata_end_t cmpl;
-	void *priv;
-	ocf_pipeline_t pipeline;
-	ocf_cache_t cache;
-	struct ocf_metadata_raw segment_copy[metadata_segment_fixed_size_max];
-};
-
-static void ocf_metadata_generic_complete(void *priv, int error)
-{
-	struct ocf_metadata_context *context = priv;
-
-	OCF_PL_NEXT_ON_SUCCESS_RET(context->pipeline, error);
-}
-
-static void ocf_metadata_load_segment(ocf_pipeline_t pipeline,
-		void *priv, ocf_pipeline_arg_t arg)
-{
-	struct ocf_metadata_context *context = priv;
-	int segment = ocf_pipeline_arg_get_int(arg);
-	struct ocf_metadata_ctrl *ctrl;
-	ocf_cache_t cache = context->cache;
-
-	ctrl = (struct ocf_metadata_ctrl *)cache->metadata.priv;
-
-	ocf_metadata_raw_load_all(cache, &ctrl->raw_desc[segment],
-			ocf_metadata_generic_complete, context);
-}
-
-static void ocf_metadata_store_segment(ocf_pipeline_t pipeline,
-		void *priv, ocf_pipeline_arg_t arg)
-{
-	struct ocf_metadata_context *context = priv;
-	int segment = ocf_pipeline_arg_get_int(arg);
-	struct ocf_metadata_ctrl *ctrl;
-	ocf_cache_t cache = context->cache;
-	int error;
-
-	ctrl = (struct ocf_metadata_ctrl *)cache->metadata.priv;
-
-	context->segment_copy[segment].mem_pool =
-		env_malloc(ctrl->raw_desc[segment].mem_pool_limit, ENV_MEM_NORMAL);
-	if (!context->segment_copy[segment].mem_pool)
-		OCF_PL_FINISH_RET(pipeline, -OCF_ERR_NO_MEM);
-
-	error = env_memcpy(context->segment_copy[segment].mem_pool,
-			ctrl->raw_desc[segment].mem_pool_limit, METADATA_MEM_POOL(ctrl, segment),
-			ctrl->raw_desc[segment].mem_pool_limit);
-	if (error) {
-		env_free(context->segment_copy[segment].mem_pool);
-		context->segment_copy[segment].mem_pool = NULL;
-		OCF_PL_FINISH_RET(pipeline, error);
-	}
-
-	ocf_pipeline_next(pipeline);
-}
-
-static void ocf_metadata_check_crc_sb_config(ocf_pipeline_t pipeline,
-		void *priv, ocf_pipeline_arg_t arg)
-{
-	struct ocf_metadata_context *context = priv;
-	struct ocf_metadata_ctrl *ctrl;
-	struct ocf_superblock_config *sb_config;
-	ocf_cache_t cache = context->cache;
-	int segment = metadata_segment_sb_config;
-	uint32_t crc;
-
-	ctrl = (struct ocf_metadata_ctrl *)cache->metadata.priv;
-	sb_config = METADATA_MEM_POOL(ctrl, metadata_segment_sb_config);
-
-	crc = env_crc32(0, (void *)sb_config,
-			offsetof(struct ocf_superblock_config, checksum));
-
-	if (crc != sb_config->checksum[segment]) {
-		/* Checksum does not match */
-		ocf_cache_log(cache, log_err,
-				"Loading %s ERROR, invalid checksum",
-				ocf_metadata_segment_names[segment]);
-		OCF_PL_FINISH_RET(pipeline, -OCF_ERR_INVAL);
-	}
-
-	ocf_pipeline_next(pipeline);
-}
-
-static void ocf_metadata_check_crc_skip(ocf_pipeline_t pipeline,
-		void *priv, ocf_pipeline_arg_t arg, bool skip_on_dirty_shutdown)
-{
-	struct ocf_metadata_context *context = priv;
-	int segment = ocf_pipeline_arg_get_int(arg);
-	struct ocf_metadata_ctrl *ctrl;
-	struct ocf_superblock_config *sb_config;
-	ocf_cache_t cache = context->cache;
-	uint32_t crc;
-
-	ctrl = (struct ocf_metadata_ctrl *)cache->metadata.priv;
-	sb_config = METADATA_MEM_POOL(ctrl, metadata_segment_sb_config);
-
-	if (!sb_config->clean_shutdown && skip_on_dirty_shutdown)
-		OCF_PL_NEXT_RET(pipeline);
-
-	crc = ocf_metadata_raw_checksum(cache, &(ctrl->raw_desc[segment]));
-
-	if (crc != sb_config->checksum[segment]) {
-		/* Checksum does not match */
-		if (!sb_config->clean_shutdown) {
-			ocf_cache_log(cache, log_warn,
-					"Loading %s WARNING, invalid checksum",
-					ocf_metadata_segment_names[segment]);
-		} else {
-			ocf_cache_log(cache, log_err,
-					"Loading %s ERROR, invalid checksum",
-					ocf_metadata_segment_names[segment]);
-			OCF_PL_FINISH_RET(pipeline, -OCF_ERR_INVAL);
-		}
-	}
-
-	ocf_pipeline_next(pipeline);
-}
-
-static void ocf_metadata_check_crc(ocf_pipeline_t pipeline,
-		void *priv, ocf_pipeline_arg_t arg)
-{
-	ocf_metadata_check_crc_skip(pipeline, priv, arg, false);
-}
-
-static void ocf_metadata_check_crc_if_clean(ocf_pipeline_t pipeline,
-		void *priv, ocf_pipeline_arg_t arg)
-{
-	ocf_metadata_check_crc_skip(pipeline, priv, arg, true);
-}
-
-static void ocf_metadata_load_superblock_post(ocf_pipeline_t pipeline,
-		void *priv, ocf_pipeline_arg_t arg)
-{
-	struct ocf_metadata_context *context = priv;
-	struct ocf_metadata_ctrl *ctrl;
-	struct ocf_superblock_config *sb_config;
-	ocf_cache_t cache = context->cache;
-	struct ocf_metadata_uuid *muuid;
-	struct ocf_volume_uuid uuid;
-	ocf_volume_type_t volume_type;
-	ocf_core_t core;
-	ocf_core_id_t core_id;
-
-	ctrl = (struct ocf_metadata_ctrl *)cache->metadata.priv;
-	sb_config = METADATA_MEM_POOL(ctrl, metadata_segment_sb_config);
-
-	for_each_core_metadata(cache, core, core_id) {
-		muuid = ocf_metadata_get_core_uuid(cache, core_id);
-		uuid.data = muuid->data;
-		uuid.size = muuid->size;
-
-		volume_type = ocf_ctx_get_volume_type(cache->owner,
-				core->conf_meta->type);
-
-		/* Initialize core volume */
-		ocf_volume_init(&core->volume, volume_type, &uuid, false);
-		core->has_volume = true;
-	}
-
-	/* Restore all dynamics items */
-
-	if (sb_config->core_count > OCF_CORE_MAX) {
-		ocf_cache_log(cache, log_err,
-			"Loading cache state ERROR, invalid cores count\n");
-		OCF_PL_FINISH_RET(pipeline, -OCF_ERR_INVAL);
-	}
-
-	if (sb_config->valid_parts_no > OCF_IO_CLASS_MAX) {
-		ocf_cache_log(cache, log_err,
-			"Loading cache state ERROR, invalid partition count\n");
-		OCF_PL_FINISH_RET(pipeline, -OCF_ERR_INVAL);
-	}
-
-	ocf_pipeline_next(pipeline);
-}
-
-static void ocf_metadata_load_sb_restore(
-		struct ocf_metadata_context *context)
-{
-	ocf_cache_t cache = context->cache;
-	struct ocf_metadata_ctrl *ctrl;
-	int segment, error;
-
-	ctrl = (struct ocf_metadata_ctrl *)cache->metadata.priv;
-
-	for (segment = metadata_segment_sb_config;
-			segment < metadata_segment_fixed_size_max; segment++) {
-		if (!context->segment_copy[segment].mem_pool)
-			continue;
-
-		error = env_memcpy(METADATA_MEM_POOL(ctrl, segment),
-				ctrl->raw_desc[segment].mem_pool_limit,
-				context->segment_copy[segment].mem_pool,
-				ctrl->raw_desc[segment].mem_pool_limit);
-		ENV_BUG_ON(error);
-	}
-}
-
-static void ocf_metadata_load_superblock_finish(ocf_pipeline_t pipeline,
-		void *priv, int error)
-{
-	struct ocf_metadata_context *context = priv;
-	ocf_cache_t cache = context->cache;
-	int segment;
-
-	if (error) {
-		ocf_cache_log(cache, log_err, "Metadata read FAILURE\n");
-		ocf_metadata_error(cache);
-		ocf_metadata_load_sb_restore(context);
-	}
-
-	for (segment = metadata_segment_sb_config;
-			segment < metadata_segment_fixed_size_max; segment++) {
-		if (context->segment_copy[segment].mem_pool)
-			env_free(context->segment_copy[segment].mem_pool);
-	}
-
-	context->cmpl(context->priv, error);
-	ocf_pipeline_destroy(pipeline);
-}
-
-struct ocf_pipeline_arg ocf_metadata_load_sb_store_segment_args[] = {
-	OCF_PL_ARG_INT(metadata_segment_sb_config),
-	OCF_PL_ARG_INT(metadata_segment_sb_runtime),
-	OCF_PL_ARG_INT(metadata_segment_part_config),
-	OCF_PL_ARG_INT(metadata_segment_part_runtime),
-	OCF_PL_ARG_INT(metadata_segment_core_config),
-	OCF_PL_ARG_TERMINATOR(),
-};
-
-struct ocf_pipeline_arg ocf_metadata_load_sb_load_segment_args[] = {
-	OCF_PL_ARG_INT(metadata_segment_sb_config),
-	OCF_PL_ARG_INT(metadata_segment_sb_runtime),
-	OCF_PL_ARG_INT(metadata_segment_part_config),
-	OCF_PL_ARG_INT(metadata_segment_part_runtime),
-	OCF_PL_ARG_INT(metadata_segment_core_config),
-	OCF_PL_ARG_INT(metadata_segment_core_uuid),
-	OCF_PL_ARG_TERMINATOR(),
-};
-
-struct ocf_pipeline_arg ocf_metadata_load_sb_check_crc_args[] = {
-	OCF_PL_ARG_INT(metadata_segment_part_config),
-	OCF_PL_ARG_INT(metadata_segment_core_config),
-	OCF_PL_ARG_INT(metadata_segment_core_uuid),
-	OCF_PL_ARG_TERMINATOR(),
-};
-
-struct ocf_pipeline_arg ocf_metadata_load_sb_check_crc_args_clean[] = {
-	OCF_PL_ARG_INT(metadata_segment_sb_runtime),
-	OCF_PL_ARG_INT(metadata_segment_part_runtime),
-	OCF_PL_ARG_TERMINATOR(),
-};
-
-struct ocf_pipeline_properties ocf_metadata_load_sb_pipeline_props = {
-	.priv_size = sizeof(struct ocf_metadata_context),
-	.finish = ocf_metadata_load_superblock_finish,
-	.steps = {
-		OCF_PL_STEP_FOREACH(ocf_metadata_store_segment,
-				ocf_metadata_load_sb_store_segment_args),
-		OCF_PL_STEP_FOREACH(ocf_metadata_load_segment,
-				ocf_metadata_load_sb_load_segment_args),
-		OCF_PL_STEP(ocf_metadata_check_crc_sb_config),
-		OCF_PL_STEP_FOREACH(ocf_metadata_check_crc,
-				ocf_metadata_load_sb_check_crc_args),
-		OCF_PL_STEP_FOREACH(ocf_metadata_check_crc_if_clean,
-				ocf_metadata_load_sb_check_crc_args_clean),
-		OCF_PL_STEP(ocf_metadata_load_superblock_post),
-		OCF_PL_STEP_TERMINATOR(),
-	},
-};
-
-/*
- * Super Block - Load, This function has to prevent to pointers overwrite
- */
-void ocf_metadata_load_superblock(ocf_cache_t cache, ocf_metadata_end_t cmpl,
-		void *priv)
-{
-	struct ocf_metadata_context *context;
-	ocf_pipeline_t pipeline;
-	struct ocf_metadata_ctrl *ctrl;
-	struct ocf_superblock_config *sb_config;
-	struct ocf_superblock_runtime *sb_runtime;
-	int result;
-
-	OCF_DEBUG_TRACE(cache);
-
-	ctrl = (struct ocf_metadata_ctrl *) cache->metadata.priv;
-	ENV_BUG_ON(!ctrl);
-
-	sb_config = METADATA_MEM_POOL(ctrl, metadata_segment_sb_config);
-	ENV_BUG_ON(!sb_config);
-
-	sb_runtime = METADATA_MEM_POOL(ctrl, metadata_segment_sb_runtime);
-	ENV_BUG_ON(!sb_runtime);
-
-	result = ocf_pipeline_create(&pipeline, cache,
-			&ocf_metadata_load_sb_pipeline_props);
-	if (result)
-		OCF_CMPL_RET(priv, result);
-
-	context = ocf_pipeline_get_priv(pipeline);
-
-	context->cmpl = cmpl;
-	context->priv = priv;
-	context->pipeline = pipeline;
-	context->cache = cache;
-
-	ocf_pipeline_next(pipeline);
-}
-
-static void ocf_metadata_flush_superblock_prepare(ocf_pipeline_t pipeline,
-		void *priv, ocf_pipeline_arg_t arg)
-{
-	struct ocf_metadata_context *context = priv;
-	ocf_cache_t cache = context->cache;
-	ocf_core_t core;
-	ocf_core_id_t core_id;
-
-	/* Synchronize core objects types */
-	for_each_core_metadata(cache, core, core_id) {
-		core->conf_meta->type = ocf_ctx_get_volume_type_id(
-				cache->owner, core->volume.type);
-	}
-
-	ocf_pipeline_next(pipeline);
-}
-
-static void ocf_metadata_calculate_crc_sb_config(ocf_pipeline_t pipeline,
-		void *priv, ocf_pipeline_arg_t arg)
-{
-	struct ocf_metadata_context *context = priv;
-	struct ocf_metadata_ctrl *ctrl;
-	struct ocf_superblock_config *sb_config;
-	ocf_cache_t cache = context->cache;
-
-	ctrl = (struct ocf_metadata_ctrl *)cache->metadata.priv;
-	sb_config = METADATA_MEM_POOL(ctrl, metadata_segment_sb_config);
-
-	sb_config->checksum[metadata_segment_sb_config] = env_crc32(0,
-			(void *)sb_config,
-			offsetof(struct ocf_superblock_config, checksum));
-
-	ocf_pipeline_next(pipeline);
-}
-
-static void ocf_metadata_calculate_crc(ocf_pipeline_t pipeline,
-		void *priv, ocf_pipeline_arg_t arg)
-{
-	struct ocf_metadata_context *context = priv;
-	int segment = ocf_pipeline_arg_get_int(arg);
-	struct ocf_metadata_ctrl *ctrl;
-	struct ocf_superblock_config *sb_config;
-	ocf_cache_t cache = context->cache;
-
-	ctrl = (struct ocf_metadata_ctrl *)cache->metadata.priv;
-	sb_config = METADATA_MEM_POOL(ctrl, metadata_segment_sb_config);
-
-	sb_config->checksum[segment] = ocf_metadata_raw_checksum(cache,
-			&(ctrl->raw_desc[segment]));
-
-	ocf_pipeline_next(pipeline);
-}
-
-static void ocf_metadata_flush_segment(ocf_pipeline_t pipeline,
-		void *priv, ocf_pipeline_arg_t arg)
-{
-	struct ocf_metadata_context *context = priv;
-	int segment = ocf_pipeline_arg_get_int(arg);
-	struct ocf_metadata_ctrl *ctrl;
-	ocf_cache_t cache = context->cache;
-
-	ctrl = (struct ocf_metadata_ctrl *)cache->metadata.priv;
-
-	ocf_metadata_raw_flush_all(cache, &ctrl->raw_desc[segment],
-			ocf_metadata_generic_complete, context);
-}
-
-static void ocf_metadata_flush_superblock_finish(ocf_pipeline_t pipeline,
-		void *priv, int error)
-{
-	struct ocf_metadata_context *context = priv;
-	ocf_cache_t cache = context->cache;
-
-	if (error)
-		ocf_metadata_error(cache);
-
-	context->cmpl(context->priv, error);
-	ocf_pipeline_destroy(pipeline);
-}
-
-static void ocf_metadata_flush_disk_end(void *priv, int error)
-{
-	struct ocf_metadata_context *context = priv;
-	ocf_pipeline_t pipeline = context->pipeline;
-
-	if (error) {
-		OCF_PL_FINISH_RET(pipeline, error);
-		return;
-	}
-
-	ocf_pipeline_next(pipeline);
-}
-
-static void ocf_metadata_flush_disk(ocf_pipeline_t pipeline,
-		void *priv, ocf_pipeline_arg_t arg)
-{
-	struct ocf_metadata_context *context = priv;
-	ocf_cache_t cache = context->cache;
-
-	ocf_submit_volume_flush(ocf_cache_get_volume(cache),
-		ocf_metadata_flush_disk_end, context);
-}
-
-struct ocf_pipeline_arg ocf_metadata_flush_sb_calculate_crc_args[] = {
-	OCF_PL_ARG_INT(metadata_segment_part_config),
-	OCF_PL_ARG_INT(metadata_segment_core_config),
-	OCF_PL_ARG_INT(metadata_segment_core_uuid),
-	OCF_PL_ARG_TERMINATOR(),
-};
-
-struct ocf_pipeline_arg ocf_metadata_flush_sb_flush_segment_args[] = {
-	OCF_PL_ARG_INT(metadata_segment_sb_config),
-	OCF_PL_ARG_INT(metadata_segment_part_config),
-	OCF_PL_ARG_INT(metadata_segment_core_config),
-	OCF_PL_ARG_INT(metadata_segment_core_uuid),
-	OCF_PL_ARG_TERMINATOR(),
-};
-
-struct ocf_pipeline_properties ocf_metadata_flush_sb_pipeline_props = {
-	.priv_size = sizeof(struct ocf_metadata_context),
-	.finish = ocf_metadata_flush_superblock_finish,
-	.steps = {
-		OCF_PL_STEP(ocf_metadata_flush_superblock_prepare),
-		OCF_PL_STEP(ocf_metadata_calculate_crc_sb_config),
-		OCF_PL_STEP_FOREACH(ocf_metadata_calculate_crc,
-				ocf_metadata_flush_sb_calculate_crc_args),
-		OCF_PL_STEP_FOREACH(ocf_metadata_flush_segment,
-				ocf_metadata_flush_sb_flush_segment_args),
-		OCF_PL_STEP(ocf_metadata_flush_disk),
-		OCF_PL_STEP_TERMINATOR(),
-	},
-};
-
-/*
- * Super Block - FLUSH
- */
-void ocf_metadata_flush_superblock(ocf_cache_t cache,
-		ocf_metadata_end_t cmpl, void *priv)
-{
-	struct ocf_metadata_context *context;
-	ocf_pipeline_t pipeline;
-	int result;
-
-	OCF_DEBUG_TRACE(cache);
-
-	result = ocf_pipeline_create(&pipeline, cache,
-			&ocf_metadata_flush_sb_pipeline_props);
-	if (result)
-		OCF_CMPL_RET(priv, result);
-
-	context = ocf_pipeline_get_priv(pipeline);
-
-	context->cmpl = cmpl;
-	context->priv = priv;
-	context->pipeline = pipeline;
-	context->cache = cache;
-
-	ocf_pipeline_next(pipeline);
-}
-
-/**
- * @brief Super Block - Set Shutdown Status
- *
- * to get shutdown status, one needs to call ocf_metadata_load_properties.
- * @param shutdown_status - status to be assigned to cache.
- *
- * @return Operation status (0 success, otherwise error)
- */
-void ocf_metadata_set_shutdown_status(ocf_cache_t cache,
-		enum ocf_metadata_shutdown_status shutdown_status,
-		ocf_metadata_end_t cmpl, void *priv)
-{
-	struct ocf_metadata_ctrl *ctrl;
-	struct ocf_superblock_config *superblock;
-
-	OCF_DEBUG_TRACE(cache);
-
-	/*
-	 * Get metadata hash service control structure
-	 */
-	ctrl = (struct ocf_metadata_ctrl *) cache->metadata.priv;
-
-	/*
-	 * Get super block
-	 */
-	superblock = METADATA_MEM_POOL(ctrl, metadata_segment_sb_config);
-
-	/* Set shutdown status */
-	superblock->clean_shutdown = shutdown_status;
-	superblock->magic_number = CACHE_MAGIC_NUMBER;
-
-	/* Flush superblock */
-	ocf_metadata_flush_superblock(cache, cmpl, priv);
-}
-
-/*******************************************************************************
- * RESERVED AREA
- ******************************************************************************/
-
-uint64_t ocf_metadata_get_reserved_lba(
-		struct ocf_cache *cache)
-{
-	struct ocf_metadata_ctrl *ctrl;
-
-	OCF_DEBUG_TRACE(cache);
-
-	ctrl = (struct ocf_metadata_ctrl *) cache->metadata.priv;
-	return ctrl->raw_desc[metadata_segment_reserved].ssd_pages_offset *
-			PAGE_SIZE;
-}
-
-/*******************************************************************************
- * FLUSH AND LOAD ALL
- ******************************************************************************/
-
-static void ocf_metadata_flush_all_set_status_complete(
-		void *priv, int error)
-{
-	struct ocf_metadata_context *context = priv;
-
-	OCF_PL_NEXT_ON_SUCCESS_RET(context->pipeline, error);
-}
-
-static void ocf_metadata_flush_all_set_status(ocf_pipeline_t pipeline,
-		void *priv, ocf_pipeline_arg_t arg)
-{
-	struct ocf_metadata_context *context = priv;
-	ocf_cache_t cache = context->cache;
-	enum ocf_metadata_shutdown_status shutdown_status =
-			ocf_pipeline_arg_get_int(arg);
-
-	ocf_metadata_set_shutdown_status(cache, shutdown_status,
-			ocf_metadata_flush_all_set_status_complete,
-			context);
-}
-
-static void ocf_metadata_flush_all_finish(ocf_pipeline_t pipeline,
-		void *priv, int error)
-{
-	struct ocf_metadata_context *context = priv;
-	ocf_cache_t cache = context->cache;
-
-	if (error) {
-		ocf_cache_log(cache, log_err, "Metadata Flush ERROR\n");
-		ocf_metadata_error(cache);
-		goto out;
-	}
-
-	ocf_cache_log(cache, log_info, "Done saving cache state!\n");
-
-out:
-	context->cmpl(context->priv, error);
-	ocf_pipeline_destroy(pipeline);
-}
-
-struct ocf_pipeline_arg ocf_metadata_flush_all_args[] = {
-	OCF_PL_ARG_INT(metadata_segment_sb_runtime),
-	OCF_PL_ARG_INT(metadata_segment_part_runtime),
-	OCF_PL_ARG_INT(metadata_segment_core_runtime),
-	OCF_PL_ARG_INT(metadata_segment_cleaning),
-	OCF_PL_ARG_INT(metadata_segment_eviction),
-	OCF_PL_ARG_INT(metadata_segment_collision),
-	OCF_PL_ARG_INT(metadata_segment_list_info),
-	OCF_PL_ARG_INT(metadata_segment_hash),
-	OCF_PL_ARG_TERMINATOR(),
-};
-
-struct ocf_pipeline_properties ocf_metadata_flush_all_pipeline_props = {
-	.priv_size = sizeof(struct ocf_metadata_context),
-	.finish = ocf_metadata_flush_all_finish,
-	.steps = {
-		OCF_PL_STEP_ARG_INT(ocf_metadata_flush_all_set_status,
-				ocf_metadata_dirty_shutdown),
-		OCF_PL_STEP_FOREACH(ocf_metadata_flush_segment,
-				ocf_metadata_flush_all_args),
-		OCF_PL_STEP_FOREACH(ocf_metadata_calculate_crc,
-				ocf_metadata_flush_all_args),
-		OCF_PL_STEP_ARG_INT(ocf_metadata_flush_all_set_status,
-				ocf_metadata_clean_shutdown),
-		OCF_PL_STEP_TERMINATOR(),
-	},
-};
-
-/*
- * Flush all metadata
- */
-void ocf_metadata_flush_all(ocf_cache_t cache,
-		ocf_metadata_end_t cmpl, void *priv)
-{
-	struct ocf_metadata_context *context;
-	ocf_pipeline_t pipeline;
-	int result;
-
-	OCF_DEBUG_TRACE(cache);
-
-	result = ocf_pipeline_create(&pipeline, cache,
-			&ocf_metadata_flush_all_pipeline_props);
-	if (result)
-		OCF_CMPL_RET(priv, result);
-
-	context = ocf_pipeline_get_priv(pipeline);
-
-	context->cmpl = cmpl;
-	context->priv = priv;
-	context->pipeline = pipeline;
-	context->cache = cache;
-
-	ocf_pipeline_next(pipeline);
-}
-
-/*
- * Flush specified cache line
- */
-void ocf_metadata_flush_mark(struct ocf_cache *cache,
-		struct ocf_request *req, uint32_t map_idx, int to_state,
-		uint8_t start, uint8_t stop)
-{
-	struct ocf_metadata_ctrl *ctrl = NULL;
-
-	OCF_DEBUG_TRACE(cache);
-
-	ctrl = (struct ocf_metadata_ctrl *) cache->metadata.priv;
-
-	/*
-	 * Mark all required metadata elements to make given metadata cache
-	 * line persistent in case of recovery
-	 */
-
-	/* Collision table to get mapping cache line to HDD sector*/
-	ocf_metadata_raw_flush_mark(cache,
-			&(ctrl->raw_desc[metadata_segment_collision]),
-			req, map_idx, to_state, start, stop);
-}
-
-/*
- * Flush specified cache lines asynchronously
- */
-void ocf_metadata_flush_do_asynch(struct ocf_cache *cache,
-		struct ocf_request *req, ocf_req_end_t complete)
-{
-	int result = 0;
-	struct ocf_metadata_ctrl *ctrl = NULL;
-
-	OCF_DEBUG_TRACE(cache);
-
-	ctrl = (struct ocf_metadata_ctrl *) cache->metadata.priv;
-
-	/*
-	 * Flush all required metadata elements to make given metadata cache
-	 * line persistent in case of recovery
-	 */
-
-	env_atomic_inc(&req->req_remaining); /* Core device IO */
-
-	result |= ocf_metadata_raw_flush_do_asynch(cache, req,
-			&(ctrl->raw_desc[metadata_segment_collision]),
-			complete);
-
-	if (result) {
-		ocf_metadata_error(cache);
-		ocf_cache_log(cache, log_err, "Metadata Flush ERROR\n");
-	}
-}
-
-static void ocf_metadata_load_all_finish(ocf_pipeline_t pipeline,
-		void *priv, int error)
-{
-	struct ocf_metadata_context *context = priv;
-	ocf_cache_t cache = context->cache;
-
-	if (error) {
-		ocf_cache_log(cache, log_err, "Metadata read FAILURE\n");
-		ocf_metadata_error(cache);
-		goto out;
-	}
-
-	ocf_cache_log(cache, log_info, "Done loading cache state\n");
-
-out:
-	context->cmpl(context->priv, error);
-	ocf_pipeline_destroy(pipeline);
-}
-
-struct ocf_pipeline_arg ocf_metadata_load_all_args[] = {
-	OCF_PL_ARG_INT(metadata_segment_core_runtime),
-	OCF_PL_ARG_INT(metadata_segment_cleaning),
-	OCF_PL_ARG_INT(metadata_segment_eviction),
-	OCF_PL_ARG_INT(metadata_segment_collision),
-	OCF_PL_ARG_INT(metadata_segment_list_info),
-	OCF_PL_ARG_INT(metadata_segment_hash),
-	OCF_PL_ARG_TERMINATOR(),
-};
-
-struct ocf_pipeline_properties ocf_metadata_load_all_pipeline_props = {
-	.priv_size = sizeof(struct ocf_metadata_context),
-	.finish = ocf_metadata_load_all_finish,
-	.steps = {
-		OCF_PL_STEP_FOREACH(ocf_metadata_load_segment,
-				ocf_metadata_load_all_args),
-		OCF_PL_STEP_FOREACH(ocf_metadata_check_crc,
-				ocf_metadata_load_all_args),
-		OCF_PL_STEP_TERMINATOR(),
-	},
-};
-
-/*
- * Load all metadata
- */
-void ocf_metadata_load_all(ocf_cache_t cache,
-		ocf_metadata_end_t cmpl, void *priv)
-{
-	struct ocf_metadata_context *context;
-	ocf_pipeline_t pipeline;
-	int result;
-
-	OCF_DEBUG_TRACE(cache);
-
-	result = ocf_pipeline_create(&pipeline, cache,
-			&ocf_metadata_load_all_pipeline_props);
-	if (result)
-		OCF_CMPL_RET(priv, result);
-
-	context = ocf_pipeline_get_priv(pipeline);
-
-	context->cmpl = cmpl;
-	context->priv = priv;
-	context->pipeline = pipeline;
-	context->cache = cache;
-
-	ocf_pipeline_next(pipeline);
-}
-
-static void _recovery_rebuild_cline_metadata(ocf_cache_t cache,
-		ocf_core_id_t core_id, uint64_t core_line,
-		ocf_cache_line_t cache_line)
-{
-	ocf_core_t core = ocf_cache_get_core(cache, core_id);
-	ocf_part_id_t part_id;
-	ocf_cache_line_t hash_index;
-
-	part_id = PARTITION_DEFAULT;
-
-	ocf_metadata_add_to_partition(cache, part_id, cache_line);
-
-	hash_index = ocf_metadata_hash_func(cache, core_line, core_id);
-	ocf_metadata_add_to_collision(cache, core_id, core_line, hash_index,
-			cache_line);
-
-	ocf_eviction_init_cache_line(cache, cache_line);
-
-	ocf_eviction_set_hot_cache_line(cache, cache_line);
-
-	env_atomic_inc(&core->runtime_meta->cached_clines);
-	env_atomic_inc(&core->runtime_meta->
-			part_counters[part_id].cached_clines);
-
-	if (metadata_test_dirty(cache, cache_line)) {
-		env_atomic_inc(&core->runtime_meta->dirty_clines);
-		env_atomic_inc(&core->runtime_meta->
-				part_counters[part_id].dirty_clines);
-		env_atomic64_cmpxchg(&core->runtime_meta->dirty_since,
-				0, env_get_tick_count());
-	}
-}
-
-static void _recovery_invalidate_clean_sec(struct ocf_cache *cache,
-		ocf_cache_line_t cline)
-{
-	uint8_t i;
-
-	for (i = ocf_line_start_sector(cache);
-	     i <= ocf_line_end_sector(cache); i++) {
-		if (!metadata_test_dirty_one(cache, cline, i)) {
-			/* Invalidate clear sectors */
-			metadata_clear_valid_sec_one(cache, cline, i);
-		}
-	}
-}
-
-static void _recovery_reset_cline_metadata(struct ocf_cache *cache,
-		ocf_cache_line_t cline)
-{
-	ocf_cleaning_t clean_policy_type;
-
-	ocf_metadata_set_core_info(cache, cline, OCF_CORE_MAX, ULLONG_MAX);
-
-	metadata_clear_valid(cache, cline);
-
-	clean_policy_type = cache->conf_meta->cleaning_policy_type;
-
-	ENV_BUG_ON(clean_policy_type >= ocf_cleaning_max);
-
-	if (cleaning_policy_ops[clean_policy_type].init_cache_block != NULL)
-		cleaning_policy_ops[clean_policy_type].
-			init_cache_block(cache, cline);
-}
-
-static void _recovery_rebuild_metadata(ocf_pipeline_t pipeline,
-		void *priv, ocf_pipeline_arg_t arg)
-{
-	struct ocf_metadata_context *context = priv;
-	bool dirty_only = ocf_pipeline_arg_get_int(arg);
-	ocf_cache_t cache = context->cache;
-	ocf_cache_line_t cline;
-	ocf_core_id_t core_id;
-	uint64_t core_line;
-	unsigned char step = 0;
-	const uint64_t collision_table_entries =
-			ocf_metadata_collision_table_entries(cache);
-
-	ocf_metadata_start_exclusive_access(&cache->metadata.lock);
-
-	for (cline = 0; cline < collision_table_entries; cline++) {
-		ocf_metadata_get_core_info(cache, cline, &core_id, &core_line);
-		if (core_id != OCF_CORE_MAX &&
-				(!dirty_only || metadata_test_dirty(cache,
-						cline))) {
-			/* Rebuild metadata for mapped cache line */
-			_recovery_rebuild_cline_metadata(cache, core_id,
-					core_line, cline);
-			if (dirty_only)
-				_recovery_invalidate_clean_sec(cache, cline);
-		} else {
-			/* Reset metadata for not mapped or clean cache line */
-			_recovery_reset_cline_metadata(cache, cline);
-		}
-
-		OCF_COND_RESCHED(step, 128);
-	}
-
-	ocf_metadata_end_exclusive_access(&cache->metadata.lock);
-
-	ocf_pipeline_next(pipeline);
-}
-
-static void ocf_metadata_load_recovery_legacy_finish(
-		ocf_pipeline_t pipeline, void *priv, int error)
-{
-	struct ocf_metadata_context *context = priv;
-	ocf_cache_t cache = context->cache;
-
-	if (error) {
-		ocf_cache_log(cache, log_err,
-				"Metadata read for recovery FAILURE\n");
-		ocf_metadata_error(cache);
-		goto out;
-	}
-
-	ocf_cache_log(cache, log_info, "Done loading cache state\n");
-
-out:
-	context->cmpl(context->priv, error);
-	ocf_pipeline_destroy(pipeline);
-}
-
-struct ocf_pipeline_properties
-ocf_metadata_load_recovery_legacy_pl_props = {
-	.priv_size = sizeof(struct ocf_metadata_context),
-	.finish = ocf_metadata_load_recovery_legacy_finish,
-	.steps = {
-		OCF_PL_STEP_ARG_INT(ocf_metadata_load_segment,
-				metadata_segment_collision),
-		OCF_PL_STEP_ARG_INT(_recovery_rebuild_metadata, true),
-		OCF_PL_STEP_TERMINATOR(),
-	},
-};
-
-static void _ocf_metadata_load_recovery_legacy(ocf_cache_t cache,
-		ocf_metadata_end_t cmpl, void *priv)
-{
-	struct ocf_metadata_context *context;
-	ocf_pipeline_t pipeline;
-	int result;
-
-	OCF_DEBUG_TRACE(cache);
-
-	result = ocf_pipeline_create(&pipeline, cache,
-			&ocf_metadata_load_recovery_legacy_pl_props);
-	if (result)
-		OCF_CMPL_RET(priv, result);
-
-	context = ocf_pipeline_get_priv(pipeline);
-
-	context->cmpl = cmpl;
-	context->priv = priv;
-	context->pipeline = pipeline;
-	context->cache = cache;
-
-	ocf_pipeline_next(pipeline);
-}
-
-static ocf_core_id_t _ocf_metadata_find_core_by_seq(
-		struct ocf_cache *cache, ocf_seq_no_t seq_no)
-{
-	ocf_core_t core;
-	ocf_core_id_t core_id;
-
-	if (seq_no == OCF_SEQ_NO_INVALID)
-		return OCF_CORE_ID_INVALID;
-
-	for_each_core_all(cache, core, core_id) {
-		if (core->conf_meta->seq_no == seq_no)
-			break;
-	}
-
-	return core_id;
-}
-
-static void ocf_metadata_load_atomic_metadata_complete(
-		ocf_cache_t cache, void *priv, int error)
-{
-	struct ocf_metadata_context *context = priv;
-
-	OCF_PL_NEXT_ON_SUCCESS_RET(context->pipeline, error);
-}
-
-static int ocf_metadata_load_atomic_metadata_drain(void *priv,
-		uint64_t sector_addr, uint32_t sector_no, ctx_data_t *data)
-{
-	struct ocf_metadata_context *context = priv;
-	ocf_cache_t cache = context->cache;
-	struct ocf_atomic_metadata meta;
-	ocf_cache_line_t line = 0;
-	uint8_t pos = 0;
-	ocf_seq_no_t core_seq_no = OCF_SEQ_NO_INVALID;
-	ocf_core_id_t core_id = OCF_CORE_ID_INVALID;
-	uint64_t core_line = 0;
-	bool core_line_ok = false;
-	uint32_t i;
-
-	for (i = 0; i < sector_no; i++) {
-		ctx_data_rd_check(cache->owner, &meta, data, sizeof(meta));
-
-		line = (sector_addr + i) / ocf_line_sectors(cache);
-		line = ocf_metadata_map_phy2lg(cache, line);
-		pos = (sector_addr + i) % ocf_line_sectors(cache);
-		core_seq_no = meta.core_seq_no;
-		core_line = meta.core_line;
-
-		/* Look for core with sequence number same as cache line */
-		core_id = _ocf_metadata_find_core_by_seq(
-				cache, core_seq_no);
-
-		if (pos == 0)
-			core_line_ok = false;
-
-		if (meta.valid && core_id != OCF_CORE_ID_INVALID) {
-			if (!core_line_ok) {
-				ocf_metadata_set_core_info(cache, line,
-							core_id, core_line);
-				core_line_ok = true;
-			}
-
-			metadata_set_valid_sec_one(cache, line, pos);
-			meta.dirty ?
-				metadata_set_dirty_sec_one(cache, line, pos) :
-				metadata_clear_dirty_sec_one(cache, line, pos);
-		}
-	}
-
-	return 0;
-}
-
-static void ocf_metadata_load_atomic_metadata(
-		ocf_pipeline_t pipeline, void *priv, ocf_pipeline_arg_t arg)
-{
-	struct ocf_metadata_context *context = priv;
-	ocf_cache_t cache = context->cache;
-	int result;
-
-	result = metadata_io_read_i_atomic(cache, cache->mngt_queue,
-			context, ocf_metadata_load_atomic_metadata_drain,
-			ocf_metadata_load_atomic_metadata_complete);
-	if (result) {
-		ocf_metadata_error(cache);
-		ocf_cache_log(cache, log_err,
-				"Metadata read for recovery FAILURE\n");
-		OCF_PL_FINISH_RET(pipeline, result);
-	}
-}
-
-static void ocf_metadata_load_recovery_atomic_finish(
-		ocf_pipeline_t pipeline, void *priv, int error)
-{
-	struct ocf_metadata_context *context = priv;
-	ocf_cache_t cache = context->cache;
-
-	if (error) {
-		ocf_cache_log(cache, log_err,
-				"Metadata read for recovery FAILURE\n");
-		ocf_metadata_error(cache);
-	}
-
-	context->cmpl(context->priv, error);
-	ocf_pipeline_destroy(pipeline);
-}
-
-struct ocf_pipeline_properties
-ocf_metadata_load_recovery_atomic_pl_props = {
-	.priv_size = sizeof(struct ocf_metadata_context),
-	.finish = ocf_metadata_load_recovery_atomic_finish,
-	.steps = {
-		OCF_PL_STEP(ocf_metadata_load_atomic_metadata),
-		OCF_PL_STEP_ARG_INT(_recovery_rebuild_metadata, false),
-		OCF_PL_STEP_TERMINATOR(),
-	},
-};
-
-/*
- * RAM Implementation - Load all metadata elements from SSD
- */
-static void _ocf_metadata_load_recovery_atomic(ocf_cache_t cache,
-		ocf_metadata_end_t cmpl, void *priv)
-{
-	struct ocf_metadata_context *context;
-	ocf_pipeline_t pipeline;
-	int result;
-
-	OCF_DEBUG_TRACE(cache);
-
-	result = ocf_pipeline_create(&pipeline, cache,
-			&ocf_metadata_load_recovery_atomic_pl_props);
-	if (result)
-		OCF_CMPL_RET(priv, result);
-
-	context = ocf_pipeline_get_priv(pipeline);
-
-	context->cmpl = cmpl;
-	context->priv = priv;
-	context->pipeline = pipeline;
-	context->cache = cache;
-
-	ocf_pipeline_next(pipeline);
-}
-
-/*
- * Load for recovery - Load only data that is required for recovery procedure
- */
-void ocf_metadata_load_recovery(ocf_cache_t cache,
-		ocf_metadata_end_t cmpl, void *priv)
-{
-	OCF_DEBUG_TRACE(cache);
-
-	if (ocf_volume_is_atomic(&cache->device->volume))
-		_ocf_metadata_load_recovery_atomic(cache, cmpl, priv);
-	else
-		_ocf_metadata_load_recovery_legacy(cache, cmpl, priv);
-}
-
-/*******************************************************************************
- * Core Info
- ******************************************************************************/
-void ocf_metadata_get_core_info(struct ocf_cache *cache,
-		ocf_cache_line_t line, ocf_core_id_t *core_id,
-		uint64_t *core_sector)
-{
-	const struct ocf_metadata_map *collision;
-	struct ocf_metadata_ctrl *ctrl =
-		(struct ocf_metadata_ctrl *) cache->metadata.priv;
-
-	collision = ocf_metadata_raw_rd_access(cache,
-			&(ctrl->raw_desc[metadata_segment_collision]), line);
-	if (collision) {
-		if (core_id)
-			*core_id = collision->core_id;
-		if (core_sector)
-			*core_sector = collision->core_line;
-	} else {
-		ocf_metadata_error(cache);
-
-		if (core_id)
-			*core_id = OCF_CORE_MAX;
-		if (core_sector)
-			*core_sector = ULLONG_MAX;
-	}
-}
-
-void ocf_metadata_set_core_info(struct ocf_cache *cache,
-		ocf_cache_line_t line, ocf_core_id_t core_id,
-		uint64_t core_sector)
-{
-	struct ocf_metadata_map *collision;
-	struct ocf_metadata_ctrl *ctrl =
-		(struct ocf_metadata_ctrl *) cache->metadata.priv;
-
-	collision = ocf_metadata_raw_wr_access(cache,
-			&(ctrl->raw_desc[metadata_segment_collision]), line);
-
-	if (collision) {
-		collision->core_id = core_id;
-		collision->core_line = core_sector;
-	} else {
-		ocf_metadata_error(cache);
-	}
-}
-
-ocf_core_id_t ocf_metadata_get_core_id(struct ocf_cache *cache,
-		ocf_cache_line_t line)
-{
-	const struct ocf_metadata_map *collision;
-	struct ocf_metadata_ctrl *ctrl =
-		(struct ocf_metadata_ctrl *) cache->metadata.priv;
-
-	collision = ocf_metadata_raw_rd_access(cache,
-			&(ctrl->raw_desc[metadata_segment_collision]), line);
-
-	if (collision)
-		return collision->core_id;
-
-	ocf_metadata_error(cache);
-	return OCF_CORE_MAX;
-}
-
-struct ocf_metadata_uuid *ocf_metadata_get_core_uuid(
-		struct ocf_cache *cache, ocf_core_id_t core_id)
-{
-	struct ocf_metadata_uuid *muuid;
-	struct ocf_metadata_ctrl *ctrl =
-		(struct ocf_metadata_ctrl *) cache->metadata.priv;
-
-	muuid = ocf_metadata_raw_wr_access(cache,
-			&(ctrl->raw_desc[metadata_segment_core_uuid]), core_id);
-
-	if (!muuid)
-		ocf_metadata_error(cache);
-
-	return muuid;
-}
-
-/*******************************************************************************
- * Core and part id
- ******************************************************************************/
-
-void ocf_metadata_get_core_and_part_id(struct ocf_cache *cache,
-		ocf_cache_line_t line, ocf_core_id_t *core_id,
-		ocf_part_id_t *part_id)
-{
-	const struct ocf_metadata_map *collision;
-	const struct ocf_metadata_list_info *info;
-	struct ocf_metadata_ctrl *ctrl =
-		(struct ocf_metadata_ctrl *) cache->metadata.priv;
-
-	collision = ocf_metadata_raw_rd_access(cache,
-			&(ctrl->raw_desc[metadata_segment_collision]), line);
-
-	info =  ocf_metadata_raw_rd_access(cache,
-			&(ctrl->raw_desc[metadata_segment_list_info]), line);
-
-	if (collision && info) {
-		if (core_id)
-			*core_id = collision->core_id;
-		if (part_id)
-			*part_id = info->partition_id;
-	} else {
-		ocf_metadata_error(cache);
-		if (core_id)
-			*core_id = OCF_CORE_MAX;
-		if (part_id)
-			*part_id = PARTITION_DEFAULT;
-	}
-}
-/*******************************************************************************
- * Hash Table
- ******************************************************************************/
-
-/*
- * Hash Table - Get
- */
-ocf_cache_line_t ocf_metadata_get_hash(struct ocf_cache *cache,
-		ocf_cache_line_t index)
-{
-	struct ocf_metadata_ctrl *ctrl
-		= (struct ocf_metadata_ctrl *) cache->metadata.priv;
-
-	return *(ocf_cache_line_t *)ocf_metadata_raw_rd_access(cache,
-			&(ctrl->raw_desc[metadata_segment_hash]), index);
-}
-
-/*
- * Hash Table - Set
- */
-void ocf_metadata_set_hash(struct ocf_cache *cache, ocf_cache_line_t index,
-		ocf_cache_line_t line)
-{
-	struct ocf_metadata_ctrl *ctrl
-		= (struct ocf_metadata_ctrl *) cache->metadata.priv;
-
-	*(ocf_cache_line_t *)ocf_metadata_raw_wr_access(cache,
-			&(ctrl->raw_desc[metadata_segment_hash]), index) = line;
-}
-
-/*******************************************************************************
- * Cleaning Policy
- ******************************************************************************/
-
-/*
- * Cleaning policy - Get
- */
-struct cleaning_policy_meta *
-ocf_metadata_get_cleaning_policy(struct ocf_cache *cache,
-		ocf_cache_line_t line)
-{
-	struct ocf_metadata_ctrl *ctrl
-		= (struct ocf_metadata_ctrl *) cache->metadata.priv;
-
-	return ocf_metadata_raw_wr_access(cache,
-			&(ctrl->raw_desc[metadata_segment_cleaning]), line);
-}
-
-/*******************************************************************************
- *  Eviction policy
- ******************************************************************************/
-
-/*
- * Eviction policy - Get
- */
-union eviction_policy_meta *
-ocf_metadata_get_eviction_policy(struct ocf_cache *cache,
-		ocf_cache_line_t line)
-{
-	struct ocf_metadata_ctrl *ctrl
-		= (struct ocf_metadata_ctrl *) cache->metadata.priv;
-
-	return ocf_metadata_raw_wr_access(cache,
-			&(ctrl->raw_desc[metadata_segment_eviction]), line);
-}
-
-/*******************************************************************************
- *  Collision
- ******************************************************************************/
-static ocf_cache_line_t ocf_metadata_map_lg2phy_seq(
-		struct ocf_cache *cache, ocf_cache_line_t coll_idx)
-{
-	return coll_idx;
-}
-
-static ocf_cache_line_t ocf_metadata_map_phy2lg_seq(
-		struct ocf_cache *cache, ocf_cache_line_t cache_line)
-{
-	return cache_line;
-}
-
-/**
- * This function is mapping collision index to appropriate cache line
- * (logical cache line to physical one mapping).
- *
- * It is necessary because we want to generate sequential workload with
- * data to cache device.
- *	Our collision list, for example, looks:
- *			0 3 6 9
- *			1 4 7 10
- *			2 5 8
- *	All collision index in each column is on the same page
- *	on cache device. We don't want send request x times to the same
- *	page. To don't do it we use collision index by row, but in this
- *	case we can't use collision index directly as cache line,
- *	because we will generate non sequential workload (we will write
- *	pages: 0 -> 3 -> 6 ...). To map collision index in correct way
- *	we use this function.
- *
- *	After use this function, collision index in the above array
- *	corresponds with below cache line:
- *			0 1 2 3
- *			4 5 6 7
- *			8 9 10
- *
- * @param cache - cache instance
- * @param idx - index in collision list
- * @return mapped cache line
- */
-static ocf_cache_line_t ocf_metadata_map_lg2phy_striping(
-		struct ocf_cache *cache, ocf_cache_line_t coll_idx)
-{
-	ocf_cache_line_t cache_line = 0, offset = 0;
-	struct ocf_metadata_ctrl *ctrl =
-		(struct ocf_metadata_ctrl *) cache->metadata.priv;
-	unsigned int entries_in_page =
-		ctrl->raw_desc[metadata_segment_collision].entries_in_page;
-	unsigned int pages =
-		ctrl->raw_desc[metadata_segment_collision].ssd_pages;
-	ocf_cache_line_t collision_table_entries =
-			cache->device->collision_table_entries;
-	ocf_cache_line_t delta =
-			(entries_in_page * pages) - collision_table_entries;
-	unsigned int row = coll_idx % entries_in_page;
-
-	if (row > entries_in_page - delta)
-		offset = row - (entries_in_page - delta);
-	else
-		offset = 0;
-
-	cache_line = (row * pages) +  (coll_idx / entries_in_page) - offset;
-	return cache_line;
-}
-
-/**
- * @brief Map physical cache line on cache device to logical one
- * @note This function is the inverse of map_coll_idx_to_cache_line
- *
- * @param cache Cache instance
- * @param phy Physical cache line of cache device
- * @return Logical cache line
- */
-static ocf_cache_line_t ocf_metadata_map_phy2lg_striping(
-		struct ocf_cache *cache, ocf_cache_line_t cache_line)
-{
-	ocf_cache_line_t coll_idx = 0;
-
-	struct ocf_metadata_ctrl *ctrl =
-		(struct ocf_metadata_ctrl *) cache->metadata.priv;
-
-	struct ocf_metadata_raw *raw =
-		&ctrl->raw_desc[metadata_segment_collision];
-
-	unsigned int pages = raw->ssd_pages;
-	unsigned int entries_in_page = raw->entries_in_page;
-	unsigned int entries_in_last_page = raw->entries % entries_in_page ?:
-			entries_in_page;
-
-	unsigned int row = 0, coll = 0;
-
-	unsigned int last = entries_in_last_page * pages;
-
-	if (cache_line < last) {
-		row = cache_line % pages;
-		coll = cache_line / pages;
-	} else {
-		cache_line -= last;
-		row = cache_line % (pages - 1);
-		coll = cache_line / (pages - 1) + entries_in_last_page;
-	}
-
-	coll_idx = (row * entries_in_page) + coll;
-
-	return coll_idx;
-}
-
-ocf_cache_line_t ocf_metadata_map_lg2phy(
-		struct ocf_cache *cache, ocf_cache_line_t coll_idx)
-{
-	switch (cache->metadata.layout) {
-	case ocf_metadata_layout_striping:
-		return ocf_metadata_map_lg2phy_striping(
-				cache, coll_idx);
-	case ocf_metadata_layout_seq:
-		return ocf_metadata_map_lg2phy_seq(
-				cache, coll_idx);
-	default:
-		ENV_BUG();
-		return 0;
-	}
-}
-
-ocf_cache_line_t ocf_metadata_map_phy2lg(
-		struct ocf_cache *cache, ocf_cache_line_t cache_line)
-{
-	switch (cache->metadata.layout) {
-	case ocf_metadata_layout_striping:
-		return ocf_metadata_map_phy2lg_striping(
-				cache, cache_line);
-	case ocf_metadata_layout_seq:
-		return ocf_metadata_map_phy2lg_seq(
-				cache, cache_line);
-	default:
-		ENV_BUG();
-		return 0;
-	}
-}
-
-void ocf_metadata_set_collision_info(struct ocf_cache *cache,
-		ocf_cache_line_t line, ocf_cache_line_t next,
-		ocf_cache_line_t prev)
-{
-	struct ocf_metadata_list_info *info;
-	struct ocf_metadata_ctrl *ctrl =
-		(struct ocf_metadata_ctrl *) cache->metadata.priv;
-
-	info = ocf_metadata_raw_wr_access(cache,
-			&(ctrl->raw_desc[metadata_segment_list_info]), line);
-
-	if (info) {
-		info->next_col = next;
-		info->prev_col = prev;
-	} else {
-		ocf_metadata_error(cache);
-	}
-}
-
-void ocf_metadata_set_collision_next(struct ocf_cache *cache,
-		ocf_cache_line_t line, ocf_cache_line_t next)
-{
-	struct ocf_metadata_list_info *info;
-	struct ocf_metadata_ctrl *ctrl =
-		(struct ocf_metadata_ctrl *) cache->metadata.priv;
-
-	info = ocf_metadata_raw_wr_access(cache,
-			&(ctrl->raw_desc[metadata_segment_list_info]), line);
-
-	if (info)
-		info->next_col = next;
-	else
-		ocf_metadata_error(cache);
-}
-
-void ocf_metadata_set_collision_prev(struct ocf_cache *cache,
-		ocf_cache_line_t line, ocf_cache_line_t prev)
-{
-	struct ocf_metadata_list_info *info;
-	struct ocf_metadata_ctrl *ctrl =
-		(struct ocf_metadata_ctrl *) cache->metadata.priv;
-
-	info = ocf_metadata_raw_wr_access(cache,
-			&(ctrl->raw_desc[metadata_segment_list_info]), line);
-
-	if (info)
-		info->prev_col = prev;
-	else
-		ocf_metadata_error(cache);
-}
-
-void ocf_metadata_get_collision_info(struct ocf_cache *cache,
-		ocf_cache_line_t line, ocf_cache_line_t *next,
-		ocf_cache_line_t *prev)
-{
-	const struct ocf_metadata_list_info *info;
-	struct ocf_metadata_ctrl *ctrl =
-		(struct ocf_metadata_ctrl *) cache->metadata.priv;
-
-	ENV_BUG_ON(NULL == next && NULL == prev);
-
-	info = ocf_metadata_raw_rd_access(cache,
-			&(ctrl->raw_desc[metadata_segment_list_info]), line);
-	if (info) {
-		if (next)
-			*next = info->next_col;
-		if (prev)
-			*prev = info->prev_col;
-	} else {
-		ocf_metadata_error(cache);
-
-		if (next)
-			*next = cache->device->collision_table_entries;
-		if (prev)
-			*prev = cache->device->collision_table_entries;
-	}
-}
-
-void ocf_metadata_start_collision_shared_access(struct ocf_cache *cache,
-		ocf_cache_line_t line)
-{
-	struct ocf_metadata_ctrl *ctrl =
-		(struct ocf_metadata_ctrl *) cache->metadata.priv;
-	struct ocf_metadata_raw *raw =
-			&ctrl->raw_desc[metadata_segment_collision];
-	uint32_t page = ocf_metadata_raw_page(raw, line);
-
-	ocf_collision_start_shared_access(&cache->metadata.lock, page);
-}
-
-void ocf_metadata_end_collision_shared_access(struct ocf_cache *cache,
-		ocf_cache_line_t line)
-{
-	struct ocf_metadata_ctrl *ctrl =
-		(struct ocf_metadata_ctrl *) cache->metadata.priv;
-	struct ocf_metadata_raw *raw =
-			&ctrl->raw_desc[metadata_segment_collision];
-	uint32_t page = ocf_metadata_raw_page(raw, line);
-
-	ocf_collision_end_shared_access(&cache->metadata.lock, page);
-}
-
-/*******************************************************************************
- *  Partition
- ******************************************************************************/
-
-void ocf_metadata_get_partition_info(struct ocf_cache *cache,
-		ocf_cache_line_t line, ocf_part_id_t *part_id,
-		ocf_cache_line_t *next_line, ocf_cache_line_t *prev_line)
-{
-	const struct ocf_metadata_list_info *info;
-	struct ocf_metadata_ctrl *ctrl =
-		(struct ocf_metadata_ctrl *) cache->metadata.priv;
-
-	info = ocf_metadata_raw_rd_access(cache,
-			&(ctrl->raw_desc[metadata_segment_list_info]), line);
-
-	if (info) {
-		if (part_id)
-			*part_id = info->partition_id;
-		if (next_line)
-			*next_line = info->partition_next;
-		if (prev_line)
-			*prev_line = info->partition_prev;
-	} else {
-		ocf_metadata_error(cache);
-		if (part_id)
-			*part_id = PARTITION_DEFAULT;
-		if (next_line)
-			*next_line = cache->device->collision_table_entries;
-		if (prev_line)
-			*prev_line = cache->device->collision_table_entries;
-	}
-}
-
-void ocf_metadata_set_partition_next(struct ocf_cache *cache,
-		ocf_cache_line_t line, ocf_cache_line_t next_line)
-{
-	struct ocf_metadata_list_info *info;
-	struct ocf_metadata_ctrl *ctrl =
-		(struct ocf_metadata_ctrl *) cache->metadata.priv;
-
-	info = ocf_metadata_raw_wr_access(cache,
-			&(ctrl->raw_desc[metadata_segment_list_info]), line);
-
-	if (info)
-		info->partition_next = next_line;
-	else
-		ocf_metadata_error(cache);
-}
-
-void ocf_metadata_set_partition_prev(struct ocf_cache *cache,
-		ocf_cache_line_t line, ocf_cache_line_t prev_line)
-{
-	struct ocf_metadata_list_info *info;
-	struct ocf_metadata_ctrl *ctrl =
-		(struct ocf_metadata_ctrl *) cache->metadata.priv;
-
-	info = ocf_metadata_raw_wr_access(cache,
-			&(ctrl->raw_desc[metadata_segment_list_info]), line);
-
-	if (info)
-		info->partition_prev = prev_line;
-	else
-		ocf_metadata_error(cache);
-}
-
-void ocf_metadata_set_partition_info(struct ocf_cache *cache,
-		ocf_cache_line_t line, ocf_part_id_t part_id,
-		ocf_cache_line_t next_line, ocf_cache_line_t prev_line)
-{
-	struct ocf_metadata_list_info *info;
-	struct ocf_metadata_ctrl *ctrl =
-		(struct ocf_metadata_ctrl *) cache->metadata.priv;
-
-	info = ocf_metadata_raw_wr_access(cache,
-			&(ctrl->raw_desc[metadata_segment_list_info]), line);
-
-	if (info) {
-		info->partition_id = part_id;
-		info->partition_next = next_line;
-		info->partition_prev = prev_line;
-	} else {
-		ocf_metadata_error(cache);
-	}
-}
-
-/*******************************************************************************
- *  Bitmap status
- ******************************************************************************/
-
-#include "metadata_bit.h"
-
-#define _ocf_metadata_funcs_5arg(what) \
-bool ocf_metadata_##what(struct ocf_cache *cache, \
-	 ocf_cache_line_t line, uint8_t start, uint8_t stop, bool all) \
-{ \
-	switch (cache->metadata.settings.size) { \
-		case ocf_cache_line_size_4: \
-			return _ocf_metadata_##what##_u8(cache, line, start, stop, all); \
-		case ocf_cache_line_size_8: \
-			return _ocf_metadata_##what##_u16(cache, line, start, stop, all); \
-		case ocf_cache_line_size_16: \
-			return _ocf_metadata_##what##_u32(cache, line, start, stop, all); \
-		case ocf_cache_line_size_32: \
-			return _ocf_metadata_##what##_u64(cache, line, start, stop, all); \
-		case ocf_cache_line_size_64: \
-			return _ocf_metadata_##what##_u128(cache, line, start, stop, all); \
-		case ocf_cache_line_size_none: \
-		default: \
-			ENV_BUG_ON(1); \
-			return false; \
-	} \
-} \
-
-
-#define _ocf_metadata_funcs_4arg(what) \
-bool ocf_metadata_##what(struct ocf_cache *cache, \
-	 ocf_cache_line_t line, uint8_t start, uint8_t stop) \
-{ \
-	switch (cache->metadata.settings.size) { \
-		case ocf_cache_line_size_4: \
-			return _ocf_metadata_##what##_u8(cache, line, start, stop); \
-		case ocf_cache_line_size_8: \
-			return _ocf_metadata_##what##_u16(cache, line, start, stop); \
-		case ocf_cache_line_size_16: \
-			return _ocf_metadata_##what##_u32(cache, line, start, stop); \
-		case ocf_cache_line_size_32: \
-			return _ocf_metadata_##what##_u64(cache, line, start, stop); \
-		case ocf_cache_line_size_64: \
-			return _ocf_metadata_##what##_u128(cache, line, start, stop); \
-		case ocf_cache_line_size_none: \
-		default: \
-			ENV_BUG_ON(1); \
-			return false; \
-	} \
-} \
-
-#define _ocf_metadata_funcs(what) \
-	_ocf_metadata_funcs_5arg(test_##what) \
-	_ocf_metadata_funcs_4arg(test_out_##what) \
-	_ocf_metadata_funcs_4arg(clear_##what) \
-	_ocf_metadata_funcs_4arg(set_##what) \
-	_ocf_metadata_funcs_5arg(test_and_set_##what) \
-	_ocf_metadata_funcs_5arg(test_and_clear_##what)
-
-_ocf_metadata_funcs(dirty)
-_ocf_metadata_funcs(valid)
diff --git a/src/metadata/metadata_internal.h b/src/metadata/metadata_internal.h
new file mode 100644
index 0000000..c5023ad
--- /dev/null
+++ b/src/metadata/metadata_internal.h
@@ -0,0 +1,38 @@
+/*
+ * Copyright(c) 2020 Intel Corporation
+ * SPDX-License-Identifier: BSD-3-Clause-Clear
+ */
+
+#ifndef __METADATA_INTERNAL_H__
+#define __METADATA_INTERNAL_H__
+
+#include <ocf/ocf_def.h>
+#include "../ocf_cache_priv.h"
+#include "metadata_hash.h"
+#include "metadata_raw.h"
+
+#define METADATA_MEM_POOL(ctrl, section) ctrl->raw_desc[section].mem_pool
+
+/*
+ * Metadata control structure
+ */
+struct ocf_metadata_ctrl {
+	ocf_cache_line_t cachelines;
+	ocf_cache_line_t start_page;
+	ocf_cache_line_t count_pages;
+	uint32_t device_lines;
+	size_t mapping_size;
+	struct ocf_metadata_raw raw_desc[metadata_segment_max];
+};
+
+struct ocf_metadata_context {
+	ocf_metadata_end_t cmpl;
+	void *priv;
+	ocf_pipeline_t pipeline;
+	ocf_cache_t cache;
+	struct ocf_metadata_raw segment_copy[metadata_segment_fixed_size_max];
+};
+
+extern const char * const ocf_metadata_segment_names[];
+
+#endif
diff --git a/src/metadata/metadata_partition.c b/src/metadata/metadata_partition.c
index 4e46bba..dc913ac 100644
--- a/src/metadata/metadata_partition.c
+++ b/src/metadata/metadata_partition.c
@@ -5,8 +5,89 @@
 
 #include "ocf/ocf.h"
 #include "metadata.h"
+#include "metadata_internal.h"
 #include "../utils/utils_part.h"
 
+void ocf_metadata_get_partition_info(struct ocf_cache *cache,
+		ocf_cache_line_t line, ocf_part_id_t *part_id,
+		ocf_cache_line_t *next_line, ocf_cache_line_t *prev_line)
+{
+	const struct ocf_metadata_list_info *info;
+	struct ocf_metadata_ctrl *ctrl =
+		(struct ocf_metadata_ctrl *) cache->metadata.priv;
+
+	info = ocf_metadata_raw_rd_access(cache,
+			&(ctrl->raw_desc[metadata_segment_list_info]), line);
+
+	if (info) {
+		if (part_id)
+			*part_id = info->partition_id;
+		if (next_line)
+			*next_line = info->partition_next;
+		if (prev_line)
+			*prev_line = info->partition_prev;
+	} else {
+		ocf_metadata_error(cache);
+		if (part_id)
+			*part_id = PARTITION_DEFAULT;
+		if (next_line)
+			*next_line = cache->device->collision_table_entries;
+		if (prev_line)
+			*prev_line = cache->device->collision_table_entries;
+	}
+}
+
+void ocf_metadata_set_partition_next(struct ocf_cache *cache,
+		ocf_cache_line_t line, ocf_cache_line_t next_line)
+{
+	struct ocf_metadata_list_info *info;
+	struct ocf_metadata_ctrl *ctrl =
+		(struct ocf_metadata_ctrl *) cache->metadata.priv;
+
+	info = ocf_metadata_raw_wr_access(cache,
+			&(ctrl->raw_desc[metadata_segment_list_info]), line);
+
+	if (info)
+		info->partition_next = next_line;
+	else
+		ocf_metadata_error(cache);
+}
+
+void ocf_metadata_set_partition_prev(struct ocf_cache *cache,
+		ocf_cache_line_t line, ocf_cache_line_t prev_line)
+{
+	struct ocf_metadata_list_info *info;
+	struct ocf_metadata_ctrl *ctrl =
+		(struct ocf_metadata_ctrl *) cache->metadata.priv;
+
+	info = ocf_metadata_raw_wr_access(cache,
+			&(ctrl->raw_desc[metadata_segment_list_info]), line);
+
+	if (info)
+		info->partition_prev = prev_line;
+	else
+		ocf_metadata_error(cache);
+}
+
+void ocf_metadata_set_partition_info(struct ocf_cache *cache,
+		ocf_cache_line_t line, ocf_part_id_t part_id,
+		ocf_cache_line_t next_line, ocf_cache_line_t prev_line)
+{
+	struct ocf_metadata_list_info *info;
+	struct ocf_metadata_ctrl *ctrl =
+		(struct ocf_metadata_ctrl *) cache->metadata.priv;
+
+	info = ocf_metadata_raw_wr_access(cache,
+			&(ctrl->raw_desc[metadata_segment_list_info]), line);
+
+	if (info) {
+		info->partition_id = part_id;
+		info->partition_next = next_line;
+		info->partition_prev = prev_line;
+	} else {
+		ocf_metadata_error(cache);
+	}
+}
 /* Sets the given collision_index as the new _head_ of the Partition list. */
 static void update_partition_head(struct ocf_cache *cache,
 		ocf_part_id_t part_id, ocf_cache_line_t line)
diff --git a/src/metadata/metadata_segment_ops.c b/src/metadata/metadata_segment_ops.c
new file mode 100644
index 0000000..2a0b767
--- /dev/null
+++ b/src/metadata/metadata_segment_ops.c
@@ -0,0 +1,107 @@
+/*
+ * Copyright(c) 2020 Intel Corporation
+ * SPDX-License-Identifier: BSD-3-Clause-Clear
+ */
+#include "metadata_internal.h"
+#include "metadata_superblock.h"
+
+static void ocf_metadata_generic_complete(void *priv, int error)
+{
+	struct ocf_metadata_context *context = priv;
+
+	OCF_PL_NEXT_ON_SUCCESS_RET(context->pipeline, error);
+}
+
+static void ocf_metadata_check_crc_skip(ocf_pipeline_t pipeline,
+		void *priv, ocf_pipeline_arg_t arg, bool skip_on_dirty_shutdown)
+{
+	struct ocf_metadata_context *context = priv;
+	int segment = ocf_pipeline_arg_get_int(arg);
+	struct ocf_metadata_ctrl *ctrl;
+	struct ocf_superblock_config *sb_config;
+	ocf_cache_t cache = context->cache;
+	uint32_t crc;
+
+	ctrl = (struct ocf_metadata_ctrl *)cache->metadata.priv;
+	sb_config = METADATA_MEM_POOL(ctrl, metadata_segment_sb_config);
+
+	if (!sb_config->clean_shutdown && skip_on_dirty_shutdown)
+		OCF_PL_NEXT_RET(pipeline);
+
+	crc = ocf_metadata_raw_checksum(cache, &(ctrl->raw_desc[segment]));
+
+	if (crc != sb_config->checksum[segment]) {
+		/* Checksum does not match */
+		if (!sb_config->clean_shutdown) {
+			ocf_cache_log(cache, log_warn,
+					"Loading %s WARNING, invalid checksum",
+					ocf_metadata_segment_names[segment]);
+		} else {
+			ocf_cache_log(cache, log_err,
+					"Loading %s ERROR, invalid checksum",
+					ocf_metadata_segment_names[segment]);
+			OCF_PL_FINISH_RET(pipeline, -OCF_ERR_INVAL);
+		}
+	}
+
+	ocf_pipeline_next(pipeline);
+}
+
+void ocf_metadata_check_crc(ocf_pipeline_t pipeline,
+		void *priv, ocf_pipeline_arg_t arg)
+{
+	ocf_metadata_check_crc_skip(pipeline, priv, arg, false);
+}
+
+void ocf_metadata_check_crc_if_clean(ocf_pipeline_t pipeline,
+		void *priv, ocf_pipeline_arg_t arg)
+{
+	ocf_metadata_check_crc_skip(pipeline, priv, arg, true);
+}
+
+
+void ocf_metadata_calculate_crc(ocf_pipeline_t pipeline,
+		void *priv, ocf_pipeline_arg_t arg)
+{
+	struct ocf_metadata_context *context = priv;
+	int segment = ocf_pipeline_arg_get_int(arg);
+	struct ocf_metadata_ctrl *ctrl;
+	struct ocf_superblock_config *sb_config;
+	ocf_cache_t cache = context->cache;
+
+	ctrl = (struct ocf_metadata_ctrl *)cache->metadata.priv;
+	sb_config = METADATA_MEM_POOL(ctrl, metadata_segment_sb_config);
+
+	sb_config->checksum[segment] = ocf_metadata_raw_checksum(cache,
+			&(ctrl->raw_desc[segment]));
+
+	ocf_pipeline_next(pipeline);
+}
+
+void ocf_metadata_flush_segment(ocf_pipeline_t pipeline,
+		void *priv, ocf_pipeline_arg_t arg)
+{
+	struct ocf_metadata_context *context = priv;
+	int segment = ocf_pipeline_arg_get_int(arg);
+	struct ocf_metadata_ctrl *ctrl;
+	ocf_cache_t cache = context->cache;
+
+	ctrl = (struct ocf_metadata_ctrl *)cache->metadata.priv;
+
+	ocf_metadata_raw_flush_all(cache, &ctrl->raw_desc[segment],
+			ocf_metadata_generic_complete, context);
+}
+
+void ocf_metadata_load_segment(ocf_pipeline_t pipeline,
+		void *priv, ocf_pipeline_arg_t arg)
+{
+	struct ocf_metadata_context *context = priv;
+	int segment = ocf_pipeline_arg_get_int(arg);
+	struct ocf_metadata_ctrl *ctrl;
+	ocf_cache_t cache = context->cache;
+
+	ctrl = (struct ocf_metadata_ctrl *)cache->metadata.priv;
+
+	ocf_metadata_raw_load_all(cache, &ctrl->raw_desc[segment],
+			ocf_metadata_generic_complete, context);
+}
diff --git a/src/metadata/metadata_segment_ops.h b/src/metadata/metadata_segment_ops.h
new file mode 100644
index 0000000..3ef71d2
--- /dev/null
+++ b/src/metadata/metadata_segment_ops.h
@@ -0,0 +1,27 @@
+/*
+ * Copyright(c) 2020 Intel Corporation
+ * SPDX-License-Identifier: BSD-3-Clause-Clear
+ */
+
+#ifndef __METADATA_SEGMENT_OPS_H__
+#define __METADATA_SEGMENT_OPS_H__
+
+#include "metadata_raw.h"
+#include <ocf/ocf_def.h>
+
+void ocf_metadata_check_crc_if_clean(ocf_pipeline_t pipeline,
+		void *priv, ocf_pipeline_arg_t arg);
+
+void ocf_metadata_check_crc(ocf_pipeline_t pipeline,
+		void *priv, ocf_pipeline_arg_t arg);
+
+void ocf_metadata_calculate_crc(ocf_pipeline_t pipeline,
+		void *priv, ocf_pipeline_arg_t arg);
+
+void ocf_metadata_flush_segment(ocf_pipeline_t pipeline,
+		void *priv, ocf_pipeline_arg_t arg);
+
+void ocf_metadata_load_segment(ocf_pipeline_t pipeline,
+		void *priv, ocf_pipeline_arg_t arg);
+
+#endif
diff --git a/src/metadata/metadata_superblock.c b/src/metadata/metadata_superblock.c
new file mode 100644
index 0000000..d2e9d49
--- /dev/null
+++ b/src/metadata/metadata_superblock.c
@@ -0,0 +1,424 @@
+/*
+ * Copyright(c) 2020 Intel Corporation
+ * SPDX-License-Identifier: BSD-3-Clause-Clear
+ */
+
+#include "metadata.h"
+#include "metadata_core.h"
+#include "metadata_internal.h"
+#include "metadata_segment_ops.h"
+#include "metadata_superblock.h"
+#include "../ocf_priv.h"
+#include "../utils/utils_io.h"
+
+#define OCF_METADATA_SUPERBLOCK_DEBUG 0
+
+#if 1 == OCF_METADATA_SUPERBLOCK_DEBUG
+#define OCF_DEBUG_TRACE(cache) \
+	ocf_cache_log(cache, log_info, "[Metadata][Superblock] %s\n", \
+	__func__)
+#define OCF_DEBUG_PARAM(cache, format, ...) \
+	ocf_cache_log(cache, log_info, "[Metadata][Superblock] %s - " \
+			format"\n", __func__, ##__VA_ARGS__)
+#else
+#define OCF_DEBUG_TRACE(cache)
+#define OCF_DEBUG_PARAM(cache, format, ...)
+#endif
+
+
+/**
+ * @brief Super Block - Set Shutdown Status
+ *
+ * @param shutdown_status - status to be assigned to cache.
+ *
+ * @return Operation status (0 success, otherwise error)
+ */
+void ocf_metadata_set_shutdown_status(ocf_cache_t cache,
+		enum ocf_metadata_shutdown_status shutdown_status,
+		ocf_metadata_end_t cmpl, void *priv)
+{
+	struct ocf_metadata_ctrl *ctrl;
+	struct ocf_superblock_config *superblock;
+
+	OCF_DEBUG_TRACE(cache);
+
+	/*
+	 * Get metadata hash service control structure
+	 */
+	ctrl = (struct ocf_metadata_ctrl *) cache->metadata.priv;
+
+	/*
+	 * Get super block
+	 */
+	superblock = METADATA_MEM_POOL(ctrl, metadata_segment_sb_config);
+
+	/* Set shutdown status */
+	superblock->clean_shutdown = shutdown_status;
+	superblock->magic_number = CACHE_MAGIC_NUMBER;
+
+	/* Flush superblock */
+	ocf_metadata_flush_superblock(cache, cmpl, priv);
+}
+
+static void ocf_metadata_store_segment(ocf_pipeline_t pipeline,
+		void *priv, ocf_pipeline_arg_t arg)
+{
+	struct ocf_metadata_context *context = priv;
+	int segment = ocf_pipeline_arg_get_int(arg);
+	struct ocf_metadata_ctrl *ctrl;
+	ocf_cache_t cache = context->cache;
+	int error;
+
+	ctrl = (struct ocf_metadata_ctrl *)cache->metadata.priv;
+
+	context->segment_copy[segment].mem_pool =
+		env_malloc(ctrl->raw_desc[segment].mem_pool_limit, ENV_MEM_NORMAL);
+	if (!context->segment_copy[segment].mem_pool)
+		OCF_PL_FINISH_RET(pipeline, -OCF_ERR_NO_MEM);
+
+	error = env_memcpy(context->segment_copy[segment].mem_pool,
+			ctrl->raw_desc[segment].mem_pool_limit, METADATA_MEM_POOL(ctrl, segment),
+			ctrl->raw_desc[segment].mem_pool_limit);
+	if (error) {
+		env_free(context->segment_copy[segment].mem_pool);
+		context->segment_copy[segment].mem_pool = NULL;
+		OCF_PL_FINISH_RET(pipeline, error);
+	}
+
+	ocf_pipeline_next(pipeline);
+}
+
+static void ocf_metadata_check_crc_sb_config(ocf_pipeline_t pipeline,
+		void *priv, ocf_pipeline_arg_t arg)
+{
+	struct ocf_metadata_context *context = priv;
+	struct ocf_metadata_ctrl *ctrl;
+	struct ocf_superblock_config *sb_config;
+	ocf_cache_t cache = context->cache;
+	int segment = metadata_segment_sb_config;
+	uint32_t crc;
+
+	ctrl = (struct ocf_metadata_ctrl *)cache->metadata.priv;
+	sb_config = METADATA_MEM_POOL(ctrl, metadata_segment_sb_config);
+
+	crc = env_crc32(0, (void *)sb_config,
+			offsetof(struct ocf_superblock_config, checksum));
+
+	if (crc != sb_config->checksum[segment]) {
+		/* Checksum does not match */
+		ocf_cache_log(cache, log_err,
+				"Loading %s ERROR, invalid checksum",
+				ocf_metadata_segment_names[segment]);
+		OCF_PL_FINISH_RET(pipeline, -OCF_ERR_INVAL);
+	}
+
+	ocf_pipeline_next(pipeline);
+}
+
+static void ocf_metadata_load_superblock_post(ocf_pipeline_t pipeline,
+		void *priv, ocf_pipeline_arg_t arg)
+{
+	struct ocf_metadata_context *context = priv;
+	struct ocf_metadata_ctrl *ctrl;
+	struct ocf_superblock_config *sb_config;
+	ocf_cache_t cache = context->cache;
+	struct ocf_metadata_uuid *muuid;
+	struct ocf_volume_uuid uuid;
+	ocf_volume_type_t volume_type;
+	ocf_core_t core;
+	ocf_core_id_t core_id;
+
+	ctrl = (struct ocf_metadata_ctrl *)cache->metadata.priv;
+	sb_config = METADATA_MEM_POOL(ctrl, metadata_segment_sb_config);
+
+	for_each_core_metadata(cache, core, core_id) {
+		muuid = ocf_metadata_get_core_uuid(cache, core_id);
+		uuid.data = muuid->data;
+		uuid.size = muuid->size;
+
+		volume_type = ocf_ctx_get_volume_type(cache->owner,
+				core->conf_meta->type);
+
+		/* Initialize core volume */
+		ocf_volume_init(&core->volume, volume_type, &uuid, false);
+		core->has_volume = true;
+	}
+
+	/* Restore all dynamics items */
+
+	if (sb_config->core_count > OCF_CORE_MAX) {
+		ocf_cache_log(cache, log_err,
+			"Loading cache state ERROR, invalid cores count\n");
+		OCF_PL_FINISH_RET(pipeline, -OCF_ERR_INVAL);
+	}
+
+	if (sb_config->valid_parts_no > OCF_IO_CLASS_MAX) {
+		ocf_cache_log(cache, log_err,
+			"Loading cache state ERROR, invalid partition count\n");
+		OCF_PL_FINISH_RET(pipeline, -OCF_ERR_INVAL);
+	}
+
+	ocf_pipeline_next(pipeline);
+}
+
+static void ocf_metadata_load_sb_restore(
+		struct ocf_metadata_context *context)
+{
+	ocf_cache_t cache = context->cache;
+	struct ocf_metadata_ctrl *ctrl;
+	int segment, error;
+
+	ctrl = (struct ocf_metadata_ctrl *)cache->metadata.priv;
+
+	for (segment = metadata_segment_sb_config;
+			segment < metadata_segment_fixed_size_max; segment++) {
+		if (!context->segment_copy[segment].mem_pool)
+			continue;
+
+		error = env_memcpy(METADATA_MEM_POOL(ctrl, segment),
+				ctrl->raw_desc[segment].mem_pool_limit,
+				context->segment_copy[segment].mem_pool,
+				ctrl->raw_desc[segment].mem_pool_limit);
+		ENV_BUG_ON(error);
+	}
+}
+
+static void ocf_metadata_load_superblock_finish(ocf_pipeline_t pipeline,
+		void *priv, int error)
+{
+	struct ocf_metadata_context *context = priv;
+	ocf_cache_t cache = context->cache;
+	int segment;
+
+	if (error) {
+		ocf_cache_log(cache, log_err, "Metadata read FAILURE\n");
+		ocf_metadata_error(cache);
+		ocf_metadata_load_sb_restore(context);
+	}
+
+	for (segment = metadata_segment_sb_config;
+			segment < metadata_segment_fixed_size_max; segment++) {
+		if (context->segment_copy[segment].mem_pool)
+			env_free(context->segment_copy[segment].mem_pool);
+	}
+
+	context->cmpl(context->priv, error);
+	ocf_pipeline_destroy(pipeline);
+}
+
+struct ocf_pipeline_arg ocf_metadata_load_sb_store_segment_args[] = {
+	OCF_PL_ARG_INT(metadata_segment_sb_config),
+	OCF_PL_ARG_INT(metadata_segment_sb_runtime),
+	OCF_PL_ARG_INT(metadata_segment_part_config),
+	OCF_PL_ARG_INT(metadata_segment_part_runtime),
+	OCF_PL_ARG_INT(metadata_segment_core_config),
+	OCF_PL_ARG_TERMINATOR(),
+};
+
+struct ocf_pipeline_arg ocf_metadata_load_sb_load_segment_args[] = {
+	OCF_PL_ARG_INT(metadata_segment_sb_config),
+	OCF_PL_ARG_INT(metadata_segment_sb_runtime),
+	OCF_PL_ARG_INT(metadata_segment_part_config),
+	OCF_PL_ARG_INT(metadata_segment_part_runtime),
+	OCF_PL_ARG_INT(metadata_segment_core_config),
+	OCF_PL_ARG_INT(metadata_segment_core_uuid),
+	OCF_PL_ARG_TERMINATOR(),
+};
+
+struct ocf_pipeline_arg ocf_metadata_load_sb_check_crc_args[] = {
+	OCF_PL_ARG_INT(metadata_segment_part_config),
+	OCF_PL_ARG_INT(metadata_segment_core_config),
+	OCF_PL_ARG_INT(metadata_segment_core_uuid),
+	OCF_PL_ARG_TERMINATOR(),
+};
+
+struct ocf_pipeline_arg ocf_metadata_load_sb_check_crc_args_clean[] = {
+	OCF_PL_ARG_INT(metadata_segment_sb_runtime),
+	OCF_PL_ARG_INT(metadata_segment_part_runtime),
+	OCF_PL_ARG_TERMINATOR(),
+};
+
+struct ocf_pipeline_properties ocf_metadata_load_sb_pipeline_props = {
+	.priv_size = sizeof(struct ocf_metadata_context),
+	.finish = ocf_metadata_load_superblock_finish,
+	.steps = {
+		OCF_PL_STEP_FOREACH(ocf_metadata_store_segment,
+				ocf_metadata_load_sb_store_segment_args),
+		OCF_PL_STEP_FOREACH(ocf_metadata_load_segment,
+				ocf_metadata_load_sb_load_segment_args),
+		OCF_PL_STEP(ocf_metadata_check_crc_sb_config),
+		OCF_PL_STEP_FOREACH(ocf_metadata_check_crc,
+				ocf_metadata_load_sb_check_crc_args),
+		OCF_PL_STEP_FOREACH(ocf_metadata_check_crc_if_clean,
+				ocf_metadata_load_sb_check_crc_args_clean),
+		OCF_PL_STEP(ocf_metadata_load_superblock_post),
+		OCF_PL_STEP_TERMINATOR(),
+	},
+};
+
+/*
+ * Super Block - Load, This function has to prevent to pointers overwrite
+ */
+void ocf_metadata_load_superblock(ocf_cache_t cache, ocf_metadata_end_t cmpl,
+		void *priv)
+{
+	struct ocf_metadata_context *context;
+	ocf_pipeline_t pipeline;
+	struct ocf_metadata_ctrl *ctrl;
+	struct ocf_superblock_config *sb_config;
+	struct ocf_superblock_runtime *sb_runtime;
+	int result;
+
+	OCF_DEBUG_TRACE(cache);
+
+	ctrl = (struct ocf_metadata_ctrl *) cache->metadata.priv;
+	ENV_BUG_ON(!ctrl);
+
+	sb_config = METADATA_MEM_POOL(ctrl, metadata_segment_sb_config);
+	ENV_BUG_ON(!sb_config);
+
+	sb_runtime = METADATA_MEM_POOL(ctrl, metadata_segment_sb_runtime);
+	ENV_BUG_ON(!sb_runtime);
+
+	result = ocf_pipeline_create(&pipeline, cache,
+			&ocf_metadata_load_sb_pipeline_props);
+	if (result)
+		OCF_CMPL_RET(priv, result);
+
+	context = ocf_pipeline_get_priv(pipeline);
+
+	context->cmpl = cmpl;
+	context->priv = priv;
+	context->pipeline = pipeline;
+	context->cache = cache;
+
+	ocf_pipeline_next(pipeline);
+}
+
+static void ocf_metadata_flush_superblock_prepare(ocf_pipeline_t pipeline,
+		void *priv, ocf_pipeline_arg_t arg)
+{
+	struct ocf_metadata_context *context = priv;
+	ocf_cache_t cache = context->cache;
+	ocf_core_t core;
+	ocf_core_id_t core_id;
+
+	/* Synchronize core objects types */
+	for_each_core_metadata(cache, core, core_id) {
+		core->conf_meta->type = ocf_ctx_get_volume_type_id(
+				cache->owner, core->volume.type);
+	}
+
+	ocf_pipeline_next(pipeline);
+}
+
+static void ocf_metadata_calculate_crc_sb_config(ocf_pipeline_t pipeline,
+		void *priv, ocf_pipeline_arg_t arg)
+{
+	struct ocf_metadata_context *context = priv;
+	struct ocf_metadata_ctrl *ctrl;
+	struct ocf_superblock_config *sb_config;
+	ocf_cache_t cache = context->cache;
+
+	ctrl = (struct ocf_metadata_ctrl *)cache->metadata.priv;
+	sb_config = METADATA_MEM_POOL(ctrl, metadata_segment_sb_config);
+
+	sb_config->checksum[metadata_segment_sb_config] = env_crc32(0,
+			(void *)sb_config,
+			offsetof(struct ocf_superblock_config, checksum));
+
+	ocf_pipeline_next(pipeline);
+}
+
+static void ocf_metadata_flush_superblock_finish(ocf_pipeline_t pipeline,
+		void *priv, int error)
+{
+	struct ocf_metadata_context *context = priv;
+	ocf_cache_t cache = context->cache;
+
+	if (error)
+		ocf_metadata_error(cache);
+
+	context->cmpl(context->priv, error);
+	ocf_pipeline_destroy(pipeline);
+}
+
+static void ocf_metadata_flush_disk_end(void *priv, int error)
+{
+	struct ocf_metadata_context *context = priv;
+	ocf_pipeline_t pipeline = context->pipeline;
+
+	if (error) {
+		OCF_PL_FINISH_RET(pipeline, error);
+		return;
+	}
+
+	ocf_pipeline_next(pipeline);
+}
+
+static void ocf_metadata_flush_disk(ocf_pipeline_t pipeline,
+		void *priv, ocf_pipeline_arg_t arg)
+{
+	struct ocf_metadata_context *context = priv;
+	ocf_cache_t cache = context->cache;
+
+	ocf_submit_volume_flush(ocf_cache_get_volume(cache),
+		ocf_metadata_flush_disk_end, context);
+}
+
+struct ocf_pipeline_arg ocf_metadata_flush_sb_calculate_crc_args[] = {
+	OCF_PL_ARG_INT(metadata_segment_part_config),
+	OCF_PL_ARG_INT(metadata_segment_core_config),
+	OCF_PL_ARG_INT(metadata_segment_core_uuid),
+	OCF_PL_ARG_TERMINATOR(),
+};
+
+struct ocf_pipeline_arg ocf_metadata_flush_sb_flush_segment_args[] = {
+	OCF_PL_ARG_INT(metadata_segment_sb_config),
+	OCF_PL_ARG_INT(metadata_segment_part_config),
+	OCF_PL_ARG_INT(metadata_segment_core_config),
+	OCF_PL_ARG_INT(metadata_segment_core_uuid),
+	OCF_PL_ARG_TERMINATOR(),
+};
+
+struct ocf_pipeline_properties ocf_metadata_flush_sb_pipeline_props = {
+	.priv_size = sizeof(struct ocf_metadata_context),
+	.finish = ocf_metadata_flush_superblock_finish,
+	.steps = {
+		OCF_PL_STEP(ocf_metadata_flush_superblock_prepare),
+		OCF_PL_STEP(ocf_metadata_calculate_crc_sb_config),
+		OCF_PL_STEP_FOREACH(ocf_metadata_calculate_crc,
+				ocf_metadata_flush_sb_calculate_crc_args),
+		OCF_PL_STEP_FOREACH(ocf_metadata_flush_segment,
+				ocf_metadata_flush_sb_flush_segment_args),
+		OCF_PL_STEP(ocf_metadata_flush_disk),
+		OCF_PL_STEP_TERMINATOR(),
+	},
+};
+
+/*
+ * Super Block - FLUSH
+ */
+void ocf_metadata_flush_superblock(ocf_cache_t cache,
+		ocf_metadata_end_t cmpl, void *priv)
+{
+	struct ocf_metadata_context *context;
+	ocf_pipeline_t pipeline;
+	int result;
+
+	OCF_DEBUG_TRACE(cache);
+
+	result = ocf_pipeline_create(&pipeline, cache,
+			&ocf_metadata_flush_sb_pipeline_props);
+	if (result)
+		OCF_CMPL_RET(priv, result);
+
+	context = ocf_pipeline_get_priv(pipeline);
+
+	context->cmpl = cmpl;
+	context->priv = priv;
+	context->pipeline = pipeline;
+	context->cache = cache;
+
+	ocf_pipeline_next(pipeline);
+}

From 3eb556860858dc0fffad7e0e8e1df8f32f3b0282 Mon Sep 17 00:00:00 2001
From: Adam Rutkowski <adam.j.rutkowski@intel.com>
Date: Fri, 11 Dec 2020 15:36:18 +0100
Subject: [PATCH 12/13] rename segment->segment_id and segemnt_ops->segment

Signed-off-by: Adam Rutkowski <adam.j.rutkowski@intel.com>
---
 src/metadata/metadata.c                                | 10 +++++-----
 src/metadata/metadata.h                                |  2 +-
 src/metadata/metadata_internal.h                       |  2 +-
 src/metadata/metadata_raw.c                            |  2 +-
 src/metadata/metadata_raw.h                            |  2 +-
 src/metadata/metadata_raw_atomic.c                     |  2 +-
 src/metadata/metadata_raw_dynamic.c                    |  2 +-
 src/metadata/metadata_raw_volatile.c                   |  2 +-
 .../{metadata_segment_ops.c => metadata_segment.c}     |  0
 .../{metadata_segment_ops.h => metadata_segment.h}     |  0
 .../{metadata_hash.h => metadata_segment_id.h}         |  2 +-
 src/metadata/metadata_superblock.c                     |  2 +-
 src/metadata/metadata_superblock.h                     |  1 +
 13 files changed, 15 insertions(+), 14 deletions(-)
 rename src/metadata/{metadata_segment_ops.c => metadata_segment.c} (100%)
 rename src/metadata/{metadata_segment_ops.h => metadata_segment.h} (100%)
 rename src/metadata/{metadata_hash.h => metadata_segment_id.h} (97%)

diff --git a/src/metadata/metadata.c b/src/metadata/metadata.c
index 56e58cd..42658ef 100644
--- a/src/metadata/metadata.c
+++ b/src/metadata/metadata.c
@@ -7,11 +7,11 @@
 
 #include "metadata.h"
 #include "metadata_collision.h"
-#include "metadata_hash.h"
+#include "metadata_segment_id.h"
 #include "metadata_internal.h"
 #include "metadata_io.h"
 #include "metadata_raw.h"
-#include "metadata_segment_ops.h"
+#include "metadata_segment.h"
 #include "../concurrency/ocf_concurrency.h"
 #include "../ocf_def_priv.h"
 #include "../ocf_freelist.h"
@@ -59,7 +59,7 @@ static inline size_t ocf_metadata_status_sizeof(
  * get entries for specified metadata hash type
  */
 static ocf_cache_line_t ocf_metadata_get_entries(
-		enum ocf_metadata_segment type,
+		enum ocf_metadata_segment_id type,
 		ocf_cache_line_t cache_lines)
 {
 	ENV_BUG_ON(type >= metadata_segment_variable_size_start && cache_lines == 0);
@@ -112,7 +112,7 @@ static ocf_cache_line_t ocf_metadata_get_entries(
  * Get size of particular hash metadata type element
  */
 static int64_t ocf_metadata_get_element_size(
-		enum ocf_metadata_segment type,
+		enum ocf_metadata_segment_id type,
 		const struct ocf_cache_line_settings *settings)
 {
 	int64_t size = 0;
@@ -1952,7 +1952,7 @@ int ocf_metadata_query_cores_segment_io(
 		 struct query_cores_context *context,
 		ocf_ctx_t owner,
 		ocf_volume_t volume,
-		enum ocf_metadata_segment segment,
+		enum ocf_metadata_segment_id segment,
 		struct ocf_metadata_ctrl *ctrl,
 		struct query_cores_data *segment_data)
 {
diff --git a/src/metadata/metadata.h b/src/metadata/metadata.h
index 595efed..5507b08 100644
--- a/src/metadata/metadata.h
+++ b/src/metadata/metadata.h
@@ -12,7 +12,7 @@
 #include "metadata_cleaning_policy.h"
 #include "metadata_eviction_policy.h"
 #include "metadata_partition.h"
-#include "metadata_hash.h"
+#include "metadata_segment_id.h"
 #include "metadata_superblock.h"
 #include "metadata_status.h"
 #include "metadata_collision.h"
diff --git a/src/metadata/metadata_internal.h b/src/metadata/metadata_internal.h
index c5023ad..95adabf 100644
--- a/src/metadata/metadata_internal.h
+++ b/src/metadata/metadata_internal.h
@@ -8,7 +8,7 @@
 
 #include <ocf/ocf_def.h>
 #include "../ocf_cache_priv.h"
-#include "metadata_hash.h"
+#include "metadata_segment_id.h"
 #include "metadata_raw.h"
 
 #define METADATA_MEM_POOL(ctrl, section) ctrl->raw_desc[section].mem_pool
diff --git a/src/metadata/metadata_raw.c b/src/metadata/metadata_raw.c
index 052ffeb..8d7f646 100644
--- a/src/metadata/metadata_raw.c
+++ b/src/metadata/metadata_raw.c
@@ -4,7 +4,7 @@
  */
 
 #include "metadata.h"
-#include "metadata_hash.h"
+#include "metadata_segment_id.h"
 #include "metadata_raw.h"
 #include "metadata_io.h"
 #include "metadata_raw_atomic.h"
diff --git a/src/metadata/metadata_raw.h b/src/metadata/metadata_raw.h
index 1a26602..ffc12c7 100644
--- a/src/metadata/metadata_raw.h
+++ b/src/metadata/metadata_raw.h
@@ -57,7 +57,7 @@ struct ocf_metadata_raw {
 	/**
 	 * @name Metadata and RAW types
 	 */
-	enum ocf_metadata_segment metadata_segment; /*!< Metadata segment */
+	enum ocf_metadata_segment_id metadata_segment; /*!< Metadata segment */
 	enum ocf_metadata_raw_type raw_type; /*!< RAW implementation type */
 
 	/**
diff --git a/src/metadata/metadata_raw_atomic.c b/src/metadata/metadata_raw_atomic.c
index 6147f39..8137f5a 100644
--- a/src/metadata/metadata_raw_atomic.c
+++ b/src/metadata/metadata_raw_atomic.c
@@ -5,7 +5,7 @@
 
 #include "metadata.h"
 #include "metadata_io.h"
-#include "metadata_hash.h"
+#include "metadata_segment_id.h"
 #include "metadata_raw.h"
 #include "metadata_raw_atomic.h"
 #include "../utils/utils_io.h"
diff --git a/src/metadata/metadata_raw_dynamic.c b/src/metadata/metadata_raw_dynamic.c
index a034d76..cb185c2 100644
--- a/src/metadata/metadata_raw_dynamic.c
+++ b/src/metadata/metadata_raw_dynamic.c
@@ -4,7 +4,7 @@
  */
 
 #include "metadata.h"
-#include "metadata_hash.h"
+#include "metadata_segment_id.h"
 #include "metadata_raw.h"
 #include "metadata_raw_dynamic.h"
 #include "metadata_io.h"
diff --git a/src/metadata/metadata_raw_volatile.c b/src/metadata/metadata_raw_volatile.c
index e367b6d..eaae31e 100644
--- a/src/metadata/metadata_raw_volatile.c
+++ b/src/metadata/metadata_raw_volatile.c
@@ -4,7 +4,7 @@
  */
 
 #include "metadata.h"
-#include "metadata_hash.h"
+#include "metadata_segment_id.h"
 #include "metadata_raw.h"
 #include "metadata_io.h"
 #include "metadata_raw_volatile.h"
diff --git a/src/metadata/metadata_segment_ops.c b/src/metadata/metadata_segment.c
similarity index 100%
rename from src/metadata/metadata_segment_ops.c
rename to src/metadata/metadata_segment.c
diff --git a/src/metadata/metadata_segment_ops.h b/src/metadata/metadata_segment.h
similarity index 100%
rename from src/metadata/metadata_segment_ops.h
rename to src/metadata/metadata_segment.h
diff --git a/src/metadata/metadata_hash.h b/src/metadata/metadata_segment_id.h
similarity index 97%
rename from src/metadata/metadata_hash.h
rename to src/metadata/metadata_segment_id.h
index 51a70f6..3045302 100644
--- a/src/metadata/metadata_hash.h
+++ b/src/metadata/metadata_segment_id.h
@@ -15,7 +15,7 @@
 /**
  * @brief Metada hash elements type
  */
-enum ocf_metadata_segment {
+enum ocf_metadata_segment_id {
 	metadata_segment_sb_config = 0,	/*!< Super block conf */
 	metadata_segment_sb_runtime,	/*!< Super block runtime */
 	metadata_segment_reserved,	/*!< Reserved space on disk */
diff --git a/src/metadata/metadata_superblock.c b/src/metadata/metadata_superblock.c
index d2e9d49..5f563d8 100644
--- a/src/metadata/metadata_superblock.c
+++ b/src/metadata/metadata_superblock.c
@@ -6,7 +6,7 @@
 #include "metadata.h"
 #include "metadata_core.h"
 #include "metadata_internal.h"
-#include "metadata_segment_ops.h"
+#include "metadata_segment_id.h"
 #include "metadata_superblock.h"
 #include "../ocf_priv.h"
 #include "../utils/utils_io.h"
diff --git a/src/metadata/metadata_superblock.h b/src/metadata/metadata_superblock.h
index 49b15e5..73f88e7 100644
--- a/src/metadata/metadata_superblock.h
+++ b/src/metadata/metadata_superblock.h
@@ -7,6 +7,7 @@
 #define __METADATA_SUPERBLOCK_H__
 
 #include <ocf/ocf_def.h>
+#include "metadata_segment.h"
 
 #define CACHE_MAGIC_NUMBER	0x187E1CA6
 

From 822cd7c45aabdf3a89c7aaa75e091d46efa4f729 Mon Sep 17 00:00:00 2001
From: Adam Rutkowski <adam.j.rutkowski@intel.com>
Date: Fri, 11 Dec 2020 15:41:37 +0100
Subject: [PATCH 13/13] Introduce metadata superblock & segment structures

Refactoring metadata superblock and segment ops code
to make it less tightly coupled.

Signed-off-by: Adam Rutkowski <adam.j.rutkowski@intel.com>
---
 src/metadata/metadata.c            |  49 ++++++++++---
 src/metadata/metadata_internal.h   |   3 +
 src/metadata/metadata_raw.h        |   7 ++
 src/metadata/metadata_segment.c    | 106 +++++++++++++++++++++--------
 src/metadata/metadata_segment.h    |  17 +++++
 src/metadata/metadata_superblock.c |  89 ++++++++++++++++++++++--
 src/metadata/metadata_superblock.h |  23 +++++++
 7 files changed, 254 insertions(+), 40 deletions(-)

diff --git a/src/metadata/metadata.c b/src/metadata/metadata.c
index 42658ef..5eb4466 100644
--- a/src/metadata/metadata.c
+++ b/src/metadata/metadata.c
@@ -394,7 +394,6 @@ static void ocf_metadata_raw_info(struct ocf_cache *cache,
 void ocf_metadata_deinit_variable_size(struct ocf_cache *cache)
 {
 
-	int result = 0;
 	uint32_t i = 0;
 
 	struct ocf_metadata_ctrl *ctrl = (struct ocf_metadata_ctrl *)
@@ -409,8 +408,7 @@ void ocf_metadata_deinit_variable_size(struct ocf_cache *cache)
 	 */
 	for (i = metadata_segment_variable_size_start;
 			i < metadata_segment_max; i++) {
-		result |= ocf_metadata_raw_deinit(cache,
-				&(ctrl->raw_desc[i]));
+		ocf_metadata_segment_destroy(cache, ctrl->segment[i]);
 	}
 }
 
@@ -440,11 +438,16 @@ static void ocf_metadata_deinit_fixed_size(struct ocf_cache *cache)
 	struct ocf_metadata_ctrl *ctrl = (struct ocf_metadata_ctrl *)
 			cache->metadata.priv;
 
+	struct ocf_metadata_segment *superblock =
+		ctrl->segment[metadata_segment_sb_config];
+
 	for (i = 0; i < metadata_segment_fixed_size_max; i++) {
-		result |= ocf_metadata_raw_deinit(cache,
-				&(ctrl->raw_desc[i]));
+		if (i != metadata_segment_sb_config)
+			ocf_metadata_segment_destroy(cache, ctrl->segment[i]);
 	}
 
+	ocf_metadata_superblock_destroy(cache, superblock);
+
 	env_vfree(ctrl);
 	cache->metadata.priv = NULL;
 
@@ -513,6 +516,7 @@ static int ocf_metadata_init_fixed_size(struct ocf_cache *cache,
 	struct ocf_core_meta_runtime *core_meta_runtime;
 	struct ocf_user_part_config *part_config;
 	struct ocf_user_part_runtime *part_runtime;
+	struct ocf_metadata_segment *superblock;
 	ocf_core_t core;
 	ocf_core_id_t core_id;
 	uint32_t i = 0;
@@ -529,9 +533,25 @@ static int ocf_metadata_init_fixed_size(struct ocf_cache *cache,
 		return -OCF_ERR_NO_MEM;
 	metadata->priv = ctrl;
 
+	result = ocf_metadata_superblock_init(
+			&ctrl->segment[metadata_segment_sb_config], cache,
+			&ctrl->raw_desc[metadata_segment_sb_config]);
+	if (result) {
+		ocf_metadata_deinit_fixed_size(cache);
+		return result;
+	}
+
+	superblock = ctrl->segment[metadata_segment_sb_config];
+
 	for (i = 0; i < metadata_segment_fixed_size_max; i++) {
-		result |= ocf_metadata_raw_init(cache, NULL, NULL,
-				&(ctrl->raw_desc[i]));
+		if (i == metadata_segment_sb_config)
+			continue;
+		result |= ocf_metadata_segment_init(
+				&ctrl->segment[i],
+				cache,
+				&ctrl->raw_desc[i],
+				NULL, NULL,
+				superblock);
 		if (result)
 			break;
 	}
@@ -609,6 +629,7 @@ int ocf_metadata_init_variable_size(struct ocf_cache *cache,
 		(struct ocf_cache_line_settings *)&cache->metadata.settings;
 	ocf_flush_page_synch_t lock_page, unlock_page;
 	uint64_t device_lines;
+	struct ocf_metadata_segment *superblock;
 
 	OCF_DEBUG_TRACE(cache);
 
@@ -669,6 +690,8 @@ int ocf_metadata_init_variable_size(struct ocf_cache *cache,
 	OCF_DEBUG_PARAM(cache, "Metadata end pages = %u", ctrl->start_page
 			+ ctrl->count_pages);
 
+	superblock = ctrl->segment[metadata_segment_sb_config];
+
 	/*
 	 * Initialize all dynamic size  RAW types
 	 */
@@ -683,8 +706,12 @@ int ocf_metadata_init_variable_size(struct ocf_cache *cache,
 			lock_page = unlock_page = NULL;
 		}
 
-		result |= ocf_metadata_raw_init(cache, lock_page, unlock_page,
-				&(ctrl->raw_desc[i]));
+		result |= ocf_metadata_segment_init(
+				&ctrl->segment[i],
+				cache,
+				&ctrl->raw_desc[i],
+				lock_page, unlock_page,
+				superblock);
 
 		if (result)
 			goto finalize;
@@ -991,6 +1018,7 @@ void ocf_metadata_flush_all(ocf_cache_t cache,
 	context->priv = priv;
 	context->pipeline = pipeline;
 	context->cache = cache;
+	context->ctrl = cache->metadata.priv;
 
 	ocf_pipeline_next(pipeline);
 }
@@ -1113,6 +1141,7 @@ void ocf_metadata_load_all(ocf_cache_t cache,
 	context->priv = priv;
 	context->pipeline = pipeline;
 	context->cache = cache;
+	context->ctrl = cache->metadata.priv;
 
 	ocf_pipeline_next(pipeline);
 }
@@ -1272,6 +1301,7 @@ static void _ocf_metadata_load_recovery_legacy(ocf_cache_t cache,
 	context->priv = priv;
 	context->pipeline = pipeline;
 	context->cache = cache;
+	context->ctrl = cache->metadata.priv;
 
 	ocf_pipeline_next(pipeline);
 }
@@ -1416,6 +1446,7 @@ static void _ocf_metadata_load_recovery_atomic(ocf_cache_t cache,
 	context->priv = priv;
 	context->pipeline = pipeline;
 	context->cache = cache;
+	context->ctrl = cache->metadata.priv;
 
 	ocf_pipeline_next(pipeline);
 }
diff --git a/src/metadata/metadata_internal.h b/src/metadata/metadata_internal.h
index 95adabf..3e1a694 100644
--- a/src/metadata/metadata_internal.h
+++ b/src/metadata/metadata_internal.h
@@ -8,6 +8,7 @@
 
 #include <ocf/ocf_def.h>
 #include "../ocf_cache_priv.h"
+#include "metadata_segment.h"
 #include "metadata_segment_id.h"
 #include "metadata_raw.h"
 
@@ -23,6 +24,7 @@ struct ocf_metadata_ctrl {
 	uint32_t device_lines;
 	size_t mapping_size;
 	struct ocf_metadata_raw raw_desc[metadata_segment_max];
+	struct ocf_metadata_segment *segment[metadata_segment_max];
 };
 
 struct ocf_metadata_context {
@@ -30,6 +32,7 @@ struct ocf_metadata_context {
 	void *priv;
 	ocf_pipeline_t pipeline;
 	ocf_cache_t cache;
+	struct ocf_metadata_ctrl *ctrl;
 	struct ocf_metadata_raw segment_copy[metadata_segment_fixed_size_max];
 };
 
diff --git a/src/metadata/metadata_raw.h b/src/metadata/metadata_raw.h
index ffc12c7..ea62b7f 100644
--- a/src/metadata/metadata_raw.h
+++ b/src/metadata/metadata_raw.h
@@ -6,6 +6,8 @@
 #ifndef __METADATA_RAW_H__
 #define __METADATA_RAW_H__
 
+#include "metadata_segment_id.h"
+
 /**
  * @file metadata_raw.h
  * @brief Metadata RAW container implementation
@@ -306,4 +308,9 @@ static inline void _raw_bug_on(struct ocf_metadata_raw *raw, uint32_t entry)
 
 int _raw_ram_flush_do_page_cmp(const void *item1, const void *item2);
 
+static inline void *ocf_metadata_raw_get_mem(struct ocf_metadata_raw *raw)
+{
+	return raw->mem_pool;
+}
+
 #endif /* METADATA_RAW_H_ */
diff --git a/src/metadata/metadata_segment.c b/src/metadata/metadata_segment.c
index 2a0b767..6cf9c04 100644
--- a/src/metadata/metadata_segment.c
+++ b/src/metadata/metadata_segment.c
@@ -4,6 +4,65 @@
  */
 #include "metadata_internal.h"
 #include "metadata_superblock.h"
+#include "metadata_raw.h"
+
+int ocf_metadata_segment_init_in_place(
+		struct ocf_metadata_segment *segment,
+		struct ocf_cache *cache,
+		struct ocf_metadata_raw *raw,
+		ocf_flush_page_synch_t lock_page_pfn,
+		ocf_flush_page_synch_t unlock_page_pfn,
+		struct ocf_metadata_segment *superblock)
+{
+	int result;
+
+	result = ocf_metadata_raw_init(cache, lock_page_pfn, unlock_page_pfn, raw);
+	if (result)
+		return result;
+
+	segment->raw = raw;
+	segment->superblock = superblock;
+
+	return 0;
+
+}
+
+int ocf_metadata_segment_init(
+		struct ocf_metadata_segment **self,
+		struct ocf_cache *cache,
+		struct ocf_metadata_raw *raw,
+		ocf_flush_page_synch_t lock_page_pfn,
+		ocf_flush_page_synch_t unlock_page_pfn,
+		struct ocf_metadata_segment *superblock)
+{
+	struct ocf_metadata_segment *segment;
+	int result;
+
+	segment = env_vzalloc(sizeof(*segment));
+	if (!segment)
+		return -OCF_ERR_NO_MEM;
+
+	result = ocf_metadata_segment_init_in_place(segment,
+			cache, raw, lock_page_pfn, unlock_page_pfn,
+			superblock);
+
+	if (result)
+		env_vfree(segment);
+	else
+		*self = segment;
+
+	return result;
+}
+
+void ocf_metadata_segment_destroy(struct ocf_cache *cache,
+		struct ocf_metadata_segment *self)
+{
+	if (!self)
+		return;
+
+	ocf_metadata_raw_deinit(cache, self->raw);
+	env_vfree(self);
+}
 
 static void ocf_metadata_generic_complete(void *priv, int error)
 {
@@ -16,30 +75,32 @@ static void ocf_metadata_check_crc_skip(ocf_pipeline_t pipeline,
 		void *priv, ocf_pipeline_arg_t arg, bool skip_on_dirty_shutdown)
 {
 	struct ocf_metadata_context *context = priv;
-	int segment = ocf_pipeline_arg_get_int(arg);
-	struct ocf_metadata_ctrl *ctrl;
-	struct ocf_superblock_config *sb_config;
+	int segment_id = ocf_pipeline_arg_get_int(arg);
+	struct ocf_metadata_segment *segment = context->ctrl->segment[segment_id];
 	ocf_cache_t cache = context->cache;
 	uint32_t crc;
+	uint32_t superblock_crc;
+	bool clean_shutdown;
 
-	ctrl = (struct ocf_metadata_ctrl *)cache->metadata.priv;
-	sb_config = METADATA_MEM_POOL(ctrl, metadata_segment_sb_config);
-
-	if (!sb_config->clean_shutdown && skip_on_dirty_shutdown)
+	clean_shutdown = ocf_metadata_superblock_get_clean_shutdown(
+			segment->superblock);
+	if (!clean_shutdown && skip_on_dirty_shutdown)
 		OCF_PL_NEXT_RET(pipeline);
 
-	crc = ocf_metadata_raw_checksum(cache, &(ctrl->raw_desc[segment]));
+	crc = ocf_metadata_raw_checksum(cache, segment->raw);
+	superblock_crc = ocf_metadata_superblock_get_checksum(segment->superblock,
+			segment_id);
 
-	if (crc != sb_config->checksum[segment]) {
+	if (crc != superblock_crc) {
 		/* Checksum does not match */
-		if (!sb_config->clean_shutdown) {
+		if (!clean_shutdown) {
 			ocf_cache_log(cache, log_warn,
 					"Loading %s WARNING, invalid checksum",
-					ocf_metadata_segment_names[segment]);
+					ocf_metadata_segment_names[segment_id]);
 		} else {
 			ocf_cache_log(cache, log_err,
 					"Loading %s ERROR, invalid checksum",
-					ocf_metadata_segment_names[segment]);
+					ocf_metadata_segment_names[segment_id]);
 			OCF_PL_FINISH_RET(pipeline, -OCF_ERR_INVAL);
 		}
 	}
@@ -64,16 +125,11 @@ void ocf_metadata_calculate_crc(ocf_pipeline_t pipeline,
 		void *priv, ocf_pipeline_arg_t arg)
 {
 	struct ocf_metadata_context *context = priv;
-	int segment = ocf_pipeline_arg_get_int(arg);
-	struct ocf_metadata_ctrl *ctrl;
-	struct ocf_superblock_config *sb_config;
-	ocf_cache_t cache = context->cache;
+	int segment_id = ocf_pipeline_arg_get_int(arg);
+	struct ocf_metadata_segment *segment = context->ctrl->segment[segment_id];
 
-	ctrl = (struct ocf_metadata_ctrl *)cache->metadata.priv;
-	sb_config = METADATA_MEM_POOL(ctrl, metadata_segment_sb_config);
-
-	sb_config->checksum[segment] = ocf_metadata_raw_checksum(cache,
-			&(ctrl->raw_desc[segment]));
+	ocf_metadata_superblock_set_checksum(segment->superblock, segment_id,
+			ocf_metadata_raw_checksum(context->cache, segment->raw));
 
 	ocf_pipeline_next(pipeline);
 }
@@ -83,11 +139,9 @@ void ocf_metadata_flush_segment(ocf_pipeline_t pipeline,
 {
 	struct ocf_metadata_context *context = priv;
 	int segment = ocf_pipeline_arg_get_int(arg);
-	struct ocf_metadata_ctrl *ctrl;
+	struct ocf_metadata_ctrl *ctrl = context->ctrl;
 	ocf_cache_t cache = context->cache;
 
-	ctrl = (struct ocf_metadata_ctrl *)cache->metadata.priv;
-
 	ocf_metadata_raw_flush_all(cache, &ctrl->raw_desc[segment],
 			ocf_metadata_generic_complete, context);
 }
@@ -97,11 +151,9 @@ void ocf_metadata_load_segment(ocf_pipeline_t pipeline,
 {
 	struct ocf_metadata_context *context = priv;
 	int segment = ocf_pipeline_arg_get_int(arg);
-	struct ocf_metadata_ctrl *ctrl;
+	struct ocf_metadata_ctrl *ctrl = context->ctrl;
 	ocf_cache_t cache = context->cache;
 
-	ctrl = (struct ocf_metadata_ctrl *)cache->metadata.priv;
-
 	ocf_metadata_raw_load_all(cache, &ctrl->raw_desc[segment],
 			ocf_metadata_generic_complete, context);
 }
diff --git a/src/metadata/metadata_segment.h b/src/metadata/metadata_segment.h
index 3ef71d2..d0ccf32 100644
--- a/src/metadata/metadata_segment.h
+++ b/src/metadata/metadata_segment.h
@@ -9,6 +9,23 @@
 #include "metadata_raw.h"
 #include <ocf/ocf_def.h>
 
+struct ocf_metadata_segment
+{
+	struct ocf_metadata_raw *raw;
+	struct ocf_metadata_segment *superblock;
+};
+
+int ocf_metadata_segment_init(
+		struct ocf_metadata_segment **self,
+		struct ocf_cache *cache,
+		struct ocf_metadata_raw *raw,
+		ocf_flush_page_synch_t lock_page_pfn,
+		ocf_flush_page_synch_t unlock_page_pfn,
+		struct ocf_metadata_segment *superblock);
+
+void ocf_metadata_segment_destroy(struct ocf_cache *cache,
+		struct ocf_metadata_segment *self);
+
 void ocf_metadata_check_crc_if_clean(ocf_pipeline_t pipeline,
 		void *priv, ocf_pipeline_arg_t arg);
 
diff --git a/src/metadata/metadata_superblock.c b/src/metadata/metadata_superblock.c
index 5f563d8..e690200 100644
--- a/src/metadata/metadata_superblock.c
+++ b/src/metadata/metadata_superblock.c
@@ -25,6 +25,13 @@
 #define OCF_DEBUG_PARAM(cache, format, ...)
 #endif
 
+int ocf_metadata_segment_init_in_place(
+		struct ocf_metadata_segment *segment,
+		struct ocf_cache *cache,
+		struct ocf_metadata_raw *raw,
+		ocf_flush_page_synch_t lock_page_pfn,
+		ocf_flush_page_synch_t unlock_page_pfn,
+		struct ocf_metadata_segment *superblock);
 
 /**
  * @brief Super Block - Set Shutdown Status
@@ -45,12 +52,14 @@ void ocf_metadata_set_shutdown_status(ocf_cache_t cache,
 	/*
 	 * Get metadata hash service control structure
 	 */
+	/* TODO: get metadata ctrl from args rather than via cache */
 	ctrl = (struct ocf_metadata_ctrl *) cache->metadata.priv;
 
 	/*
 	 * Get super block
 	 */
-	superblock = METADATA_MEM_POOL(ctrl, metadata_segment_sb_config);
+	superblock = ocf_metadata_raw_get_mem(
+			&ctrl->raw_desc[metadata_segment_sb_config]);
 
 	/* Set shutdown status */
 	superblock->clean_shutdown = shutdown_status;
@@ -271,7 +280,8 @@ void ocf_metadata_load_superblock(ocf_cache_t cache, ocf_metadata_end_t cmpl,
 
 	OCF_DEBUG_TRACE(cache);
 
-	ctrl = (struct ocf_metadata_ctrl *) cache->metadata.priv;
+	/* TODO: get ctrl from args rather than from cache */
+	ctrl = cache->metadata.priv;
 	ENV_BUG_ON(!ctrl);
 
 	sb_config = METADATA_MEM_POOL(ctrl, metadata_segment_sb_config);
@@ -291,6 +301,7 @@ void ocf_metadata_load_superblock(ocf_cache_t cache, ocf_metadata_end_t cmpl,
 	context->priv = priv;
 	context->pipeline = pipeline;
 	context->cache = cache;
+	context->ctrl = cache->metadata.priv;
 
 	ocf_pipeline_next(pipeline);
 }
@@ -318,9 +329,8 @@ static void ocf_metadata_calculate_crc_sb_config(ocf_pipeline_t pipeline,
 	struct ocf_metadata_context *context = priv;
 	struct ocf_metadata_ctrl *ctrl;
 	struct ocf_superblock_config *sb_config;
-	ocf_cache_t cache = context->cache;
 
-	ctrl = (struct ocf_metadata_ctrl *)cache->metadata.priv;
+	ctrl = context->ctrl;
 	sb_config = METADATA_MEM_POOL(ctrl, metadata_segment_sb_config);
 
 	sb_config->checksum[metadata_segment_sb_config] = env_crc32(0,
@@ -419,6 +429,77 @@ void ocf_metadata_flush_superblock(ocf_cache_t cache,
 	context->priv = priv;
 	context->pipeline = pipeline;
 	context->cache = cache;
+	context->ctrl = cache->metadata.priv;
 
 	ocf_pipeline_next(pipeline);
 }
+
+struct ocf_metadata_superblock
+{
+	struct ocf_metadata_segment segment;
+	struct ocf_superblock_config *config;
+};
+
+#define _ocf_segment_to_sb(_segment) \
+	container_of(_segment, struct ocf_metadata_superblock, segment);
+
+int ocf_metadata_superblock_init(
+		struct ocf_metadata_segment **self,
+		struct ocf_cache *cache,
+		struct ocf_metadata_raw *raw)
+{
+	struct ocf_metadata_superblock *sb = env_vzalloc(sizeof(*sb));
+	int result;
+
+	if (!sb)
+		return -OCF_ERR_NO_MEM;
+
+	result = ocf_metadata_segment_init_in_place(&sb->segment, cache,
+			raw, NULL, NULL, &sb->segment);
+
+	if (result) {
+		env_vfree(sb);
+		return result;
+	}
+
+	sb->config = ocf_metadata_raw_get_mem(sb->segment.raw);
+
+	*self = &sb->segment;
+	return 0;
+}
+
+
+void ocf_metadata_superblock_destroy(
+		struct ocf_cache *cache,
+		struct ocf_metadata_segment *self)
+{
+	ocf_metadata_segment_destroy(cache, self);
+}
+
+uint32_t ocf_metadata_superblock_get_checksum(
+		struct ocf_metadata_segment *self,
+		enum ocf_metadata_segment_id segment)
+{
+	struct ocf_metadata_superblock *sb = _ocf_segment_to_sb(self);
+
+	return sb->config->checksum[segment];
+}
+
+void ocf_metadata_superblock_set_checksum(
+		struct ocf_metadata_segment *self,
+		enum ocf_metadata_segment_id segment,
+		uint32_t csum)
+{
+	struct ocf_metadata_superblock *sb = _ocf_segment_to_sb(self);
+
+	sb->config->checksum[segment] = csum;
+}
+
+bool ocf_metadata_superblock_get_clean_shutdown(
+		struct ocf_metadata_segment *self)
+{
+	struct ocf_metadata_superblock *sb = _ocf_segment_to_sb(self);
+
+	return sb->config->clean_shutdown;
+}
+
diff --git a/src/metadata/metadata_superblock.h b/src/metadata/metadata_superblock.h
index 73f88e7..c4b1968 100644
--- a/src/metadata/metadata_superblock.h
+++ b/src/metadata/metadata_superblock.h
@@ -64,6 +64,8 @@ struct ocf_superblock_runtime {
 	uint32_t cleaning_thread_access;
 };
 
+struct ocf_metadata_ctrl;
+
 void ocf_metadata_set_shutdown_status(ocf_cache_t cache,
 		enum ocf_metadata_shutdown_status shutdown_status,
 		ocf_metadata_end_t cmpl, void *priv);
@@ -74,4 +76,25 @@ void ocf_metadata_load_superblock(ocf_cache_t cache,
 void ocf_metadata_flush_superblock(ocf_cache_t cache,
 		ocf_metadata_end_t cmpl, void *priv);
 
+int ocf_metadata_superblock_init(
+		struct ocf_metadata_segment **self,
+		struct ocf_cache *cache,
+		struct ocf_metadata_raw *raw);
+
+void ocf_metadata_superblock_destroy(
+		struct ocf_cache *cache,
+		struct ocf_metadata_segment *self);
+
+uint32_t ocf_metadata_superblock_get_checksum(
+		struct ocf_metadata_segment *self,
+		enum ocf_metadata_segment_id segment);
+
+void ocf_metadata_superblock_set_checksum(
+		struct ocf_metadata_segment *self,
+		enum ocf_metadata_segment_id segment,
+		uint32_t csum);
+
+bool ocf_metadata_superblock_get_clean_shutdown(
+		struct ocf_metadata_segment *self);
+
 #endif /* METADATA_SUPERBLOCK_H_ */