fix zns csn identify values

Signed-off-by: Keith Busch <kbusch@kernel.org>

diff --git a/linux/nvme.h b/linux/nvme.h
index 98780ce063293e620ff66de859edaffeb404f4d0..41b1dbd0d273412c95bdca1100cc56426c628cdf 100644 (file)
--- a/linux/nvme.h
+++ b/linux/nvme.h
@@ -417,6 +417,8 @@ enum {
        NVME_ID_CNS_NS_ACTIVE_LIST      = 0x02,
        NVME_ID_CNS_NS_DESC_LIST        = 0x03,
        NVME_ID_CNS_NVMSET_LIST         = 0x04,
+       NVME_ID_CNS_CSI_ID_NS           = 0x05,
+       NVME_ID_CNS_CSI_ID_CTRL         = 0x06,
        NVME_ID_CNS_NS_PRESENT_LIST     = 0x10,
        NVME_ID_CNS_NS_PRESENT          = 0x11,
        NVME_ID_CNS_CTRL_NS_LIST        = 0x12,

diff --git a/nvme-ioctl.c b/nvme-ioctl.c
index 403ac5b7e1e708a3227b9aa72c3a3924fef3e25d..c54702a12b2090c27f4757089c659772de51da49 100644 (file)
--- a/nvme-ioctl.c
+++ b/nvme-ioctl.c
@@ -407,12 +407,12 @@ int nvme_identify_uuid(int fd, void *data)
 
 int nvme_zns_identify_ns(int fd, __u32 nsid, void *data)
 {
-       return nvme_identify13(fd, nsid, 6, 2 << 24, data);
+       return nvme_identify13(fd, nsid, NVME_ID_CNS_CSI_ID_NS, 2 << 24, data);
 }
 
 int nvme_zns_identify_ctrl(int fd, void *data)
 {
-       return nvme_identify13(fd, 0, 6, 2 << 24, data);
+       return nvme_identify13(fd, 0, NVME_ID_CNS_CSI_ID_CTRL, 2 << 24, data);
 }
 
 int nvme_get_log14(int fd, __u32 nsid, __u8 log_id, __u8 lsp, __u64 lpo,