From 3eb556860858dc0fffad7e0e8e1df8f32f3b0282 Mon Sep 17 00:00:00 2001 From: Adam Rutkowski Date: Fri, 11 Dec 2020 15:36:18 +0100 Subject: [PATCH] rename segment->segment_id and segemnt_ops->segment Signed-off-by: Adam Rutkowski --- 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 #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 +#include "metadata_segment.h" #define CACHE_MAGIC_NUMBER 0x187E1CA6