Merge pull request #307 from bjpaupor/lbstm

Add lbstm support for create-ns

Author: dwsuse

src/libnvme.map

@@ -175,7 +175,6 @@ LIBNVME_1_0 {
 		nvme_init_ctrl_list;
 		nvme_init_dsm_range;
 		nvme_init_logging;
-		nvme_init_id_ns;
 		nvme_io;
 		nvme_io_passthru64;
 		nvme_io_passthru;

src/nvme/types.h

@@ -1706,6 +1706,7 @@ enum nvme_lbaf_rp {
  *	      remains fixed throughout the life of the namespace and is
  *	      preserved across namespace and controller operations
  * @lbaf:     LBA Format, see &struct nvme_lbaf.
+ * @lbstm:    Logical Block Storage Tag Mask for end-to-end protection
  * @vs:	      Vendor Specific
  */
 struct nvme_id_ns {
@@ -1749,7 +1750,8 @@ struct nvme_id_ns {
 	__u8			nguid[16];
 	__u8			eui64[8];
 	struct nvme_lbaf	lbaf[64];
-	__u8			vs[3712];
+	__le64			lbstm;
+	__u8			vs[3704];
 };
 
 /**

src/nvme/util.c

@@ -401,19 +401,6 @@ void nvme_init_dsm_range(struct nvme_dsm_range *dsm, __u32 *ctx_attrs,
 	}
 }
 
-void nvme_init_id_ns(struct nvme_id_ns *ns, __u64 nsze, __u64 ncap, __u8 flbas,
-		__u8 dps, __u8 nmic, __u32 anagrpid, __u16 nvmsetid)
-{
-	memset(ns, 0, sizeof(*ns));
-	ns->nsze = cpu_to_le64(nsze);
-	ns->ncap = cpu_to_le64(ncap);
-	ns->flbas = flbas;
-	ns->dps = dps;
-	ns->nmic = nmic;
-	ns->anagrpid = cpu_to_le32(anagrpid);
-	ns->nvmsetid = cpu_to_le16(nvmsetid);
-}
-
 void nvme_init_ctrl_list(struct nvme_ctrl_list *cntlist, __u16 num_ctrls,
 			  __u16 *ctrlist)
 {

src/nvme/util.h

@@ -75,23 +75,6 @@ const char *nvme_status_to_string(int status, bool fabrics);
  */
 const char *nvme_errno_to_string(int err);
 
-/**
- * nvme_init_id_ns() - Initialize an Identify Namepsace structure for creation.
- * @ns:	      Address of the Identify Namespace structure to initialize
- * @nsze:     Namespace size
- * @ncap:     namespace capacity
- * @flbas:    formatted logical block size settings
- * @dps:      Data protection settings
- * @nmic:     Namespace sharing capabilities
- * @anagrpid: ANA group identifier
- * @nvmsetid: NVM Set identifer
- *
- * This is intended to be used with a namespace management "create", see
- * nvme_ns_mgmt_create().
- */
-void nvme_init_id_ns(struct nvme_id_ns *ns, __u64 nsze, __u64 ncap, __u8 flbas,
-		     __u8 dps, __u8 nmic, __u32 anagrpid, __u16 nvmsetid);
-
 /**
  * nvme_init_ctrl_list() - Initialize an nvme_ctrl_list structure from an array.
  * @cntlist:   The controller list structure to initialize