From f579aa4a23b338edbe298c98bbaada47074847b8 Mon Sep 17 00:00:00 2001 From: Stephen Bates Date: Thu, 2 Jul 2015 02:17:35 -0600 Subject: [PATCH] Fixed data-size type and bug in return value for submit_io The data-size and meta data input arguments should accept suffixes and also fixed a bug where the returned value for submit_io is always 0. --- nvme.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/nvme.c b/nvme.c index ae6455a2..3acbb4e3 100644 --- a/nvme.c +++ b/nvme.c @@ -2568,7 +2568,7 @@ static int submit_io(int opcode, char *command, int argc, char **argv) struct nvme_user_io io; struct timeval start_time, end_time; void *buffer, *mbuffer = NULL; - int err, dfd = opcode & 1 ? STDIN_FILENO : STDOUT_FILENO; + int err = 0, dfd = opcode & 1 ? STDIN_FILENO : STDOUT_FILENO; struct config { __u64 start_block; @@ -2605,10 +2605,10 @@ static int submit_io(int opcode, char *command, int argc, char **argv) {"start-block", "NUM", CFG_LONG_SUFFIX, &defaults.start_block, required_argument, NULL}, {"c", "NUM", CFG_SHORT, &defaults.block_count, required_argument, NULL}, {"block-count", "NUM", CFG_SHORT, &defaults.block_count, required_argument, NULL}, - {"z", "NUM", CFG_POSITIVE, &defaults.data_size, required_argument, NULL}, - {"data-size", "NUM", CFG_POSITIVE, &defaults.data_size, required_argument, NULL}, - {"y", "NUM", CFG_POSITIVE, &defaults.metadata_size, required_argument, NULL}, - {"metadata-size", "NUM", CFG_POSITIVE, &defaults.metadata_size, required_argument, NULL}, + {"z", "NUM", CFG_LONG_SUFFIX, &defaults.data_size, required_argument, NULL}, + {"data-size", "NUM", CFG_LONG_SUFFIX, &defaults.data_size, required_argument, NULL}, + {"y", "NUM", CFG_LONG_SUFFIX, &defaults.metadata_size, required_argument, NULL}, + {"metadata-size", "NUM", CFG_LONG_SUFFIX, &defaults.metadata_size, required_argument, NULL}, {"r", "NUM", CFG_POSITIVE, &defaults.ref_tag, required_argument, NULL}, {"ref-tag", "NUM", CFG_POSITIVE, &defaults.ref_tag, required_argument, NULL}, {"d", "FILE", CFG_STRING, &defaults.data, required_argument, NULL}, @@ -2719,7 +2719,7 @@ static int submit_io(int opcode, char *command, int argc, char **argv) free(buffer); if (cfg.metadata_size) free(mbuffer); - return 0; + return err; } static int compare(int argc, char **argv) -- 2.50.1