Merge pull request #1494 from robertbaldyga/update-ocf-20240828

Update OCF submodule and API changes
Open-CAS · Aug 28, 2024 · b1f3cc1 · b1f3cc1
2 parents 020b6e2 + c9644ba
commit b1f3cc1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/casadm/cas_lib.c b/casadm/cas_lib.c
@@ -1,5 +1,6 @@
 /*
 * Copyright(c) 2012-2022 Intel Corporation
+* Copyright(c) 2024 Huawei Technologies
 * SPDX-License-Identifier: BSD-3-Clause
 */
 
@@ -66,7 +67,7 @@ int _check_cache_device(const char *device_path,
 static const char *cache_states_name[ocf_cache_state_max + 1] = {
 		[ocf_cache_state_running] = "Running",
 		[ocf_cache_state_stopping] = "Stopping",
-		[ocf_cache_state_initializing] = "Initializing",
+		[ocf_cache_state_detached] = "Detached",
 		[ocf_cache_state_incomplete] = "Incomplete",
 		[ocf_cache_state_standby] = "Standby",
 		[ocf_cache_state_max] = "Unknown",

diff --git a/ocf b/ocf
+6 −6		inc/ocf_cache.h
+4 −3		inc/ocf_def.h
+4 −0		inc/ocf_err.h
+0 −2		src/cleaning/acp.c
+3 −4		src/cleaning/alru.c
+5 −36		src/engine/cache_engine.c
+3 −25		src/engine/cache_engine.h
+3 −1		src/engine/engine_bf.c
+4 −72		src/engine/engine_common.c
+1 −32		src/engine/engine_common.h
+3 −3		src/engine/engine_discard.c
+2 −1		src/engine/engine_fast.c
+3 −1		src/engine/engine_inv.c
+4 −3		src/engine/engine_pt.c
+2 −1		src/engine/engine_pt.h
+2 −1		src/engine/engine_rd.c
+3 −2		src/engine/engine_wb.c
+6 −5		src/engine/engine_wi.c
+1 −1		src/engine/engine_wo.c
+3 −2		src/engine/engine_wt.c
+5 −2		src/engine/engine_zero.c
+7 −4		src/metadata/metadata_io.c
+1 −1		src/metadata/metadata_partition.h
+2 −1		src/metadata/metadata_passive_update.c
+6 −3		src/metadata/metadata_raw_dynamic.c
+2 −0		src/metadata/metadata_superblock.c
+104 −57		src/mngt/ocf_mngt_cache.c
+36 −3		src/mngt/ocf_mngt_core.c
+3 −0		src/mngt/ocf_mngt_core_priv.h
+5 −3		src/mngt/ocf_mngt_flush.c
+3 −3		src/ocf_cache.c
+2 −1		src/ocf_cache_priv.h
+0 −18		src/ocf_core.c
+21 −32		src/ocf_lru.c
+6 −4		src/ocf_part.h
+79 −2		src/ocf_queue.c
+26 −1		src/ocf_queue_priv.h
+26 −2		src/ocf_request.h
+121 −201		src/utils/utils_cleaner.c
+4 −6		src/utils/utils_cleaner.h
+2 −2		src/utils/utils_parallelize.c
+4 −4		src/utils/utils_pipeline.c
+2 −1		tests/functional/pyocf/types/cache.py
+2 −0		tests/functional/pyocf/types/shared.py
+2 −1		tests/functional/tests/engine/test_read.py
+41 −0		tests/functional/tests/management/test_attach_cache.py