nvme-print-stdout: add descriptions for nsze, ncap & nuse

Add descriptions for the nsze, ncap & nuse fields in the verbose
output of the id-ns command for better clarity. For e.g.

nvme id-ns /dev/nvme1n1 -v
dev: /dev/nvme1n1, fd: 3
NVME Identify Namespace 1:
nsze    : 0x280000      Total size in logical blocks
ncap    : 0x280000      Maximum size in logical blocks
nuse    : 0x13b3e       Current size in logical blocks
...

Signed-off-by: Martin George <marting@netapp.com>

diff --git a/nvme-print-stdout.c b/nvme-print-stdout.c
index 9faf8466a89ef28b9258f98c3c484371b753b96a..5c0eee9dfaa77e4a845ce08bb933a76f72664605 100644 (file)
--- a/nvme-print-stdout.c
+++ b/nvme-print-stdout.c
@@ -2545,6 +2545,16 @@ static void stdout_id_ctrl_ofcs(__le16 ofcs)
 
 }
 
+static void stdout_id_ns_size(uint64_t nsze, uint64_t ncap, uint64_t nuse)
+{
+       printf("nsze    : %#"PRIx64"\tTotal size in logical blocks\n",
+                       le64_to_cpu(nsze));
+       printf("ncap    : %#"PRIx64"\tMaximum size in logical blocks\n",
+                       le64_to_cpu(ncap));
+       printf("nuse    : %#"PRIx64"\tCurrent size in logical blocks\n",
+                       le64_to_cpu(nuse));
+}
+
 static void stdout_id_ns_nsfeat(__u8 nsfeat)
 {
        __u8 optrperf = (nsfeat & 0x80) >> 7;
@@ -2764,9 +2774,15 @@ static void stdout_id_ns(struct nvme_id_ns *ns, unsigned int nsid,
 
        if (!cap_only) {
                printf("NVME Identify Namespace %d:\n", nsid);
-               printf("nsze    : %#"PRIx64"\n", le64_to_cpu(ns->nsze));
-               printf("ncap    : %#"PRIx64"\n", le64_to_cpu(ns->ncap));
-               printf("nuse    : %#"PRIx64"\n", le64_to_cpu(ns->nuse));
+
+               if (human)
+                       stdout_id_ns_size(ns->nsze, ns->ncap, ns->nuse);
+               else {
+                       printf("nsze    : %#"PRIx64"\n", le64_to_cpu(ns->nsze));
+                       printf("ncap    : %#"PRIx64"\n", le64_to_cpu(ns->ncap));
+                       printf("nuse    : %#"PRIx64"\n", le64_to_cpu(ns->nuse));
+               }
+
                printf("nsfeat  : %#x\n", ns->nsfeat);
                if (human)
                        stdout_id_ns_nsfeat(ns->nsfeat);