Merge pull request #1509 from robertbaldyga/remove-ocf_queue_get_cache

Remove ocf_queue_get_cache()
Open-CAS · Sep 9, 2024 · 20276bd · 20276bd
2 parents f9af5c2 + 08e9f1a
commit 20276bd
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