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

Merge pull request #809 from robertbaldyga/ram-needed-no-fail

Browse Source 
Modify ocf_mngt_get_ram_needed to never fail
This commit is contained in:
Robert Baldyga 2024-09-06 14:20:24 +02:00 committed by GitHub
commit 5a1f6f1f8a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
inc/ocf_mngt.h
View File

@ -458,14 +458,12 @@ static inline void ocf_mngt_cache_attach_config_set_default(
* @brief Get amount of free RAM needed to attach cache volume
*
* @param[in] cache Cache handle
* @param[in] cfg Caching device configuration
* @param[out] ram_needed Amount of RAM needed in bytes
* @param[in] volume_size Volume size in bytes
*
* @retval 0 Success
* @retval Non-zero Error occurred
* @retval Amount of RAM needed in bytes
*/
int ocf_mngt_get_ram_needed(ocf_cache_t cache,
struct ocf_mngt_cache_device_config *cfg, uint64_t *ram_needed);
uint64_t ocf_mngt_get_ram_needed(ocf_cache_t cache,
uint64_t volume_size);
/**
* @brief Completion callback of cache attach operation

18
src/mngt/ocf_mngt_cache.c
View File

@ -1405,28 +1405,16 @@ static uint64_t _ocf_mngt_calculate_ram_needed(ocf_cache_line_size_t line_size,
return min_free_ram;
}
int ocf_mngt_get_ram_needed(ocf_cache_t cache,
struct ocf_mngt_cache_device_config *cfg, uint64_t *ram_needed)
uint64_t ocf_mngt_get_ram_needed(ocf_cache_t cache,
uint64_t volume_size)
{
ocf_cache_line_size_t line_size;
uint64_t volume_size;
int result;
OCF_CHECK_NULL(cache);
OCF_CHECK_NULL(cfg);
OCF_CHECK_NULL(ram_needed);
result = ocf_volume_open(cfg->volume, cfg->volume_params);
if (result)
return result;
line_size = ocf_line_size(cache);
volume_size = ocf_volume_get_length(cfg->volume);
*ram_needed = _ocf_mngt_calculate_ram_needed(line_size, volume_size);
ocf_volume_close(cfg->volume);
return 0;
return _ocf_mngt_calculate_ram_needed(line_size, volume_size);
}
/**