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

Move message about by-id path higher

Browse Source 
Not every usage of `set_device_path()` needs to print message.
Sometimes it's internal operation and can contain misleading info.

Signed-off-by: Slawomir Jankowski <slawomir.jankowski@intel.com>
This commit is contained in:
Slawomir Jankowski 2021-01-05 14:40:35 +01:00
parent 42c3f3ed8c
commit be87b59303
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
casadm/cas_lib.c
View File

@ -661,9 +661,6 @@ int set_device_path(char *dest_path, size_t dest_len, const char *src_path, size
return SUCCESS; return SUCCESS;
else else
cas_printf(LOG_ERR, "Internal error copying device path\n"); cas_printf(LOG_ERR, "Internal error copying device path\n");
} else {
cas_printf(LOG_ERR, "Please use correct by-id path to the device "
"%s.\n", src_path);
} }
return FAILURE; return FAILURE;
@ -1040,6 +1037,8 @@ int start_cache(uint16_t cache_id, unsigned int cache_init,
cmd.init_cache = cache_init; cmd.init_cache = cache_init;
if (set_device_path(cmd.cache_path_name, sizeof(cmd.cache_path_name), if (set_device_path(cmd.cache_path_name, sizeof(cmd.cache_path_name),
cache_device, MAX_STR_LEN) != SUCCESS) { cache_device, MAX_STR_LEN) != SUCCESS) {
cas_printf(LOG_ERR, "Please use correct by-id path to the device "
"%s.\n", cache_device);
close(fd); close(fd);
return FAILURE; return FAILURE;
} }
@ -1760,6 +1759,8 @@ int add_core(unsigned int cache_id, unsigned int core_id, const char *core_devic
memset(&cmd, 0, sizeof(cmd)); memset(&cmd, 0, sizeof(cmd));
if (set_device_path(cmd.core_path_name, sizeof(cmd.core_path_name), if (set_device_path(cmd.core_path_name, sizeof(cmd.core_path_name),
core_device, MAX_STR_LEN) != SUCCESS) { core_device, MAX_STR_LEN) != SUCCESS) {
cas_printf(LOG_ERR, "Please use correct by-id path to the device "
"%s.\n", core_device);
return FAILURE; return FAILURE;
} }
@ -1909,6 +1910,8 @@ int core_pool_remove(const char *core_device)
if (set_device_path(cmd.core_path_name, sizeof(cmd.core_path_name), if (set_device_path(cmd.core_path_name, sizeof(cmd.core_path_name),
core_device, MAX_STR_LEN) != SUCCESS) { core_device, MAX_STR_LEN) != SUCCESS) {
cas_printf(LOG_ERR, "Please use correct by-id path to the device "
"%s.\n", core_device);
close(fd); close(fd);
return FAILURE; return FAILURE;
} }
@ -2824,11 +2827,6 @@ int _check_cache_device(const char *device_path,
{ {
int result, fd; int result, fd;
if (set_device_path(cmd_info->path_name, sizeof(cmd_info->path_name),
device_path, MAX_STR_LEN) != SUCCESS) {
return FAILURE;
}
fd = open_ctrl_device(); fd = open_ctrl_device();
if (fd == -1) if (fd == -1)
return FAILURE; return FAILURE;
@ -2846,6 +2844,13 @@ int check_cache_device(const char *device_path)
FILE *intermediate_file[2]; FILE *intermediate_file[2];
int result; int result;
if (set_device_path(cmd_info.path_name, sizeof(cmd_info.path_name),
device_path, MAX_STR_LEN) != SUCCESS) {
cas_printf(LOG_ERR, "Please use correct by-id path to the device "
"%s.\n", device_path);
return FAILURE;
}
result = _check_cache_device(device_path, &cmd_info); result = _check_cache_device(device_path, &cmd_info);
if (result) { if (result) {