Merge pull request #790 from robertbaldyga/v22.3.2-fix-ocf_alock_wait…

…list [v22.3.2] Fix wrong order call to ocf_alock_waitlist_remove_entry()
Open-CAS · Mar 22, 2024 · 057d18f · 057d18f
2 parents 082c0a8 + d72f264
commit 057d18f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/src/concurrency/ocf_cache_line_concurrency.c b/src/concurrency/ocf_cache_line_concurrency.c
@@ -1,5 +1,6 @@
 /*
  * Copyright(c) 2012-2022 Intel Corporation
+ * Copyright(c) 2022-2024 Huawei Technologies
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
@@ -135,7 +136,7 @@ static int ocf_cl_lock_line_slow(struct ocf_alock *alock,
 			continue;
 
 		entry = ocf_cl_lock_line_get_entry(alock, req, i);
-		ocf_alock_waitlist_remove_entry(alock, req, i, entry, rw);
+		ocf_alock_waitlist_remove_entry(alock, req, entry, i, rw);
 	}
 
 	return ret;

diff --git a/src/concurrency/ocf_mio_concurrency.c b/src/concurrency/ocf_mio_concurrency.c
@@ -1,5 +1,6 @@
 /*
  * Copyright(c) 2021-2022 Intel Corporation
+ * Copyright(c) 2022-2024 Huawei Technologies
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
@@ -92,7 +93,7 @@ static int ocf_mio_lock_slow(struct ocf_alock *alock,
 err:
 	for (; i >= 0; i--) {
 		entry = ocf_mio_lock_get_entry(alock, req, i);
-		ocf_alock_waitlist_remove_entry(alock, req, i, entry, OCF_WRITE);
+		ocf_alock_waitlist_remove_entry(alock, req, entry, i, OCF_WRITE);
 	}
 
 	return ret;

diff --git a/src/concurrency/ocf_pio_concurrency.c b/src/concurrency/ocf_pio_concurrency.c
@@ -1,5 +1,6 @@
 /*
  * Copyright(c) 2021-2022 Intel Corporation
+ * Copyright(c) 2022-2024 Huawei Technologies
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
@@ -130,7 +131,7 @@ static int ocf_pio_lock_slow(struct ocf_alock *alock,
 		if (unlikely(entry == OUT_OF_RANGE))
 			continue;
 
-		ocf_alock_waitlist_remove_entry(alock, req, i, entry, OCF_WRITE);
+		ocf_alock_waitlist_remove_entry(alock, req, entry, i, OCF_WRITE);
 	}
 
 	return ret;