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

Merge pull request #838 from robertbaldyga/fix-wi-double-completion

Browse Source 
Fix double completion in engine_wi
This commit is contained in:
Robert Baldyga 2024-09-25 09:20:06 +02:00 committed by GitHub
commit 34778d4529
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/engine/engine_inv.c
View File

@ -36,8 +36,6 @@ static int _ocf_invalidate_do(struct ocf_request *req)
{ {
struct ocf_cache *cache = req->cache; struct ocf_cache *cache = req->cache;
ENV_BUG_ON(env_atomic_read(&req->req_remaining));
ocf_hb_req_prot_lock_wr(req); ocf_hb_req_prot_lock_wr(req);
ocf_purge_map_info(req); ocf_purge_map_info(req);
ocf_hb_req_prot_unlock_wr(req); ocf_hb_req_prot_unlock_wr(req);

4
src/engine/engine_wi.c
View File

@ -77,8 +77,6 @@ static int ocf_write_wi_update_and_flush_metadata(struct ocf_request *req)
/* There are mapped cache line, need to remove them */ /* There are mapped cache line, need to remove them */
env_atomic_set(&req->req_remaining, 1); /* One core IO */
ocf_hb_req_prot_lock_wr(req); /*- Metadata WR access ---------------*/ ocf_hb_req_prot_lock_wr(req); /*- Metadata WR access ---------------*/
/* Remove mapped cache lines from metadata */ /* Remove mapped cache lines from metadata */
@ -90,6 +88,8 @@ static int ocf_write_wi_update_and_flush_metadata(struct ocf_request *req)
/* 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_write_wi_io_flush_metadata); _ocf_write_wi_io_flush_metadata);
return 0;
} }
_ocf_write_wi_io_flush_metadata(req, 0); _ocf_write_wi_io_flush_metadata(req, 0);

1
src/engine/engine_zero.c
View File

@ -103,7 +103,6 @@ static int _ocf_zero_do(struct ocf_request *req)
ocf_zero_map_info(req); ocf_zero_map_info(req);
/* Discard marked cache lines */ /* Discard marked cache lines */
env_atomic_set(&req->req_remaining, 1);
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,

2
src/metadata/metadata.c
View File

@ -1192,8 +1192,6 @@ void ocf_metadata_flush_do_asynch(struct ocf_cache *cache,
* line persistent in case of recovery * line persistent in case of recovery
*/ */
env_atomic_inc(&req->req_remaining); /* Core device IO */
result |= ocf_metadata_raw_flush_do_asynch(cache, req, result |= ocf_metadata_raw_flush_do_asynch(cache, req,
&(ctrl->raw_desc[metadata_segment_collision]), &(ctrl->raw_desc[metadata_segment_collision]),
complete); complete);