From b5f014f6892ea0d49d17e8d5e5ace7de684d8f46 Mon Sep 17 00:00:00 2001 From: Jan Musial Date: Tue, 14 Jan 2020 09:53:03 +0100 Subject: [PATCH] Fix upgrade errors Signed-off-by: Jan Musial --- modules/cas_cache/layer_cache_management.c | 6 +++++- modules/cas_cache/layer_upgrade.c | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/cas_cache/layer_cache_management.c b/modules/cas_cache/layer_cache_management.c index 2433976..fcc1a45 100644 --- a/modules/cas_cache/layer_cache_management.c +++ b/modules/cas_cache/layer_cache_management.c @@ -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; ocf_cache_t cache; ocf_core_t core; + ocf_core_id_t core_id; int result, remove_core_result; 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) 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); - 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_put(cache); diff --git a/modules/cas_cache/layer_upgrade.c b/modules/cas_cache/layer_upgrade.c index 46ecee9..74762d8 100644 --- a/modules/cas_cache/layer_upgrade.c +++ b/modules/cas_cache/layer_upgrade.c @@ -960,7 +960,7 @@ static int _cas_upgrade_restore_conf_main(struct cas_properties *cache_props, device_cfg.volume_type = cache_type; device_cfg.cache_line_size = cache_line_size; device_cfg.perform_test = true; - device_cfg.force = false; + device_cfg.force = true; if (device_cfg.volume_type == ATOMIC_DEVICE_VOLUME) { result = cas_blk_identify_type_atomic(device_cfg.uuid.data,