Unify core naming convention (core_obj -> core)
Signed-off-by: Robert Baldyga <robert.baldyga@intel.com>
This commit is contained in:
@@ -303,7 +303,7 @@ int cleaning_policy_acp_initialize(struct ocf_cache *cache,
|
||||
ACP_BUCKET_DEFAULTS[i]) / 100;
|
||||
}
|
||||
|
||||
if (cache->conf_meta->core_obj_count > 0) {
|
||||
if (cache->conf_meta->core_count > 0) {
|
||||
err = _acp_load_cores(cache);
|
||||
if (err) {
|
||||
cleaning_policy_acp_deinitialize(cache);
|
||||
@@ -404,7 +404,7 @@ static void _acp_handle_flush_error(struct ocf_cache *cache,
|
||||
env_secs_to_ticks(ACP_CHUNK_CLEANING_BACKOFF_TIME);
|
||||
|
||||
if (ocf_cache_log_rl(cache)) {
|
||||
ocf_core_log(&cache->core_obj[flush->chunk->core_id],
|
||||
ocf_core_log(&cache->core[flush->chunk->core_id],
|
||||
log_err, "Cleaning error (%d) in range"
|
||||
" <%llu; %llu) backing off for %u seconds\n",
|
||||
flush->error,
|
||||
@@ -454,7 +454,7 @@ static inline bool _acp_can_clean_chunk(struct ocf_cache *cache,
|
||||
{
|
||||
/* Check if core device is opened and if timeout after cleaning error
|
||||
* expired or wasn't set in the first place */
|
||||
return (cache->core_obj[chunk->core_id].opened &&
|
||||
return (cache->core[chunk->core_id].opened &&
|
||||
(chunk->next_cleaning_timestamp > env_get_tick_count() ||
|
||||
!chunk->next_cleaning_timestamp));
|
||||
}
|
||||
|
@@ -643,7 +643,7 @@ static int block_is_busy(struct ocf_cache *cache,
|
||||
ocf_metadata_get_core_info(cache, cache_line,
|
||||
&core_id, &core_line);
|
||||
|
||||
if (!cache->core_obj[core_id].opened)
|
||||
if (!cache->core[core_id].opened)
|
||||
return true;
|
||||
|
||||
if (ocf_cache_line_is_used(cache, cache_line))
|
||||
|
@@ -86,7 +86,7 @@ static int _ocf_cleaner_run_check_dirty_inactive(struct ocf_cache *cache)
|
||||
if (!env_bit_test(i, cache->conf_meta->valid_object_bitmap))
|
||||
continue;
|
||||
|
||||
if (cache->core_obj[i].opened && env_atomic_read(&(cache->
|
||||
if (cache->core[i].opened && env_atomic_read(&(cache->
|
||||
core_runtime_meta[i].dirty_clines))) {
|
||||
return 0;
|
||||
}
|
||||
|
Reference in New Issue
Block a user