From 4c9465b3bf28ba9337e12461bc3980b82578f2a0 Mon Sep 17 00:00:00 2001 From: Jan Musial Date: Wed, 11 Dec 2019 13:36:24 +0100 Subject: [PATCH] Fix removing clean inactive core When removing core that's inactive, allow it without "--force" option if that core is clean. Signed-off-by: Jan Musial --- modules/cas_cache/layer_cache_management.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/cas_cache/layer_cache_management.c b/modules/cas_cache/layer_cache_management.c index df9b486..7d0ea19 100644 --- a/modules/cas_cache/layer_cache_management.c +++ b/modules/cas_cache/layer_cache_management.c @@ -819,9 +819,12 @@ int _cache_mngt_remove_core_prepare(ocf_cache_t cache, ocf_core_t core, /* Flush core */ flush_result = _cache_mngt_core_flush_sync(core, flush_interruptible); + } else if (!ocf_mngt_core_is_dirty(core)) { + /* Clean core is always "flushed" */ + flush_result = 0; } else { printk(KERN_WARNING OCF_PREFIX_SHORT - "Cannot remove inactive core " + "Cannot remove dirty inactive core " "without force option\n"); return -OCF_ERR_CORE_IN_INACTIVE_STATE; }