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

Merge pull request #19 from micrakow/atomic_format_err_ext_msg

Browse Source 
Added more descriptive err msg for NVMe format
This commit is contained in:
Michał Mielewczyk 2019-05-10 14:27:15 +02:00 committed by GitHub
commit 103d8683e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
casadm/cas_main.c
View File

@ -1628,7 +1628,7 @@ static int handle_nvme_format()
}
if (!cas_capabilites.nvme_format) {
cas_printf(LOG_ERR, "Command is not supported\n");
cas_printf(LOG_ERR, "Command is not supported by current kernel\n");
return FAILURE;
}

4
casadm/extended_err_msg.c
View File

@ -183,6 +183,10 @@ struct {
KCAS_ERR_NVME_BAD_FORMAT,
"NVMe is formatted to unsupported format"
},
{
KCAS_ERR_UNSUPPORTED_LBA_FORMAT,
"Specified LBA format is not supported by the NVMe device"
},
{
KCAS_ERR_CONTAINS_PART,
"Device contains partitions.\nIf you want to continue, "

6
modules/cas_cache/utils/utils_nvme.c
View File

@ -274,7 +274,7 @@ static int _cas_nvme_preformat_check(struct block_device *bdev, int force)
} else if (probe_ctx.error == -EBUSY) {
ret = -OCF_ERR_NOT_OPEN_EXC;
} else if (probe_ctx.error) {
/* Some error occurred, we do not have sure about clean cache */
/* Some error occurred, we are not sure whether cache is clean or not */
ret = -KCAS_ERR_FORMAT_FAILED;
} else {
/* Check if cache was closed in proper way */
@ -352,7 +352,7 @@ static int _cas_nvme_format_namespace_by_path(const char *device_path,
}
if (best_lbaf < 0) {
ret = -KCAS_ERR_FORMAT_FAILED;
ret = -KCAS_ERR_UNSUPPORTED_LBA_FORMAT;
goto out2;
}
@ -509,7 +509,7 @@ static int _cas_nvme_format_character_device(const char *device_path,
}
if (best_lbaf < 0) {
ret = -KCAS_ERR_FORMAT_FAILED;
ret = -KCAS_ERR_UNSUPPORTED_LBA_FORMAT;
goto cleanup;
}

3
modules/include/cas_ioctl_codes.h
View File

@ -544,6 +544,9 @@ enum kcas_error {
/** NVMe is formatted to unsupported format */
KCAS_ERR_NVME_BAD_FORMAT,
/** Specified LBA format is not supported by the NVMe device */
KCAS_ERR_UNSUPPORTED_LBA_FORMAT,
/** Device contains partitions */
KCAS_ERR_CONTAINS_PART,