Remove ocf_queue_get_cache()

Signed-off-by: Robert Baldyga <robert.baldyga@huawei.com>
Open-CAS · Sep 9, 2024 · 08e9f1a · 08e9f1a
1 parent f9af5c2
commit 08e9f1a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/modules/cas_cache/layer_cache_management.c b/modules/cas_cache/layer_cache_management.c
@@ -2000,7 +2000,8 @@ static int _cache_mngt_start_queues(ocf_cache_t cache)
 		if (result)
 			goto err;
 
-		result = cas_create_queue_thread(cache_priv->io_queues[i], i);
+		result = cas_create_queue_thread(cache,
+				cache_priv->io_queues[i], i);
 		if (result) {
 			ocf_queue_put(cache_priv->io_queues[i]);
 			goto err;
@@ -2012,7 +2013,8 @@ static int _cache_mngt_start_queues(ocf_cache_t cache)
 	if (result)
 		goto err;
 
-	result = cas_create_queue_thread(cache_priv->mngt_queue, CAS_CPUS_ALL);
+	result = cas_create_queue_thread(cache,
+			cache_priv->mngt_queue, CAS_CPUS_ALL);
 	if (result) {
 		ocf_queue_put(cache_priv->mngt_queue);
 		goto err;

diff --git a/modules/cas_cache/threads.c b/modules/cas_cache/threads.c
@@ -1,5 +1,6 @@
 /*
 * Copyright(c) 2012-2022 Intel Corporation
+* Copyright(c) 2024 Huawei Technologies
 * SPDX-License-Identifier: BSD-3-Clause
 */
 
@@ -175,10 +176,9 @@ static void _cas_stop_thread(struct cas_thread_info *info)
 	kfree(info);
 }
 
-int cas_create_queue_thread(ocf_queue_t q, int cpu)
+int cas_create_queue_thread(ocf_cache_t cache, ocf_queue_t q, int cpu)
 {
 	struct cas_thread_info *info;
-	ocf_cache_t cache = ocf_queue_get_cache(q);
 	const char *cache_num = ocf_cache_get_name(cache) + 5;
 	int result;
 

diff --git a/modules/cas_cache/threads.h b/modules/cas_cache/threads.h
@@ -1,5 +1,6 @@
 /*
 * Copyright(c) 2012-2021 Intel Corporation
+* Copyright(c) 2024 Huawei Technologies
 * SPDX-License-Identifier: BSD-3-Clause
 */
 
@@ -12,7 +13,7 @@
 
 #define CAS_CPUS_ALL -1
 
-int cas_create_queue_thread(ocf_queue_t q, int cpu);
+int cas_create_queue_thread(ocf_cache_t cache, ocf_queue_t q, int cpu);
 void cas_kick_queue_thread(ocf_queue_t q);
 void cas_stop_queue_thread(ocf_queue_t q);
 

diff --git a/ocf b/ocf
+2 −2		.github/workflows/pullrequest.yml
+4 −4		inc/ocf_queue.h
+1 −1		src/metadata/metadata_io.c
+1 −1		src/metadata/metadata_raw_dynamic.c
+2 −0		src/mngt/ocf_mngt_cache.c
+1 −1		src/mngt/ocf_mngt_flush.c
+2 −0		src/ocf_cache_priv.h
+3 −2		src/ocf_core.c
+3 −0		src/ocf_core_priv.h
+6 −7		src/ocf_queue.c
+189 −27		src/ocf_request.c
+40 −0		src/ocf_request.h
+2 −2		src/utils/utils_cleaner.c
+1 −2		src/utils/utils_parallelize.c
+1 −1		src/utils/utils_pipeline.c