From: Keith Busch Date: Tue, 1 Aug 2017 01:30:02 +0000 (-0400) Subject: Fix app tag field sizes X-Git-Tag: v1.4~20 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=00627add0aa5c872e8c7d1cc46dd0de174bd0fde;p=users%2Fsagi%2Fnvme-cli.git Fix app tag field sizes These are all 16-bit values. https://github.com/linux-nvme/nvme-cli/issues/213 Signed-off-by: Keith Busch --- diff --git a/nvme.c b/nvme.c index 718fe7b6..235a1bbf 100644 --- a/nvme.c +++ b/nvme.c @@ -1986,10 +1986,10 @@ static int write_zeroes(int argc, char **argv, struct command *cmd, struct plugi __u64 start_block; __u32 namespace_id; __u32 ref_tag; - __u32 app_tag; + __u16 app_tag; + __u16 app_tag_mask; __u16 block_count; __u8 prinfo; - __u8 app_tag_mask; int limited_retry; int force_unit_access; }; @@ -2011,8 +2011,8 @@ static int write_zeroes(int argc, char **argv, struct command *cmd, struct plugi {"force-unit-access", 'f', "", CFG_NONE, &cfg.force_unit_access, no_argument, force}, {"prinfo", 'p', "NUM", CFG_BYTE, &cfg.prinfo, required_argument, prinfo}, {"ref-tag", 'r', "NUM", CFG_POSITIVE, &cfg.ref_tag, required_argument, ref_tag}, - {"app-tag-mask", 'm', "NUM", CFG_BYTE, &cfg.app_tag_mask, required_argument, app_tag_mask}, - {"app-tag", 'a', "NUM", CFG_POSITIVE, &cfg.app_tag, required_argument, app_tag}, + {"app-tag-mask", 'm', "NUM", CFG_SHORT, &cfg.app_tag_mask, required_argument, app_tag_mask}, + {"app-tag", 'a', "NUM", CFG_SHORT, &cfg.app_tag, required_argument, app_tag}, {NULL} }; @@ -2486,8 +2486,8 @@ static int submit_io(int opcode, char *command, const char *desc, char *data; char *metadata; __u8 prinfo; - __u8 app_tag_mask; - __u32 app_tag; + __u16 app_tag_mask; + __u16 app_tag; int limited_retry; int force_unit_access; int show; @@ -2517,8 +2517,8 @@ static int submit_io(int opcode, char *command, const char *desc, {"data", 'd', "FILE", CFG_STRING, &cfg.data, required_argument, data}, {"metadata", 'M', "FILE", CFG_STRING, &cfg.metadata, required_argument, metadata}, {"prinfo", 'p', "NUM", CFG_BYTE, &cfg.prinfo, required_argument, prinfo}, - {"app-tag-mask", 'm', "NUM", CFG_BYTE, &cfg.app_tag_mask, required_argument, app_tag_mask}, - {"app-tag", 'a', "NUM", CFG_POSITIVE, &cfg.app_tag, required_argument, app_tag}, + {"app-tag-mask", 'm', "NUM", CFG_SHORT, &cfg.app_tag_mask, required_argument, app_tag_mask}, + {"app-tag", 'a', "NUM", CFG_SHORT, &cfg.app_tag, required_argument, app_tag}, {"limited-retry", 'l', "", CFG_NONE, &cfg.limited_retry, no_argument, limited_retry}, {"force-unit-access", 'f', "", CFG_NONE, &cfg.force_unit_access, no_argument, force}, {"show-command", 'v', "", CFG_NONE, &cfg.show, no_argument, show},