From: Brandon Paupore Date: Thu, 24 Mar 2022 14:46:19 +0000 (-0500) Subject: Remove nvme_init_id_ns X-Git-Tag: v1.0-rc8~11^2 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=f21bb58eb8e4ee7820a9c043aa031565305afc9d;p=users%2Fsagi%2Flibnvme.git Remove nvme_init_id_ns Function was used only once in nvme-cli for the create-ns command, instead just handle setting the fields in nvme-cli directly. Signed-off-by: Brandon Paupore --- diff --git a/src/libnvme.map b/src/libnvme.map index 7463174c..dee0f6e8 100644 --- a/src/libnvme.map +++ b/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; diff --git a/src/nvme/util.c b/src/nvme/util.c index ba3f3ea6..799c0cf6 100644 --- a/src/nvme/util.c +++ b/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) { diff --git a/src/nvme/util.h b/src/nvme/util.h index f034c1b7..277b8578 100644 --- a/src/nvme/util.h +++ b/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