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

Improve error mapping code

Browse Source 
Signed-off-by: Robert Baldyga <robert.baldyga@intel.com>
This commit is contained in:
Robert Baldyga 2021-11-25 16:26:38 +01:00
parent 73461fc26d
commit 57a3938872
3 changed files with 33 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,10 +6,12 @@
#include "cas_cache.h" #include "cas_cache.h"
struct { struct cas_error_map_entry {
int cas_error; int cas_err;
int std_error; int errno;
} static cas_error_code_map[] = { };
static struct cas_error_map_entry cas_ocf_error_map[] = {
/* OCF error mappings*/ /* OCF error mappings*/
{ OCF_ERR_INVAL, EINVAL }, { OCF_ERR_INVAL, EINVAL },
{ OCF_ERR_AGAIN, EAGAIN }, { OCF_ERR_AGAIN, EAGAIN },
@ -52,7 +54,9 @@ struct {
{ OCF_ERR_METADATA_LAYOUT_MISMATCH, 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 },
};
static struct cas_error_map_entry cas_error_map[] = {
/* CAS kernel error mappings*/ /* CAS kernel error mappings*/
{ KCAS_ERR_ROOT, EPERM }, { KCAS_ERR_ROOT, EPERM },
{ KCAS_ERR_SYSTEM, EINVAL }, { KCAS_ERR_SYSTEM, EINVAL },
@ -81,19 +85,30 @@ struct {
/* Helper which change cas-specific error */ /* Helper which change cas-specific error */
/* codes to kernel generic error codes */ /* codes to kernel generic error codes */
/*******************************************/ /*******************************************/
static inline int map_cas_err_to_generic(int cas_error_code) static inline int map_cas_err_to_generic(int error_code)
{ {
int i; int i;
if (cas_error_code == 0) if (error_code == 0)
return 0; /* No Error */ return 0; /* No Error */
cas_error_code = abs(cas_error_code); error_code = abs(error_code);
for (i = 0; i < ARRAY_SIZE(cas_error_code_map); i++) { if (error_code >= OCF_ERR_MIN && error_code <= OCF_ERR_MAX) {
if (cas_error_code_map[i].cas_error == cas_error_code) for (i = 0; i < ARRAY_SIZE(cas_ocf_error_map); i++) {
return -cas_error_code_map[i].std_error; if (cas_ocf_error_map[i].cas_err == error_code)
return -cas_ocf_error_map[i].errno;
return -EINVAL;
}
} }
return -cas_error_code; if (error_code >= KCAS_ERR_MIN && error_code <= KCAS_ERR_MAX) {
for (i = 0; i < ARRAY_SIZE(cas_error_map); i++) {
if (cas_error_map[i].cas_err == error_code)
return -cas_error_map[i].errno;
return -EINVAL;
}
}
return -error_code;
} }

8
modules/include/cas_ioctl_codes.h
View File

@ -507,8 +507,10 @@ struct kcas_failover_activate
* Extended kernel CAS error codes * Extended kernel CAS error codes
*/ */
enum kcas_error { enum kcas_error {
KCAS_ERR_MIN = 2000000,
/** Must be root */ /** Must be root */
KCAS_ERR_ROOT = 2000000, KCAS_ERR_ROOT = KCAS_ERR_MIN,
/** System Error */ /** System Error */
KCAS_ERR_SYSTEM, KCAS_ERR_SYSTEM,
@ -571,7 +573,9 @@ enum kcas_error {
KCAS_ERR_CORE_IN_ACTIVE_STATE, KCAS_ERR_CORE_IN_ACTIVE_STATE,
/** Inactive core has dirty data assigned */ /** Inactive core has dirty data assigned */
KCAS_ERR_INACTIVE_CORE_IS_DIRTY KCAS_ERR_INACTIVE_CORE_IS_DIRTY,
KCAS_ERR_MAX = KCAS_ERR_INACTIVE_CORE_IS_DIRTY,
}; };
#endif #endif

2
ocf

@ -1 +1 @@
Subproject commit 8669a296ccd87f5dc274920cf613143f74cb8cb3 Subproject commit e72018bc02478f3ac73ee8984fafaf61f09c425d