github/open-cas-linux
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1082 from pdebski21/complete_reinit_fix

Browse Source 
initializing completion twice replaced with reinit
This commit is contained in:
Robert Baldyga 2022-03-08 16:49:04 +01:00 committed by GitHub
commit 7ba87f767d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
modules/cas_cache/layer_cache_management.c
View File

@ -146,13 +146,26 @@ static int _cache_mngt_async_caller_set_result(
return result; return result;
} }
static inline void _cache_mngt_async_context_init_common(
struct _cache_mngt_async_context *context)
{
spin_lock_init(&context->lock);
context->result = 0;
context->compl_func = NULL;
}
static inline void _cache_mngt_async_context_init( static inline void _cache_mngt_async_context_init(
struct _cache_mngt_async_context *context) struct _cache_mngt_async_context *context)
{ {
init_completion(&context->cmpl); init_completion(&context->cmpl);
spin_lock_init(&context->lock); _cache_mngt_async_context_init_common(context);
context->result = 0; }
context->compl_func = NULL;
static inline void _cache_mngt_async_context_reinit(
struct _cache_mngt_async_context *context)
{
reinit_completion(&context->cmpl);
_cache_mngt_async_context_init_common(context);
} }
static void _cache_mngt_lock_complete(ocf_cache_t cache, void *priv, int error) static void _cache_mngt_lock_complete(ocf_cache_t cache, void *priv, int error)
@ -2371,8 +2384,7 @@ out_module_put:
return result; return result;
err: err:
reinit_completion(&context->async.cmpl); _cache_mngt_async_context_reinit(&context->async);
context->async.result = 0;
ocf_mngt_cache_stop(cache, _cache_mngt_cache_stop_rollback_complete, ocf_mngt_cache_stop(cache, _cache_mngt_cache_stop_rollback_complete,
context); context);
rollback_result = wait_for_completion_interruptible(&context->async.cmpl); rollback_result = wait_for_completion_interruptible(&context->async.cmpl);
@ -2537,7 +2549,7 @@ int cache_mngt_init_instance(struct ocf_mngt_cache_config *cfg,
return result; return result;
err: err:
_cache_mngt_async_context_init(&context->async); _cache_mngt_async_context_reinit(&context->async);
ocf_mngt_cache_stop(cache, _cache_mngt_cache_stop_rollback_complete, ocf_mngt_cache_stop(cache, _cache_mngt_cache_stop_rollback_complete,
context); context);
rollback_result = wait_for_completion_interruptible(&context->async.cmpl); rollback_result = wait_for_completion_interruptible(&context->async.cmpl);