From 544e4086caefaaa424496076856c03ace18c9be1 Mon Sep 17 00:00:00 2001 From: Slawomir Jankowski Date: Wed, 20 May 2020 12:30:47 +0200 Subject: [PATCH 1/2] Disable load operation with 'force' flag Fail `ocf_mngt_cache_load` function with `OCF_ERR_INVAL` error code when force flag is in use. Log error message. Closes #361 Signed-off-by: Slawomir Jankowski --- src/mngt/ocf_mngt_cache.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/mngt/ocf_mngt_cache.c b/src/mngt/ocf_mngt_cache.c index ceb5a57..927eea8 100644 --- a/src/mngt/ocf_mngt_cache.c +++ b/src/mngt/ocf_mngt_cache.c @@ -2077,6 +2077,13 @@ void ocf_mngt_cache_load(ocf_cache_t cache, if (cache->metadata.is_volatile) OCF_CMPL_RET(cache, priv, -EINVAL); + /* Load is not allowed with 'force' flag on */ + if (cfg->force) { + ocf_cache_log(cache, log_err, "Using 'force' flag is forbidden " + "for load operation."); + OCF_CMPL_RET(cache, priv, -OCF_ERR_INVAL); + } + result = _ocf_mngt_cache_validate_device_cfg(cfg); if (result) OCF_CMPL_RET(cache, priv, result); From 248018b3415c5f19b7ce5344479e596cfde75612 Mon Sep 17 00:00:00 2001 From: Slawomir Jankowski Date: Wed, 20 May 2020 14:26:53 +0200 Subject: [PATCH 2/2] Change return code to valid OCF code Signed-off-by: Slawomir Jankowski --- src/mngt/ocf_mngt_cache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mngt/ocf_mngt_cache.c b/src/mngt/ocf_mngt_cache.c index 927eea8..0d49f91 100644 --- a/src/mngt/ocf_mngt_cache.c +++ b/src/mngt/ocf_mngt_cache.c @@ -2075,7 +2075,7 @@ void ocf_mngt_cache_load(ocf_cache_t cache, /* Load is not allowed in volatile metadata mode */ if (cache->metadata.is_volatile) - OCF_CMPL_RET(cache, priv, -EINVAL); + OCF_CMPL_RET(cache, priv, -OCF_ERR_INVAL); /* Load is not allowed with 'force' flag on */ if (cfg->force) {