diff --git a/src/metadata/metadata_hash.c b/src/metadata/metadata_hash.c index e036013..8702dc4 100644 --- a/src/metadata/metadata_hash.c +++ b/src/metadata/metadata_hash.c @@ -2605,60 +2605,6 @@ static void ocf_metadata_hash_get_collision_info( * Partition ******************************************************************************/ -static ocf_part_id_t ocf_metadata_hash_get_partition_id( - struct ocf_cache *cache, ocf_cache_line_t line) -{ - const struct ocf_metadata_list_info *info; - struct ocf_metadata_hash_ctrl *ctrl = - (struct ocf_metadata_hash_ctrl *) cache->metadata.iface_priv; - - info = ocf_metadata_raw_rd_access(cache, - &(ctrl->raw_desc[metadata_segment_list_info]), line, - sizeof(*info)); - - if (info) - return info->partition_id; - - ocf_metadata_error(cache); - return PARTITION_DEFAULT; -} - -static ocf_cache_line_t ocf_metadata_hash_get_partition_next( - struct ocf_cache *cache, ocf_cache_line_t line) -{ - const struct ocf_metadata_list_info *info; - struct ocf_metadata_hash_ctrl *ctrl = - (struct ocf_metadata_hash_ctrl *) cache->metadata.iface_priv; - - info = ocf_metadata_raw_rd_access(cache, - &(ctrl->raw_desc[metadata_segment_list_info]), line, - sizeof(*info)); - - if (info) - return info->partition_next; - - ocf_metadata_error(cache); - return PARTITION_DEFAULT; -} - -static ocf_cache_line_t ocf_metadata_hash_get_partition_prev( - struct ocf_cache *cache, ocf_cache_line_t line) -{ - const struct ocf_metadata_list_info *info; - struct ocf_metadata_hash_ctrl *ctrl = - (struct ocf_metadata_hash_ctrl *) cache->metadata.iface_priv; - - info = ocf_metadata_raw_rd_access(cache, - &(ctrl->raw_desc[metadata_segment_list_info]), line, - sizeof(*info)); - - if (info) - return info->partition_prev; - - ocf_metadata_error(cache); - return PARTITION_DEFAULT; -} - 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, @@ -2811,9 +2757,6 @@ static const struct ocf_metadata_iface metadata_hash_iface = { /* * Partition Info */ - .get_partition_id = ocf_metadata_hash_get_partition_id, - .get_partition_next = ocf_metadata_hash_get_partition_next, - .get_partition_prev = ocf_metadata_hash_get_partition_prev, .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, diff --git a/src/metadata/metadata_partition.h b/src/metadata/metadata_partition.h index 73d1c26..8aee83f 100644 --- a/src/metadata/metadata_partition.h +++ b/src/metadata/metadata_partition.h @@ -13,24 +13,6 @@ #define PARTITION_INVALID ((ocf_part_id_t)-1) #define PARTITION_SIZE_MAX ((ocf_cache_line_t)-1) -static inline ocf_part_id_t ocf_metadata_get_partition_id( - struct ocf_cache *cache, ocf_cache_line_t line) -{ - return cache->metadata.iface.get_partition_id(cache, line); -} - -static inline ocf_cache_line_t ocf_metadata_get_partition_next( - struct ocf_cache *cache, ocf_cache_line_t line) -{ - return cache->metadata.iface.get_partition_next(cache, line); -} - -static inline ocf_cache_line_t ocf_metadata_get_partition_prev( - struct ocf_cache *cache, ocf_cache_line_t line) -{ - return cache->metadata.iface.get_partition_prev(cache, line); -} - static inline 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, @@ -40,6 +22,36 @@ static inline void ocf_metadata_get_partition_info( next_line, prev_line); } +static inline ocf_part_id_t ocf_metadata_get_partition_id( + struct ocf_cache *cache, ocf_cache_line_t line) +{ + ocf_part_id_t part_id; + + ocf_metadata_get_partition_info(cache, line, &part_id, NULL, NULL); + + return part_id; +} + +static inline ocf_cache_line_t ocf_metadata_get_partition_next( + struct ocf_cache *cache, ocf_cache_line_t line) +{ + ocf_cache_line_t next; + + ocf_metadata_get_partition_info(cache, line, NULL, &next, NULL); + + return next; +} + +static inline ocf_cache_line_t ocf_metadata_get_partition_prev( + struct ocf_cache *cache, ocf_cache_line_t line) +{ + ocf_cache_line_t prev; + + ocf_metadata_get_partition_info(cache, line, NULL, NULL, &prev); + + return prev; +} + static inline void ocf_metadata_set_partition_next( struct ocf_cache *cache, ocf_cache_line_t line, ocf_cache_line_t next_line) diff --git a/src/metadata/metadata_structs.h b/src/metadata/metadata_structs.h index faabcf1..09c78fd 100644 --- a/src/metadata/metadata_structs.h +++ b/src/metadata/metadata_structs.h @@ -361,15 +361,6 @@ struct ocf_metadata_iface { void (*set_collision_prev)(struct ocf_cache *cache, ocf_cache_line_t line, ocf_cache_line_t prev); - ocf_part_id_t (*get_partition_id)(struct ocf_cache *cache, - ocf_cache_line_t line); - - ocf_cache_line_t (*get_partition_next)(struct ocf_cache *cache, - ocf_cache_line_t line); - - ocf_cache_line_t (*get_partition_prev)(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,