From: Gollu Appalanaidu Date: Thu, 17 Jun 2021 17:39:58 +0000 (+0530) Subject: nvme: add missing endianness annotations X-Git-Tag: v2.0-rc0~53^2~57 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=ce734385475fabb392485b746cdc53b6f31e241d;p=users%2Fsagi%2Fnvme-cli.git nvme: add missing endianness annotations Signed-off-by: Gollu Appalanaidu [dwagner: dropped libnvme changes] Signed-off-by: Daniel Wagner --- diff --git a/fabrics.c b/fabrics.c index 012bcb88..224c317f 100644 --- a/fabrics.c +++ b/fabrics.c @@ -141,7 +141,7 @@ static void print_discovery_log(struct nvmf_discovery_log *log, int numrec) printf("rdma_cms: %s\n", nvmf_cms_str(e->tsas.rdma.cms)); printf("rdma_pkey: 0x%04x\n", - e->tsas.rdma.pkey); + le16_to_cpu(e->tsas.rdma.pkey)); break; case NVMF_TRTYPE_TCP: printf("sectype: %s\n", @@ -189,7 +189,7 @@ static void json_discovery_log(struct nvmf_discovery_log *log, int numrec) json_object_add_value_string(entry, "rdma_cms", nvmf_cms_str(e->tsas.rdma.cms)); json_object_add_value_uint(entry, "rdma_pkey", - e->tsas.rdma.pkey); + le16_to_cpu(e->tsas.rdma.pkey)); break; case NVMF_TRTYPE_TCP: json_object_add_value_string(entry, "sectype", diff --git a/nvme-print.c b/nvme-print.c index 9d9e99d7..19907949 100644 --- a/nvme-print.c +++ b/nvme-print.c @@ -3875,8 +3875,8 @@ static void json_nvme_id_ctrl_nvm(struct nvme_id_ctrl_nvm *ctrl_nvm) json_object_add_value_uint(root, "wzsl", ctrl_nvm->wzsl); json_object_add_value_uint(root, "wusl", ctrl_nvm->wusl); json_object_add_value_uint(root, "dmrl", ctrl_nvm->dmrl); - json_object_add_value_uint(root, "dmrsl", ctrl_nvm->dmrsl); - json_object_add_value_uint(root, "dmsl", ctrl_nvm->dmsl); + json_object_add_value_uint(root, "dmrsl", le32_to_cpu(ctrl_nvm->dmrsl)); + json_object_add_value_uint(root, "dmsl", le64_to_cpu(ctrl_nvm->dmsl)); json_print_object(root, NULL); printf("\n"); @@ -5718,8 +5718,8 @@ void nvme_show_lba_status(struct nvme_lba_status *list, unsigned long len, if (flags & BINARY) return d_raw((unsigned char *)list, len); - printf("Number of LBA Status Descriptors(NLSD): %" PRIu64 "\n", - le64_to_cpu(list->nlsd)); + printf("Number of LBA Status Descriptors(NLSD): %" PRIu32 "\n", + le32_to_cpu(list->nlsd)); printf("Completion Condition(CMPC): %u\n", list->cmpc); switch (list->cmpc) {