Skip to content

Commit 057d18f

Browse files
Merge pull request #790 from robertbaldyga/v22.3.2-fix-ocf_alock_waitlist
[v22.3.2] Fix wrong order call to ocf_alock_waitlist_remove_entry()
2 parents 082c0a8 + d72f264 commit 057d18f

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

src/concurrency/ocf_cache_line_concurrency.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/*
22
* Copyright(c) 2012-2022 Intel Corporation
3+
* Copyright(c) 2022-2024 Huawei Technologies
34
* SPDX-License-Identifier: BSD-3-Clause
45
*/
56

@@ -135,7 +136,7 @@ static int ocf_cl_lock_line_slow(struct ocf_alock *alock,
135136
continue;
136137

137138
entry = ocf_cl_lock_line_get_entry(alock, req, i);
138-
ocf_alock_waitlist_remove_entry(alock, req, i, entry, rw);
139+
ocf_alock_waitlist_remove_entry(alock, req, entry, i, rw);
139140
}
140141

141142
return ret;

src/concurrency/ocf_mio_concurrency.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/*
22
* Copyright(c) 2021-2022 Intel Corporation
3+
* Copyright(c) 2022-2024 Huawei Technologies
34
* SPDX-License-Identifier: BSD-3-Clause
45
*/
56

@@ -92,7 +93,7 @@ static int ocf_mio_lock_slow(struct ocf_alock *alock,
9293
err:
9394
for (; i >= 0; i--) {
9495
entry = ocf_mio_lock_get_entry(alock, req, i);
95-
ocf_alock_waitlist_remove_entry(alock, req, i, entry, OCF_WRITE);
96+
ocf_alock_waitlist_remove_entry(alock, req, entry, i, OCF_WRITE);
9697
}
9798

9899
return ret;

src/concurrency/ocf_pio_concurrency.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/*
22
* Copyright(c) 2021-2022 Intel Corporation
3+
* Copyright(c) 2022-2024 Huawei Technologies
34
* SPDX-License-Identifier: BSD-3-Clause
45
*/
56

@@ -130,7 +131,7 @@ static int ocf_pio_lock_slow(struct ocf_alock *alock,
130131
if (unlikely(entry == OUT_OF_RANGE))
131132
continue;
132133

133-
ocf_alock_waitlist_remove_entry(alock, req, i, entry, OCF_WRITE);
134+
ocf_alock_waitlist_remove_entry(alock, req, entry, i, OCF_WRITE);
134135
}
135136

136137
return ret;

0 commit comments

Comments
 (0)