From 0b0546302f8cc0958d65c2d20a12d425a65ffaa8 Mon Sep 17 00:00:00 2001 From: Robert Baldyga Date: Thu, 1 Aug 2019 16:50:15 +0200 Subject: [PATCH] Remove ocf_metadata_get_core_sector() Signed-off-by: Robert Baldyga --- src/metadata/metadata_core.h | 6 ------ src/metadata/metadata_hash.c | 19 ------------------- src/metadata/metadata_structs.h | 3 --- 3 files changed, 28 deletions(-) diff --git a/src/metadata/metadata_core.h b/src/metadata/metadata_core.h index ca1dac2..0004591 100644 --- a/src/metadata/metadata_core.h +++ b/src/metadata/metadata_core.h @@ -36,12 +36,6 @@ static inline ocf_core_id_t ocf_metadata_get_core_id( return cache->metadata.iface.get_core_id(cache, line); } -static inline uint64_t ocf_metadata_get_core_sector( - struct ocf_cache *cache, ocf_cache_line_t line) -{ - return cache->metadata.iface.get_core_sector(cache, line); -} - static inline struct ocf_metadata_uuid *ocf_metadata_get_core_uuid( struct ocf_cache *cache, ocf_core_id_t core_id) { diff --git a/src/metadata/metadata_hash.c b/src/metadata/metadata_hash.c index 41dfe22..23f3fb2 100644 --- a/src/metadata/metadata_hash.c +++ b/src/metadata/metadata_hash.c @@ -2253,24 +2253,6 @@ static ocf_core_id_t ocf_metadata_hash_get_core_id( return OCF_CORE_MAX; } -static uint64_t ocf_metadata_hash_get_core_sector( - 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.iface_priv; - - collision = ocf_metadata_raw_rd_access(cache, - &(ctrl->raw_desc[metadata_segment_collision]), line, - ctrl->mapping_size); - - if (collision) - return collision->core_line; - - ocf_metadata_error(cache); - return ULLONG_MAX; -} - static struct ocf_metadata_uuid *ocf_metadata_hash_get_core_uuid( struct ocf_cache *cache, ocf_core_id_t core_id) { @@ -2844,7 +2826,6 @@ static const struct ocf_metadata_iface metadata_hash_iface = { .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_sector = ocf_metadata_hash_get_core_sector, .get_core_uuid = ocf_metadata_hash_get_core_uuid, /* diff --git a/src/metadata/metadata_structs.h b/src/metadata/metadata_structs.h index 7b4b619..6d76f90 100644 --- a/src/metadata/metadata_structs.h +++ b/src/metadata/metadata_structs.h @@ -340,9 +340,6 @@ struct ocf_metadata_iface { ocf_core_id_t (*get_core_id)(struct ocf_cache *cache, ocf_cache_line_t line); - uint64_t (*get_core_sector)(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);