rename segment->segment_id and segemnt_ops->segment

Signed-off-by: Adam Rutkowski <adam.j.rutkowski@intel.com>

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)
 {

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"

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

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"

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 */
 
 	/**

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"

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"

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"

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 */

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"

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