From bda0eb41a9802d69fec686e3258d043b87ebefb7 Mon Sep 17 00:00:00 2001 From: Michal Mielewczyk Date: Mon, 26 Aug 2019 06:27:04 -0400 Subject: [PATCH] Rename KCAS_IOCTL_PARTITION_STATS with KCAS_IOCTL_PARTITION_INFO. Signed-off-by: Michal Mielewczyk --- casadm/cas_lib.c | 2 +- casadm/statistics_model.c | 2 +- modules/cas_cache/service_ui_ioctl.c | 4 ++-- modules/include/cas_ioctl_codes.h | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/casadm/cas_lib.c b/casadm/cas_lib.c index 36218fa..2aaeba8 100644 --- a/casadm/cas_lib.c +++ b/casadm/cas_lib.c @@ -2028,7 +2028,7 @@ int partition_list(unsigned int cache_id, unsigned int output_format) io_class.cache_id = cache_id; io_class.class_id = i; - result = run_ioctl(fd, KCAS_IOCTL_PARTITION_STATS, &io_class); + result = run_ioctl(fd, KCAS_IOCTL_PARTITION_INFO, &io_class); if (result) { if (OCF_ERR_IO_CLASS_NOT_EXIST == io_class.ext_err_code) { result = SUCCESS; diff --git a/casadm/statistics_model.c b/casadm/statistics_model.c index d926b4d..be90456 100644 --- a/casadm/statistics_model.c +++ b/casadm/statistics_model.c @@ -665,7 +665,7 @@ static int read_io_class_stats(int ctrl_fd, int cache_id, int core_id, io_class_tmp->get_stats = 1; } - if (ioctl(ctrl_fd, KCAS_IOCTL_PARTITION_STATS, io_class_tmp) < 0) { + if (ioctl(ctrl_fd, KCAS_IOCTL_PARTITION_INFO, io_class_tmp) < 0) { io_class_out->ext_err_code = io_class_tmp->ext_err_code; return FAILURE; } diff --git a/modules/cas_cache/service_ui_ioctl.c b/modules/cas_cache/service_ui_ioctl.c index 36b8e9e..62a4ac0 100644 --- a/modules/cas_cache/service_ui_ioctl.c +++ b/modules/cas_cache/service_ui_ioctl.c @@ -51,7 +51,7 @@ long cas_service_ioctl_ctrl(struct file *filp, unsigned int cmd, cmd != KCAS_IOCTL_LIST_CACHE && cmd != KCAS_IOCTL_GET_CACHE_COUNT && cmd != KCAS_IOCTL_CORE_INFO && - cmd != KCAS_IOCTL_PARTITION_STATS && + cmd != KCAS_IOCTL_PARTITION_INFO && cmd != KCAS_IOCTL_GET_CAPABILITIES) { return -EFAULT; } @@ -213,7 +213,7 @@ long cas_service_ioctl_ctrl(struct file *filp, unsigned int cmd, RETURN_CMD_RESULT(cmd_info, arg, retval); } - case KCAS_IOCTL_PARTITION_STATS: { + case KCAS_IOCTL_PARTITION_INFO: { struct kcas_io_class *cmd_info; GET_CMD_INFO(cmd_info, arg); diff --git a/modules/include/cas_ioctl_codes.h b/modules/include/cas_ioctl_codes.h index afbcc4b..451a26e 100644 --- a/modules/include/cas_ioctl_codes.h +++ b/modules/include/cas_ioctl_codes.h @@ -385,7 +385,7 @@ struct kcas_get_cache_param { * 11 * KCAS_IOCTL_FLUSH_CORE * OK * * 12 * KCAS_IOCTL_CACHE_INFO * DEPRECATED * * 13 * KCAS_IOCTL_CORE_INFO * DEPRECATED * - * 14 * KCAS_IOCTL_PARTITION_STATS * OK * + * 14 * KCAS_IOCTL_PARTITION_INFO * OK * * 15 * KCAS_IOCTL_PARTITION_SET * OK * * 16 * KCAS_IOCTL_GET_CACHE_COUNT * OK * * 17 * KCAS_IOCTL_LIST_CACHE * OK * @@ -433,7 +433,7 @@ struct kcas_get_cache_param { #define KCAS_IOCTL_FLUSH_CORE _IOR(KCAS_IOCTL_MAGIC, 11, struct kcas_flush_core) /** Retrieving partition status for specified cache id and partition id */ -#define KCAS_IOCTL_PARTITION_STATS _IOWR(KCAS_IOCTL_MAGIC, 14, struct kcas_io_class) +#define KCAS_IOCTL_PARTITION_INFO _IOWR(KCAS_IOCTL_MAGIC, 14, struct kcas_io_class) /** Configure partitions for specified cache id */ #define KCAS_IOCTL_PARTITION_SET _IOWR(KCAS_IOCTL_MAGIC, 15, struct kcas_io_classes)