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

Check if loaded cache name is valid.

Browse Source 
When loading cache, it's name should be the same as the loaded one.

Signed-off-by: Michal Mielewczyk <michal.mielewczyk@intel.com>
This commit is contained in:
Michal Mielewczyk 2019-09-19 19:13:27 -04:00
parent d332c9d97f
commit c04ea4898f
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/metadata/metadata.c
View File

@ -290,6 +290,7 @@ static void ocf_metadata_load_properties_cmpl(
properties.cache_mode = superblock->cache_mode; properties.cache_mode = superblock->cache_mode;
properties.shutdown_status = superblock->clean_shutdown; properties.shutdown_status = superblock->clean_shutdown;
properties.dirty_flushed = superblock->dirty_flushed; properties.dirty_flushed = superblock->dirty_flushed;
properties.cache_name = superblock->name;
OCF_CMPL_RET(priv, 0, &properties); OCF_CMPL_RET(priv, 0, &properties);
} }

1
src/metadata/metadata.h
View File

@ -206,6 +206,7 @@ struct ocf_metadata_load_properties {
ocf_metadata_layout_t layout; ocf_metadata_layout_t layout;
ocf_cache_line_size_t line_size; ocf_cache_line_size_t line_size;
ocf_cache_mode_t cache_mode; ocf_cache_mode_t cache_mode;
char *cache_name;
}; };
typedef void (*ocf_metadata_load_properties_end_t)(void *priv, int error, typedef void (*ocf_metadata_load_properties_end_t)(void *priv, int error,

9
src/mngt/ocf_mngt_cache.c
View File

@ -892,7 +892,6 @@ err_buffer:
/** /**
* Prepare metadata accordingly to mode (for load/recovery read from disk) * Prepare metadata accordingly to mode (for load/recovery read from disk)
*/ */
static void _ocf_mngt_attach_load_properties_end(void *priv, int error, static void _ocf_mngt_attach_load_properties_end(void *priv, int error,
struct ocf_metadata_load_properties *properties) struct ocf_metadata_load_properties *properties)
{ {
@ -919,6 +918,14 @@ static void _ocf_mngt_attach_load_properties_end(void *priv, int error,
OCF_PL_FINISH_RET(context->pipeline, -OCF_ERR_METADATA_FOUND); OCF_PL_FINISH_RET(context->pipeline, -OCF_ERR_METADATA_FOUND);
} }
/*
* Check if name loaded from disk is the same as present one.
*/
if (env_strncmp(cache->conf_meta->name, properties->cache_name,
OCF_CACHE_NAME_SIZE)) {
OCF_PL_FINISH_RET(context->pipeline, -OCF_ERR_CACHE_NAME_MISMATCH);
}
context->metadata.shutdown_status = properties->shutdown_status; context->metadata.shutdown_status = properties->shutdown_status;
context->metadata.dirty_flushed = properties->dirty_flushed; context->metadata.dirty_flushed = properties->dirty_flushed;