nvme zns: close device fd in id_ctrl() func

closed fd in id_ctrl() function.
added le32_to_cpu conversion to frl and rrl fields in print functions.

Signed-off-by: Aravind Ramesh <Aravind.Ramesh@wdc.com>

diff --git a/nvme-print.c b/nvme-print.c
index 2ca41f1983ba79405b5d886635c6de8f36713e2c..d7c33f9551caef7b32f2af3e16892333a7856ce7 100644 (file)
--- a/nvme-print.c
+++ b/nvme-print.c
@@ -2920,8 +2920,8 @@ void json_nvme_zns_id_ns(struct nvme_zns_id_ns *ns,
        json_object_add_value_int(root, "ozcs", le16_to_cpu(ns->ozcs));
        json_object_add_value_int(root, "mar", le16_to_cpu(ns->mar));
        json_object_add_value_int(root, "mor", le16_to_cpu(ns->mor));
-       json_object_add_value_int(root, "rrl", ns->rrl);
-       json_object_add_value_int(root, "frl", ns->frl);
+       json_object_add_value_int(root, "rrl", le32_to_cpu(ns->rrl));
+       json_object_add_value_int(root, "frl", le32_to_cpu(ns->frl));
 
        lbafs = json_create_array();
        json_object_add_value_array(root, "lbafe", lbafs);
@@ -2989,8 +2989,8 @@ void nvme_show_zns_id_ns(struct nvme_zns_id_ns *ns,
                show_nvme_id_ns_zoned_ozcs(ns->ozcs);
        printf("mar     : %u\n", le16_to_cpu(ns->mar));
        printf("mor     : %u\n", le16_to_cpu(ns->mor));
-       printf("rrl     : %u\n", ns->rrl);
-       printf("frl     : %u\n", ns->frl);
+       printf("rrl     : %u\n", le32_to_cpu(ns->rrl));
+       printf("frl     : %u\n", le32_to_cpu(ns->frl));
 
        for (i = 0; i <= id_ns->nlbaf; i++){
                if (human)

diff --git a/plugins/zns/zns.c b/plugins/zns/zns.c
index dbe9ad7cb5ba775ed31a1d7a6ab8ad746120079e..2c682aa167ce5219409dab6e66a869d511180446 100644 (file)
--- a/plugins/zns/zns.c
+++ b/plugins/zns/zns.c
@@ -14,7 +14,7 @@
 #define CREATE_CMD
 #include "zns.h"
 
-static const char *namespace_id = "Namespace identify to use";
+static const char *namespace_id = "Namespace identifier to use";
 
 static int id_ctrl(int argc, char **argv, struct command *cmd, struct plugin *plugin)
 {
@@ -161,13 +161,13 @@ static int zns_mgmt_send(int argc, char **argv, struct command *cmd, struct plug
                OPT_END()
        };
 
-       err = asprintf(&command, "%s-%s", plugin->name, cmd->name);
-       if (err < 0)
-               return errno;
-
        err = fd = parse_and_open(argc, argv, desc, opts);
        if (fd < 0)
-               goto free;
+               return errno;
+
+       err = asprintf(&command, "%s-%s", plugin->name, cmd->name);
+       if (err < 0)
+               goto close_fd;
 
        if (!cfg.namespace_id) {
                err = cfg.namespace_id = nvme_get_nsid(fd);
@@ -186,6 +186,8 @@ static int zns_mgmt_send(int argc, char **argv, struct command *cmd, struct plug
                nvme_show_status(err);
 free:
        free(command);
+close_fd:
+       close(fd);
        return err;
 }