From 08e9f1a323e5a3ab3fa446ac191063b63da2b014 Mon Sep 17 00:00:00 2001 From: Robert Baldyga Date: Wed, 31 Jan 2024 15:51:22 +0100 Subject: [PATCH] Remove ocf_queue_get_cache() Signed-off-by: Robert Baldyga --- modules/cas_cache/layer_cache_management.c | 6 ++++-- modules/cas_cache/threads.c | 4 ++-- modules/cas_cache/threads.h | 3 ++- ocf | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/modules/cas_cache/layer_cache_management.c b/modules/cas_cache/layer_cache_management.c index 4af241580..0e88ffde1 100644 --- 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 index 8b4e2106c..6f3b7d922 100644 --- 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 index 38d39a746..67350f028 100644 --- 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 index 193410e7b..1fbb00de8 160000 --- a/ocf +++ b/ocf @@ -1 +1 @@ -Subproject commit 193410e7b2eafa439078067e24d34e8f09e5c48b +Subproject commit 1fbb00de8f40bab42eb5625053a61536c49382cb