Bug on metadata access error

Signed-off-by: Michal Mielewczyk <michal.mielewczyk@intel.com>
This commit is contained in:
Michal Mielewczyk 2021-01-07 17:59:13 -05:00
parent d0225ef1cb
commit fcef130919
2 changed files with 12 additions and 24 deletions

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,
&(ctrl->raw_desc[metadata_segment_list_info]), line);
if (collision && info) {
if (core_id)
*core_id = collision->core_id;
if (part_id)
*part_id = info->partition_id;
} else {
ocf_metadata_error(cache);
if (core_id)
*core_id = OCF_CORE_MAX;
if (part_id)
*part_id = PARTITION_DEFAULT;
}
ENV_BUG_ON(!collision || !info);
if (core_id)
*core_id = collision->core_id;
if (part_id)
*part_id = info->partition_id;
}
/*******************************************************************************
* Hash Table

View File

@ -20,19 +20,13 @@ void ocf_metadata_get_core_info(struct ocf_cache *cache,
collision = ocf_metadata_raw_rd_access(cache,
&(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)
*core_id = OCF_CORE_MAX;
if (core_sector)
*core_sector = ULLONG_MAX;
}
ENV_BUG_ON(!collision);
if (core_id)
*core_id = collision->core_id;
if (core_sector)
*core_sector = collision->core_line;
}
void ocf_metadata_set_core_info(struct ocf_cache *cache,