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

Use wrapper function to flush cache during stop

Browse Source 
Signed-off-by: Michal Mielewczyk <michal.mielewczyk@intel.com>
This commit is contained in:
Michal Mielewczyk 2020-03-23 06:40:13 -04:00
parent dca9769298
commit 17d5c8599d
1 changed files with 12 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
modules/cas_cache/layer_cache_management.c
View File

@ -2124,7 +2124,7 @@ int cache_mngt_exit_instance(const char *cache_name, size_t name_len, int flush)
ocf_cache_t cache; ocf_cache_t cache;
struct cache_priv *cache_priv; struct cache_priv *cache_priv;
ocf_queue_t mngt_queue; ocf_queue_t mngt_queue;
int status, flush_status = 0; int status = 0, flush_status = 0;
status = ocf_mngt_cache_get_by_name(cas_ctx, cache_name, status = ocf_mngt_cache_get_by_name(cas_ctx, cache_name,
name_len, &cache); name_len, &cache);
@ -2142,34 +2142,19 @@ int cache_mngt_exit_instance(const char *cache_name, size_t name_len, int flush)
* in cache during flush operation which will not be flushed * in cache during flush operation which will not be flushed
* this time, so we need to flush cache again after disabling * this time, so we need to flush cache again after disabling
* exported object. The second flush should be much faster. * exported object. The second flush should be much faster.
*/ */
if (flush) { if (flush)
/* Getting cache twice is workaround to make flush error handling easier status = _cache_flush_with_lock(cache);
and avoid dealing with synchronizing issues */ switch (status) {
status = ocf_mngt_cache_get(cache); case -OCF_ERR_CACHE_IN_INCOMPLETE_STATE:
if (status) case -OCF_ERR_FLUSHING_INTERRUPTED:
goto put; case -KCAS_ERR_WAITING_INTERRUPTED:
goto put;
status = _cache_mngt_read_lock_sync(cache); default:
if (status) { flush_status = status;
ocf_mngt_cache_put(cache); break;
goto put;
}
status = _cache_mngt_cache_flush_sync(cache, true,
_cache_read_unlock_put_cmpl);
switch (status) {
case -OCF_ERR_CACHE_IN_INCOMPLETE_STATE:
case -OCF_ERR_FLUSHING_INTERRUPTED:
case -KCAS_ERR_WAITING_INTERRUPTED:
goto put;
default:
flush_status = status;
break;
}
} }
/* get cache write lock */
status = _cache_mngt_lock_sync(cache); status = _cache_mngt_lock_sync(cache);
if (status) if (status)
goto put; goto put;