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

Merge pull request #570 from jfckm/fix-example

Browse Source 
Fix attach with no cache_line_size specified
This commit is contained in:
Robert Baldyga 2021-09-16 19:12:44 +02:00 committed by GitHub
commit 8108736c14
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/mngt/ocf_mngt_cache.c
View File

@ -1036,7 +1036,8 @@ static void _ocf_mngt_init_properties(ocf_pipeline_t pipeline,
context->metadata.shutdown_status = ocf_metadata_clean_shutdown; context->metadata.shutdown_status = ocf_metadata_clean_shutdown;
context->metadata.dirty_flushed = DIRTY_FLUSHED; context->metadata.dirty_flushed = DIRTY_FLUSHED;
context->metadata.line_size = context->cfg.cache_line_size; context->metadata.line_size = context->cfg.cache_line_size ?:
cache->metadata.line_size;
ocf_pipeline_next(pipeline); ocf_pipeline_next(pipeline);
} }
@ -1071,9 +1072,6 @@ static void _ocf_mngt_attach_prepare_metadata(ocf_pipeline_t pipeline,
ocf_cache_t cache = context->cache; ocf_cache_t cache = context->cache;
int ret; int ret;
context->metadata.line_size = context->metadata.line_size ?:
cache->metadata.line_size;
/* /*
* Initialize variable size metadata segments * Initialize variable size metadata segments
*/ */
@ -2193,7 +2191,7 @@ static void _ocf_mngt_activate_init_properties(ocf_pipeline_t pipeline,
context->metadata.shutdown_status = ocf_metadata_dirty_shutdown; context->metadata.shutdown_status = ocf_metadata_dirty_shutdown;
context->metadata.dirty_flushed = DIRTY_NOT_FLUSHED; context->metadata.dirty_flushed = DIRTY_NOT_FLUSHED;
context->metadata.line_size = context->cfg.cache_line_size; context->metadata.line_size = cache->metadata.line_size;
ocf_pipeline_next(pipeline); ocf_pipeline_next(pipeline);
} }
@ -2734,20 +2732,22 @@ void ocf_mngt_cache_activate(ocf_cache_t cache,
OCF_CHECK_NULL(cache); OCF_CHECK_NULL(cache);
OCF_CHECK_NULL(cfg); OCF_CHECK_NULL(cfg);
if (!cache->mngt_queue)
OCF_CMPL_RET(cache, priv, -OCF_ERR_INVAL);
/* Activate is not allowed in volatile metadata mode */
if (cache->metadata.is_volatile)
OCF_CMPL_RET(cache, priv, -OCF_ERR_INVAL);
/* Activate is not allowed with 'force' flag on */
if (cfg->force) { if (cfg->force) {
ocf_cache_log(cache, log_err, "Using 'force' flag is forbidden " ocf_cache_log(cache, log_err, "Using 'force' flag is forbidden "
"for activate operation."); "for activate operation.");
OCF_CMPL_RET(cache, priv, -OCF_ERR_INVAL); OCF_CMPL_RET(cache, priv, -OCF_ERR_INVAL);
} }
if (cfg->cache_line_size != ocf_cache_line_size_none &&
cfg->cache_line_size != cache->metadata.line_size) {
ocf_cache_log(cache, log_err, "Specifying cache line size is "
"forbidden for activate operation.");
OCF_CMPL_RET(cache, priv, -OCF_ERR_INVAL);
}
if (!cache->mngt_queue)
OCF_CMPL_RET(cache, priv, -OCF_ERR_INVAL);
result = _ocf_mngt_cache_validate_device_cfg(cfg); result = _ocf_mngt_cache_validate_device_cfg(cfg);
if (result) if (result)
OCF_CMPL_RET(cache, priv, result); OCF_CMPL_RET(cache, priv, result);