From: Gollu Appalanaidu <anaidu.gollu@samsung.com>
Date: Sat, 6 Feb 2021 11:03:48 +0000 (+0530)
Subject: zns: fix zone management receive command zra and zrasf data types
X-Git-Tag: v1.14~85
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=c37c9fc2c4975478470b38ab6ea69af8e3b7c58e;p=users%2Fsagi%2Fnvme-cli.git

zns: fix zone management receive command zra and zrasf data types

Signed-off-by: Gollu Appalanaidu <anaidu.gollu@samsung.com>
---

diff --git a/nvme-ioctl.c b/nvme-ioctl.c
index 1d307fc7..186f4f35 100644
--- a/nvme-ioctl.c
+++ b/nvme-ioctl.c
@@ -981,7 +981,7 @@ int nvme_zns_mgmt_send(int fd, __u32 nsid, __u64 slba, bool select_all,
 }
 
 int nvme_zns_mgmt_recv(int fd, __u32 nsid, __u64 slba,
-		       enum nvme_zns_recv_action zra, __u16 zrasf,
+		       enum nvme_zns_recv_action zra, __u8 zrasf,
 		       bool zras_feat, __u32 data_len, void *data)
 {
 	__u32 cdw10 = slba & 0xffffffff;
diff --git a/nvme-ioctl.h b/nvme-ioctl.h
index 9802da5b..3e9682f8 100644
--- a/nvme-ioctl.h
+++ b/nvme-ioctl.h
@@ -163,7 +163,7 @@ int nvme_zns_mgmt_send(int fd, __u32 nsid, __u64 slba, bool select_all,
 		       enum nvme_zns_send_action zsa, __u32 data_len,
 		       void *data);
 int nvme_zns_mgmt_recv(int fd, __u32 nsid, __u64 slba,
-		       enum nvme_zns_recv_action zra, __u16 zrasf,
+		       enum nvme_zns_recv_action zra, __u8 zrasf,
 		       bool zras_feat, __u32 data_len, void *data);
 int nvme_zns_report_zones(int fd, __u32 nsid, __u64 slba, bool extended,
 			  enum nvme_zns_report_options opts, bool partial,
diff --git a/plugins/zns/zns.c b/plugins/zns/zns.c
index 80c25e8e..00c42d3e 100644
--- a/plugins/zns/zns.c
+++ b/plugins/zns/zns.c
@@ -484,8 +484,8 @@ static int zone_mgmt_recv(int argc, char **argv, struct command *cmd, struct plu
 		char *output_format;
 		__u64  zslba;
 		__u32  namespace_id;
-		__u16  zra;
-		__u16  zrasf;
+		__u8   zra;
+		__u8   zrasf;
 		bool   partial;
 		__u32  data_len;
 	};
@@ -498,8 +498,8 @@ static int zone_mgmt_recv(int argc, char **argv, struct command *cmd, struct plu
 		OPT_FMT("output-format",  'o', &cfg.output_format,  output_format),
 		OPT_UINT("namespace-id",  'n', &cfg.namespace_id,   namespace_id),
 		OPT_SUFFIX("start-lba",   's', &cfg.zslba,          zslba),
-		OPT_SHRT("zra",           'z', &cfg.zra,            zra),
-		OPT_SHRT("zrasf",         'S', &cfg.zrasf,          zrasf),
+		OPT_BYTE("zra",           'z', &cfg.zra,            zra),
+		OPT_BYTE("zrasf",         'S', &cfg.zrasf,          zrasf),
 		OPT_FLAG("partial",       'p', &cfg.partial,        partial),
 		OPT_UINT("data-len",      'l', &cfg.data_len,       data_len),
 		OPT_END()