github/open-cas-linux
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix upgrade errors

Browse Source 
Signed-off-by: Jan Musial <jan.musial@intel.com>
This commit is contained in:
Jan Musial 2020-01-14 09:53:03 +01:00
parent dd908053fb
commit b5f014f689
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/cas_cache/layer_cache_management.c
View File

@ -954,6 +954,7 @@ int cache_mngt_add_core_to_cache(const char *cache_name, size_t name_len,
struct _cache_mngt_sync_context remove_context; struct _cache_mngt_sync_context remove_context;
ocf_cache_t cache; ocf_cache_t cache;
ocf_core_t core; ocf_core_t core;
ocf_core_id_t core_id;
int result, remove_core_result; int result, remove_core_result;
struct cache_priv *cache_priv; struct cache_priv *cache_priv;
@ -1012,9 +1013,12 @@ int cache_mngt_add_core_to_cache(const char *cache_name, size_t name_len,
if (result) if (result)
goto error_after_create_exported_object; goto error_after_create_exported_object;
result = core_id_from_name(&core_id, cfg->name);
if (result)
goto error_after_create_exported_object;
cache_priv = ocf_cache_get_priv(cache); cache_priv = ocf_cache_get_priv(cache);
mark_core_id_used(cache_priv->core_id_bitmap, cmd_info->core_id); mark_core_id_used(cache_priv->core_id_bitmap, core_id);
ocf_mngt_cache_unlock(cache); ocf_mngt_cache_unlock(cache);
ocf_mngt_cache_put(cache); ocf_mngt_cache_put(cache);

2
modules/cas_cache/layer_upgrade.c
View File

@ -960,7 +960,7 @@ static int _cas_upgrade_restore_conf_main(struct cas_properties *cache_props,
device_cfg.volume_type = cache_type; device_cfg.volume_type = cache_type;
device_cfg.cache_line_size = cache_line_size; device_cfg.cache_line_size = cache_line_size;
device_cfg.perform_test = true; device_cfg.perform_test = true;
device_cfg.force = false; device_cfg.force = true;
if (device_cfg.volume_type == ATOMIC_DEVICE_VOLUME) { if (device_cfg.volume_type == ATOMIC_DEVICE_VOLUME) {
result = cas_blk_identify_type_atomic(device_cfg.uuid.data, result = cas_blk_identify_type_atomic(device_cfg.uuid.data,