Merge pull request #1626 from mmichal10/duplicated_warning
Fix duplicated warning
This commit is contained in:
commit
9ca6d79035
@ -2827,13 +2827,17 @@ int list_caches(unsigned int list_format, bool by_id_path)
|
|||||||
char cache_ctrl_dev[MAX_STR_LEN] = "-";
|
char cache_ctrl_dev[MAX_STR_LEN] = "-";
|
||||||
float cache_flush_prog;
|
float cache_flush_prog;
|
||||||
float core_flush_prog;
|
float core_flush_prog;
|
||||||
bool cache_device_detached;
|
bool cache_device_detached =
|
||||||
|
((curr_cache->state & (1 << ocf_cache_state_standby)) |
|
||||||
|
(curr_cache->state & (1 << ocf_cache_state_detached)));
|
||||||
|
|
||||||
if (!by_id_path && !curr_cache->standby_detached) {
|
if (!by_id_path && !cache_device_detached) {
|
||||||
if (get_dev_path(curr_cache->device, curr_cache->device,
|
if (get_dev_path(curr_cache->device, curr_cache->device,
|
||||||
sizeof(curr_cache->device))) {
|
sizeof(curr_cache->device))) {
|
||||||
cas_printf(LOG_WARNING, "WARNING: Cannot resolve path "
|
cas_printf(LOG_WARNING,
|
||||||
"to cache. By-id path will be shown for that cache.\n");
|
"WARNING: Cannot resolve path to "
|
||||||
|
"cache %d. By-id path will be shown "
|
||||||
|
"for that cache.\n", curr_cache->id);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -2859,11 +2863,6 @@ int list_caches(unsigned int list_format, bool by_id_path)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
cache_device_detached =
|
|
||||||
((curr_cache->state & (1 << ocf_cache_state_standby)) |
|
|
||||||
(curr_cache->state & (1 << ocf_cache_state_detached)))
|
|
||||||
;
|
|
||||||
|
|
||||||
fprintf(intermediate_file[1], TAG(TREE_BRANCH)
|
fprintf(intermediate_file[1], TAG(TREE_BRANCH)
|
||||||
"%s,%u,%s,%s,%s,%s\n",
|
"%s,%u,%s,%s,%s,%s\n",
|
||||||
"cache", /* type */
|
"cache", /* type */
|
||||||
|
Loading…
Reference in New Issue
Block a user