github/ocf
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #783 from robertbaldyga/fix-deadlock-in-discard

Browse Source 
Fix potential deadlock in discard
This commit is contained in:
Robert Baldyga 2024-03-21 08:53:39 +01:00 committed by GitHub
commit 7e52cfafb9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/engine/engine_discard.c
View File

@ -1,5 +1,6 @@
/* /*
* Copyright(c) 2012-2022 Intel Corporation * Copyright(c) 2012-2022 Intel Corporation
* Copyright(c) 2024 Huawei Technologies
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
#include "ocf/ocf.h" #include "ocf/ocf.h"
@ -152,13 +153,13 @@ int _ocf_discard_step_do(struct ocf_request *req)
/* Remove mapped cache lines from metadata */ /* Remove mapped cache lines from metadata */
ocf_purge_map_info(req); ocf_purge_map_info(req);
ocf_hb_req_prot_unlock_wr(req);
if (req->info.flush_metadata) { if (req->info.flush_metadata) {
/* Request was dirty and need to flush metadata */ /* Request was dirty and need to flush metadata */
ocf_metadata_flush_do_asynch(cache, req, ocf_metadata_flush_do_asynch(cache, req,
_ocf_discard_step_complete); _ocf_discard_step_complete);
} }
ocf_hb_req_prot_unlock_wr(req);
} }
ocf_hb_req_prot_lock_rd(req); ocf_hb_req_prot_lock_rd(req);