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

Merge pull request #285 from arutk/fix_io_class_configure

Browse Source 
Fix error handling in IO ocf_mngt_cache_io_classes_configure
This commit is contained in:
Michał Mielewczyk 2019-09-25 14:42:06 +02:00 committed by GitHub
commit 9613c325fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/mngt/ocf_mngt_io_class.c
View File

@ -117,8 +117,8 @@ static int _ocf_mngt_io_class_configure(ocf_cache_t cache,
return -OCF_ERR_INVAL; return -OCF_ERR_INVAL;
} }
if (!name || !name[0]) if (!name[0])
return -OCF_ERR_IO_CLASS_NOT_EXIST; return -OCF_ERR_INVAL;
if (part_id == PARTITION_DEFAULT) { if (part_id == PARTITION_DEFAULT) {
/* Special behavior for default partition */ /* Special behavior for default partition */
@ -175,12 +175,11 @@ static int _ocf_mngt_io_class_configure(ocf_cache_t cache,
return result; return result;
} }
static int _ocf_mngt_io_class_remove(ocf_cache_t cache, static void _ocf_mngt_io_class_remove(ocf_cache_t cache,
const struct ocf_mngt_io_class_config *cfg) const struct ocf_mngt_io_class_config *cfg)
{ {
struct ocf_user_part *dest_part; struct ocf_user_part *dest_part;
ocf_part_id_t part_id = cfg->class_id; ocf_part_id_t part_id = cfg->class_id;
int result;
dest_part = &cache->user_parts[part_id]; dest_part = &cache->user_parts[part_id];
@ -190,37 +189,30 @@ static int _ocf_mngt_io_class_remove(ocf_cache_t cache,
ocf_cache_log(cache, log_info, ocf_cache_log(cache, log_info,
"Cannot remove unclassified IO class, " "Cannot remove unclassified IO class, "
"id: %u [ ERROR ]\n", part_id); "id: %u [ ERROR ]\n", part_id);
return 0; return;
} }
if (ocf_part_is_valid(dest_part)) { if (!ocf_part_is_valid(dest_part)) {
result = 0;
ocf_part_set_valid(cache, part_id, false);
ocf_cache_log(cache, log_info,
"Removing IO class, id: %u [ %s ]\n",
part_id, result ? "ERROR" : "OK");
} else {
/* Does not exist */ /* Does not exist */
result = -OCF_ERR_IO_CLASS_NOT_EXIST; return;
} }
return result;
ocf_part_set_valid(cache, part_id, false);
ocf_cache_log(cache, log_info,
"Removing IO class, id: %u [ OK ]\n", part_id);
} }
static int _ocf_mngt_io_class_edit(ocf_cache_t cache, static int _ocf_mngt_io_class_edit(ocf_cache_t cache,
const struct ocf_mngt_io_class_config *cfg) const struct ocf_mngt_io_class_config *cfg)
{ {
int result; int result = 0;
if (cfg->name) { if (cfg->name)
result = _ocf_mngt_io_class_configure(cache, cfg); result = _ocf_mngt_io_class_configure(cache, cfg);
} else { else
result = _ocf_mngt_io_class_remove(cache, cfg); _ocf_mngt_io_class_remove(cache, cfg);
}
return result; return result;
} }
@ -284,7 +276,7 @@ int ocf_mngt_cache_io_classes_configure(ocf_cache_t cache,
for (i = 0; i < OCF_IO_CLASS_MAX; i++) { for (i = 0; i < OCF_IO_CLASS_MAX; i++) {
result = _ocf_mngt_io_class_edit(cache, &cfg->config[i]); result = _ocf_mngt_io_class_edit(cache, &cfg->config[i]);
if (result && result != -OCF_ERR_IO_CLASS_NOT_EXIST) { if (result) {
ocf_cache_log(cache, log_err, ocf_cache_log(cache, log_err,
"Failed to set new io class config\n"); "Failed to set new io class config\n");
goto out_edit; goto out_edit;