From 9273b39d5df3353066976be1d4b1d7772a6f7687 Mon Sep 17 00:00:00 2001 From: Piotr Debski Date: Wed, 17 Aug 2022 11:42:44 +0200 Subject: [PATCH] Fix error message for cache already in standby detach state Signed-off-by: Piotr Debski --- casadm/extended_err_msg.c | 4 ++++ modules/cas_cache/layer_cache_management.c | 2 +- modules/include/cas_ioctl_codes.h | 5 ++++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/casadm/extended_err_msg.c b/casadm/extended_err_msg.c index a0049bc..431bfa0 100644 --- a/casadm/extended_err_msg.c +++ b/casadm/extended_err_msg.c @@ -282,6 +282,10 @@ struct { "The cache contains dirty data assigned to the core. If you want to " "continue, please use --force option.\nWarning: the data will be lost" }, + { + KCAS_ERR_STANDBY_DETACHED, + "Cache device is already in standby detached state." + }, }; const char *cas_strerr(int cas_error_code) diff --git a/modules/cas_cache/layer_cache_management.c b/modules/cas_cache/layer_cache_management.c index 6c65dec..5c07b81 100644 --- a/modules/cas_cache/layer_cache_management.c +++ b/modules/cas_cache/layer_cache_management.c @@ -2296,7 +2296,7 @@ int cache_mngt_standby_detach(struct kcas_standby_detach *cmd) cache_priv = ocf_cache_get_priv(cache); if (!cache_priv->cache_exp_obj_initialized) { - result = -KCAS_ERR_DETACHED; + result = -KCAS_ERR_STANDBY_DETACHED; goto out_cache_put; } diff --git a/modules/include/cas_ioctl_codes.h b/modules/include/cas_ioctl_codes.h index 656986f..1a2c6b2 100644 --- a/modules/include/cas_ioctl_codes.h +++ b/modules/include/cas_ioctl_codes.h @@ -1,5 +1,5 @@ /* -* Copyright(c) 2012-2021 Intel Corporation +* Copyright(c) 2012-2022 Intel Corporation * SPDX-License-Identifier: BSD-3-Clause */ @@ -557,6 +557,9 @@ enum kcas_error { /** Removing core failed and rollback failed too */ KCAS_ERR_DETACHED, + /** Cache is already in standby detached state */ + KCAS_ERR_STANDBY_DETACHED, + /** Cache has been stopped, but it may contain dirty data */ KCAS_ERR_STOPPED_DIRTY,