diff --git a/src/metadata/metadata_hash.c b/src/metadata/metadata_hash.c index 41dfe22..c5e0bb8 100644 --- a/src/metadata/metadata_hash.c +++ b/src/metadata/metadata_hash.c @@ -640,7 +640,7 @@ static void ocf_metadata_query_cores_end(struct query_cores_context *context, ocf_metadata_hash_query_cores_data_read(ctx, &context->data.core_config, &core_config, sizeof(core_config)); - if (core_config.added) { + if (core_config.valid) { env_bit_set(i, valid_core_bitmap); ++core_count; } diff --git a/src/mngt/ocf_mngt_common.c b/src/mngt/ocf_mngt_common.c index 1a9f1a1..f1da144 100644 --- a/src/mngt/ocf_mngt_common.c +++ b/src/mngt/ocf_mngt_common.c @@ -99,7 +99,7 @@ void cache_mngt_core_remove_from_meta(ocf_core_t core) OCF_METADATA_LOCK_WR(); /* In metadata mark data this core was removed from cache */ - core->conf_meta->added = false; + core->conf_meta->valid = false; /* Clear UUID of core */ ocf_mngt_core_clear_uuid_metadata(core); diff --git a/src/mngt/ocf_mngt_core.c b/src/mngt/ocf_mngt_core.c index c1a7e1c..79cef91 100644 --- a/src/mngt/ocf_mngt_core.c +++ b/src/mngt/ocf_mngt_core.c @@ -115,7 +115,7 @@ static void _ocf_mngt_cache_add_core_handle_error( if (context->flags.counters_allocated) { env_bit_clear(core_id, cache->conf_meta->valid_core_bitmap); - core->conf_meta->added = false; + core->conf_meta->valid = false; core->opened = false; env_free(core->counters); @@ -419,7 +419,7 @@ static void ocf_mngt_cache_add_core_insert(ocf_pipeline_t pipeline, /* In metadata mark data this core was added into cache */ env_bit_set(core_id, cache->conf_meta->valid_core_bitmap); - core->conf_meta->added = true; + core->conf_meta->valid = true; core->opened = true; /* Set default cache parameters for sequential */ diff --git a/src/ocf_cache_priv.h b/src/ocf_cache_priv.h index 033102f..9d81b51 100644 --- a/src/ocf_cache_priv.h +++ b/src/ocf_cache_priv.h @@ -183,7 +183,7 @@ static inline ocf_core_t ocf_cache_get_core(ocf_cache_t cache, #define for_each_core(_cache, _core, _id) \ for_each_core_all(_cache, _core, _id) \ - if (_core->conf_meta->added) + if (_core->conf_meta->valid) #define ocf_cache_log_prefix(cache, lvl, prefix, fmt, ...) \ ocf_log_prefix(ocf_cache_get_ctx(cache), lvl, "%s" prefix, \ diff --git a/src/ocf_core_priv.h b/src/ocf_core_priv.h index c158cd7..4648db7 100644 --- a/src/ocf_core_priv.h +++ b/src/ocf_core_priv.h @@ -30,8 +30,8 @@ struct ocf_core_meta_config { uint8_t type; - /* This bit means that object was added into cache */ - uint32_t added : 1; + /* This bit means that object was saved in cache metadata */ + uint32_t valid : 1; /* Core sequence number used to correlate cache lines with cores * when recovering from atomic device */