From d694228263692666e7aef760423c42d468b0aac8 Mon Sep 17 00:00:00 2001 From: Robert Baldyga Date: Fri, 3 Apr 2020 17:59:19 +0200 Subject: [PATCH] Update OCF and handle new error code Signed-off-by: Robert Baldyga --- casadm/extended_err_msg.c | 4 ++++ modules/cas_cache/utils/cas_err.h | 1 + ocf | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/casadm/extended_err_msg.c b/casadm/extended_err_msg.c index a5ff840..d8cf861 100644 --- a/casadm/extended_err_msg.c +++ b/casadm/extended_err_msg.c @@ -108,6 +108,10 @@ struct { OCF_ERR_FLUSHING_INTERRUPTED, "Flushing of core interrupted" }, + { + OCF_ERR_FLUSH_IN_PROGRESS, + "Another flush operation in progress" + }, { OCF_ERR_CANNOT_ADD_CORE_TO_POOL, "Error occurred during adding core device to core pool" diff --git a/modules/cas_cache/utils/cas_err.h b/modules/cas_cache/utils/cas_err.h index 0ad12b3..08ada0b 100644 --- a/modules/cas_cache/utils/cas_err.h +++ b/modules/cas_cache/utils/cas_err.h @@ -40,6 +40,7 @@ struct { { OCF_ERR_DIRTY_SHUTDOWN, EFAULT }, { OCF_ERR_DIRTY_EXISTS, EFAULT }, { OCF_ERR_FLUSHING_INTERRUPTED, EINTR }, + { OCF_ERR_FLUSH_IN_PROGRESS, EBUSY }, { OCF_ERR_CANNOT_ADD_CORE_TO_POOL, EFAULT }, { OCF_ERR_CACHE_IN_INCOMPLETE_STATE, ENODEV }, { OCF_ERR_CORE_IN_INACTIVE_STATE, ENODEV }, diff --git a/ocf b/ocf index 53dc402..72f11d0 160000 --- a/ocf +++ b/ocf @@ -1 +1 @@ -Subproject commit 53dc4020e3fb5b31846dfc39137e57ab8c8b6fe1 +Subproject commit 72f11d0771945021949dafec54378acb9e30b97a