nvme: add missing endianness annotations

Signed-off-by: Gollu Appalanaidu <anaidu.gollu@samsung.com>
[dwagner: dropped libnvme changes]
Signed-off-by: Daniel Wagner <dwagner@suse.de>

diff --git a/fabrics.c b/fabrics.c
index 012bcb8819e0d7fa57726415751d13d21682bd0b..224c317f828e8f35872c880e724515609d4ea494 100644 (file)
--- 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 9d9e99d7402276ca6fc8d5da132351a026d302ba..199079490700dd8ebd28050e25bc37b6140376e3 100644 (file)
--- 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) {