Merge pull request #166 from sc108-lee/for-upstream/tp4095

For upstream/tp4095

Author: dwsuse

src/libnvme.map

@@ -156,6 +156,8 @@ LIBNVME_1_0 {
 		nvme_identify_domain_list;
 		nvme_identify_endurance_group_list;
 		nvme_identify_independent_identify_ns;
+		nvme_identify_ns_csi_user_data_format;
+		nvme_identify_iocs_ns_csi_user_data_format;
 		nvme_identify_iocs;
 		nvme_identify_ns;
 		nvme_identify_ns_descs;

src/nvme/ioctl.c

@@ -240,14 +240,12 @@ enum nvme_cmd_dword_fields {
 	NVME_LOG_CDW14_OT_MASK					= 0x1,
 	NVME_IDENTIFY_CDW10_CNS_SHIFT				= 0,
 	NVME_IDENTIFY_CDW10_CNTID_SHIFT				= 16,
-	NVME_IDENTIFY_CDW11_NVMSETID_SHIFT			= 0,
-	NVME_IDENTIFY_CDW11_DOMID_SHIFT				= 0,
+	NVME_IDENTIFY_CDW11_CNSSPECID_SHIFT			= 0,
 	NVME_IDENTIFY_CDW14_UUID_SHIFT				= 0,
 	NVME_IDENTIFY_CDW11_CSI_SHIFT				= 24,
 	NVME_IDENTIFY_CDW10_CNS_MASK				= 0xff,
 	NVME_IDENTIFY_CDW10_CNTID_MASK				= 0xffff,
-	NVME_IDENTIFY_CDW11_NVMSETID_MASK			= 0xffff,
-	NVME_IDENTIFY_CDW11_DOMID_MASK				= 0xffff,
+	NVME_IDENTIFY_CDW11_CNSSPECID_MASK			= 0xffff,
 	NVME_IDENTIFY_CDW14_UUID_MASK				= 0x7f,
 	NVME_IDENTIFY_CDW11_CSI_MASK				= 0xff,
 	NVME_NAMESPACE_ATTACH_CDW10_SEL_SHIFT			= 0,
@@ -369,8 +367,7 @@ int nvme_identify(struct nvme_identify_args *args)
 {
 	__u32 cdw10 = NVME_SET(args->cntid, IDENTIFY_CDW10_CNTID) |
 			NVME_SET(args->cns, IDENTIFY_CDW10_CNS);
-	__u32 cdw11 = NVME_SET(args->nvmsetid, IDENTIFY_CDW11_NVMSETID) |
-			NVME_SET(args->domid, IDENTIFY_CDW11_DOMID) |
+	__u32 cdw11 = NVME_SET(args->cns_specific_id, IDENTIFY_CDW11_CNSSPECID) |
 			NVME_SET(args->csi, IDENTIFY_CDW11_CSI);
 	__u32 cdw14 = NVME_SET(args->uuidx, IDENTIFY_CDW14_UUID);