From a9a85fb01f1b3b3b91c994881fd68d28252ac39f Mon Sep 17 00:00:00 2001 From: Slawomir Jankowski Date: Thu, 9 Apr 2020 09:45:09 +0200 Subject: [PATCH] Update use of *run_ioctl_interruptible* after changes Signed-off-by: Slawomir Jankowski --- casadm/cas_lib.c | 10 +++++----- casadm/upgrade.c | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/casadm/cas_lib.c b/casadm/cas_lib.c index 57b664d..c131c59 100644 --- a/casadm/cas_lib.c +++ b/casadm/cas_lib.c @@ -940,7 +940,7 @@ int start_cache(uint16_t cache_id, unsigned int cache_init, cmd.line_size = line_size; cmd.force = (uint8_t)force; - if (run_ioctl_interruptible(fd, KCAS_IOCTL_START_CACHE, &cmd, + if (run_ioctl_interruptible_retry(fd, KCAS_IOCTL_START_CACHE, &cmd, "Starting cache", cache_id, OCF_CORE_ID_INVALID) < 0) { close(fd); if (cmd.ext_err_code == OCF_ERR_NO_FREE_RAM) { @@ -1035,7 +1035,7 @@ int stop_cache(uint16_t cache_id, int flush) cmd.cache_id = cache_id; cmd.flush_data = flush; - if(run_ioctl_interruptible(fd, KCAS_IOCTL_STOP_CACHE, &cmd, "Stopping cache", + if(run_ioctl_interruptible_retry(fd, KCAS_IOCTL_STOP_CACHE, &cmd, "Stopping cache", cache_id, OCF_CORE_ID_INVALID) < 0) { close(fd); if (OCF_ERR_FLUSHING_INTERRUPTED == cmd.ext_err_code) { @@ -1122,7 +1122,7 @@ int set_cache_mode(unsigned int cache_mode, unsigned int cache_id, int flush) cmd.caching_mode = cache_mode; cmd.flush_data = flush; - if (run_ioctl_interruptible(fd, KCAS_IOCTL_SET_CACHE_STATE, &cmd, "Setting mode", + if (run_ioctl_interruptible_retry(fd, KCAS_IOCTL_SET_CACHE_STATE, &cmd, "Setting mode", cache_id, OCF_CORE_ID_INVALID) < 0) { close(fd); if (OCF_ERR_FLUSHING_INTERRUPTED == cmd.ext_err_code) { @@ -1951,7 +1951,7 @@ int flush_cache(unsigned int cache_id) memset(&cmd, 0, sizeof(cmd)); cmd.cache_id = cache_id; /* synchronous flag */ - if (run_ioctl_interruptible(fd, KCAS_IOCTL_FLUSH_CACHE, &cmd, "Flushing cache", + if (run_ioctl_interruptible_retry(fd, KCAS_IOCTL_FLUSH_CACHE, &cmd, "Flushing cache", cache_id, OCF_CORE_ID_INVALID) < 0) { close(fd); if (OCF_ERR_FLUSHING_INTERRUPTED == cmd.ext_err_code) { @@ -2004,7 +2004,7 @@ int flush_core(unsigned int cache_id, unsigned int core_id) return FAILURE; /* synchronous flag */ - if (run_ioctl_interruptible(fd, KCAS_IOCTL_FLUSH_CORE, &cmd, "Flushing core", cache_id, core_id) < 0) { + if (run_ioctl_interruptible_retry(fd, KCAS_IOCTL_FLUSH_CORE, &cmd, "Flushing core", cache_id, core_id) < 0) { close(fd); if (OCF_ERR_FLUSHING_INTERRUPTED == cmd.ext_err_code) { cas_printf(LOG_ERR, DIRTY_FLUSHING_WARNING); diff --git a/casadm/upgrade.c b/casadm/upgrade.c index cb94109..649566f 100644 --- a/casadm/upgrade.c +++ b/casadm/upgrade.c @@ -23,7 +23,7 @@ int upgrade_start() return -1; } - if (run_ioctl_interruptible(fd, KCAS_IOCTL_UPGRADE, &cmd_info, + if (run_ioctl_interruptible_retry(fd, KCAS_IOCTL_UPGRADE, &cmd_info, "Starting upgrade", 0, OCF_CORE_ID_INVALID) < 0) { close(fd); if (OCF_ERR_FLUSHING_INTERRUPTED == cmd_info.ext_err_code) {