From 341222e3d7009bda5cc1e86a5b3db0433bc521d3 Mon Sep 17 00:00:00 2001 From: Michal Mielewczyk Date: Tue, 20 Aug 2019 02:27:34 -0400 Subject: [PATCH] Treat '16384' as valid cache id. Signed-off-by: Michal Mielewczyk --- casadm/cas_main.c | 2 +- modules/cas_cache/layer_cache_management.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/casadm/cas_main.c b/casadm/cas_main.c index 7726288..b901d4f 100644 --- a/casadm/cas_main.c +++ b/casadm/cas_main.c @@ -64,7 +64,7 @@ struct command_args{ static struct command_args command_args_values = { .force = 0, - .cache_id = 0, + .cache_id = OCF_CACHE_ID_INVALID, .core_id = OCF_CORE_ID_INVALID, .state = CACHE_INIT_NEW, .cache_mode = ocf_cache_mode_default, diff --git a/modules/cas_cache/layer_cache_management.c b/modules/cas_cache/layer_cache_management.c index 7aacce5..1c89558 100644 --- a/modules/cas_cache/layer_cache_management.c +++ b/modules/cas_cache/layer_cache_management.c @@ -167,7 +167,7 @@ static uint16_t find_free_cache_id(ocf_ctx_t ctx) else if (result == -OCF_ERR_CACHE_NOT_EXIST) break; else - return OCF_CACHE_ID_MAX; + return OCF_CACHE_ID_INVALID; } return id; @@ -1037,9 +1037,9 @@ int cache_mngt_prepare_cache_cfg(struct ocf_mngt_cache_config *cfg, if (strnlen(cmd->cache_path_name, MAX_STR_LEN) >= MAX_STR_LEN) return -OCF_ERR_INVAL; - if (cmd->cache_id == OCF_CACHE_ID_MAX) { + if (cmd->cache_id == OCF_CACHE_ID_INVALID) { cache_id = find_free_cache_id(cas_ctx); - if (cache_id == OCF_CACHE_ID_MAX) + if (cache_id == OCF_CACHE_ID_INVALID) return -OCF_ERR_INVAL; cmd->cache_id = cache_id;