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

Merge pull request #436 from mmichal10/metadata-assert

Browse Source 
Metadata assert
This commit is contained in:
Robert Baldyga 2021-01-08 10:15:08 +01:00 committed by GitHub
commit fd88c2c3a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/metadata/metadata.c
View File

@ -1485,18 +1485,12 @@ void ocf_metadata_get_core_and_part_id(struct ocf_cache *cache,
info = ocf_metadata_raw_rd_access(cache, info = ocf_metadata_raw_rd_access(cache,
&(ctrl->raw_desc[metadata_segment_list_info]), line); &(ctrl->raw_desc[metadata_segment_list_info]), line);
if (collision && info) { ENV_BUG_ON(!collision || !info);
if (core_id)
*core_id = collision->core_id; if (core_id)
if (part_id) *core_id = collision->core_id;
*part_id = info->partition_id; if (part_id)
} else { *part_id = info->partition_id;
ocf_metadata_error(cache);
if (core_id)
*core_id = OCF_CORE_MAX;
if (part_id)
*part_id = PARTITION_DEFAULT;
}
} }
/******************************************************************************* /*******************************************************************************
* Hash Table * Hash Table

18
src/metadata/metadata_core.c
View File

@ -20,19 +20,13 @@ void ocf_metadata_get_core_info(struct ocf_cache *cache,
collision = ocf_metadata_raw_rd_access(cache, collision = ocf_metadata_raw_rd_access(cache,
&(ctrl->raw_desc[metadata_segment_collision]), line); &(ctrl->raw_desc[metadata_segment_collision]), line);
if (collision) {
if (core_id)
*core_id = collision->core_id;
if (core_sector)
*core_sector = collision->core_line;
} else {
ocf_metadata_error(cache);
if (core_id) ENV_BUG_ON(!collision);
*core_id = OCF_CORE_MAX;
if (core_sector) if (core_id)
*core_sector = ULLONG_MAX; *core_id = collision->core_id;
} if (core_sector)
*core_sector = collision->core_line;
} }
void ocf_metadata_set_core_info(struct ocf_cache *cache, void ocf_metadata_set_core_info(struct ocf_cache *cache,

3
src/utils/utils_part.h
View File

@ -61,7 +61,8 @@ static inline uint32_t ocf_part_get_min_size(ocf_cache_t cache,
{ {
uint64_t ioclass_size; uint64_t ioclass_size;
ioclass_size = part->config->min_size * cache->conf_meta->cachelines; ioclass_size = (uint64_t)part->config->min_size *
(uint64_t)cache->conf_meta->cachelines;
ioclass_size /= 100; ioclass_size /= 100;