github/open-cas-linux
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1089 from robertbaldyga/remove-error-code

Browse Source 
Remove unnecessary error code
This commit is contained in:
Robert Baldyga 2022-03-09 16:31:59 +01:00 committed by GitHub
commit 4317c917d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
casadm/extended_err_msg.c
View File

@ -170,10 +170,6 @@ struct {
OCF_ERR_NO_LOCK, OCF_ERR_NO_LOCK,
"Failed to lock cache for management operation." "Failed to lock cache for management operation."
}, },
{
OCF_ERR_METADATA_LAYOUT_MISMATCH,
"Metadata layout mismatch"
},
{ {
OCF_ERR_CACHE_LINE_SIZE_MISMATCH, OCF_ERR_CACHE_LINE_SIZE_MISMATCH,
"Cache line size mismatch" "Cache line size mismatch"

6
modules/cas_cache/layer_cache_management.c
View File

@ -2388,13 +2388,13 @@ err:
ocf_mngt_cache_stop(cache, _cache_mngt_cache_stop_rollback_complete, ocf_mngt_cache_stop(cache, _cache_mngt_cache_stop_rollback_complete,
context); context);
rollback_result = wait_for_completion_interruptible(&context->async.cmpl); rollback_result = wait_for_completion_interruptible(&context->async.cmpl);
rollback_result = _cache_mngt_async_caller_set_result(&context->async, rollback_result = _cache_mngt_async_caller_set_result(&context->async,
rollback_result); rollback_result);
if (rollback_result != -KCAS_ERR_WAITING_INTERRUPTED) if (rollback_result != -KCAS_ERR_WAITING_INTERRUPTED)
kfree(context); kfree(context);
return result; return result;
} }

1
modules/cas_cache/utils/cas_err.h
View File

@ -51,7 +51,6 @@ static struct cas_error_map_entry cas_ocf_error_map[] = {
{ OCF_ERR_CACHE_NAME_MISMATCH, EINVAL }, { OCF_ERR_CACHE_NAME_MISMATCH, EINVAL },
{ OCF_ERR_INVAL_CACHE_DEV, EINVAL }, { OCF_ERR_INVAL_CACHE_DEV, EINVAL },
{ OCF_ERR_CORE_UUID_EXISTS, EINVAL }, { OCF_ERR_CORE_UUID_EXISTS, EINVAL },
{ OCF_ERR_METADATA_LAYOUT_MISMATCH, EINVAL },
{ OCF_ERR_CACHE_LINE_SIZE_MISMATCH, EINVAL }, { OCF_ERR_CACHE_LINE_SIZE_MISMATCH, EINVAL },
{ OCF_ERR_CACHE_STANDBY, EBUSY }, { OCF_ERR_CACHE_STANDBY, EBUSY },
}; };

2
ocf

@ -1 +1 @@
Subproject commit be4927f52409c5eb0bcb2078a6e536fd1e9c3cf8 Subproject commit 4690cd60fea0645cf8207d7fbba2b318783b10f4