Merge pull request #278 from sc108-lee/list_ns

ns list bug fix (wrong cns value)

Author: dwsuse

src/nvme/ioctl.h

@@ -871,7 +871,7 @@ static inline int nvme_identify_active_ns_list_csi(int fd, __u32 nsid,
 		.args_size = sizeof(args),
 		.fd = fd,
 		.timeout = NVME_DEFAULT_IOCTL_TIMEOUT,
-		.cns = NVME_IDENTIFY_CNS_NS_ACTIVE_LIST,
+		.cns = NVME_IDENTIFY_CNS_CSI_NS_ACTIVE_LIST,
 		.csi = csi,
 		.nsid = nsid,
 		.cntid = NVME_CNTLID_NONE,
@@ -908,7 +908,7 @@ static inline int nvme_identify_allocated_ns_list_csi(int fd, __u32 nsid,
 		.args_size = sizeof(args),
 		.fd = fd,
 		.timeout = NVME_DEFAULT_IOCTL_TIMEOUT,
-		.cns = NVME_IDENTIFY_CNS_ALLOCATED_NS_LIST,
+		.cns = NVME_IDENTIFY_CNS_CSI_ALLOCATED_NS_LIST,
 		.csi = csi,
 		.nsid = nsid,
 		.cntid = NVME_CNTLID_NONE,

src/nvme/types.h

@@ -125,10 +125,12 @@ enum nvme_constants {
 /**
  * enum nvme_csi - Defined command set indicators
  * @NVME_CSI_NVM:	NVM Command Set Indicator
+ * @NVME_CSI_KV:	Key Value Command Set
  * @NVME_CSI_ZNS:	Zoned Namespace Command Set
  */
 enum nvme_csi {
 	NVME_CSI_NVM			= 0,
+	NVME_CSI_KV			= 1,
 	NVME_CSI_ZNS			= 2,
 };
 
@@ -6046,7 +6048,7 @@ enum nvme_admin_opcode {
  * @NVME_IDENTIFY_CNS_UUID_LIST:		A UUID List
  * @NVME_IDENTIFY_CNS_DOMAIN_LIST:		Domain List
  * @NVME_IDENTIFY_CNS_ENDURANCE_GROUP_ID:	Endurance Group List
- * @NVME_IDENTIFY_CNS_CSS_ALLOCATED_NS_LIST:	I/O Command Set specific Allocated Namespace
+ * @NVME_IDENTIFY_CNS_CSI_ALLOCATED_NS_LIST:	I/O Command Set specific Allocated Namespace
  * 						ID list
  * @NVME_IDENTIFY_CNS_COMMAND_SET_STRUCTURE:	Base Specification 2.0a section 5.17.2.21
  */
@@ -6072,7 +6074,7 @@ enum nvme_identify_cns {
 	NVME_IDENTIFY_CNS_UUID_LIST				= 0x17,
 	NVME_IDENTIFY_CNS_DOMAIN_LIST				= 0x18,
 	NVME_IDENTIFY_CNS_ENDURANCE_GROUP_ID			= 0x19,
-	NVME_IDENTIFY_CNS_CSS_ALLOCATED_NS_LIST			= 0x1A,
+	NVME_IDENTIFY_CNS_CSI_ALLOCATED_NS_LIST			= 0x1A,
 	NVME_IDENTIFY_CNS_COMMAND_SET_STRUCTURE			= 0x1C,
 };