nvme: add status to error number for id_uuid and verify_cmd

Signed-off-by: Gollu Appalanaidu <anaidu.gollu@samsung.com>

diff --git a/nvme.c b/nvme.c
index a13d26dc1dc17f3923499fa5e472a4e13197df3b..53c07279b8ecc97e24fedb2a9737725b61535ebb 100644 (file)
--- a/nvme.c
+++ b/nvme.c
@@ -2348,9 +2348,9 @@ static int id_uuid(int argc, char **argv, struct command *cmd, struct plugin *pl
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts);
+       err = fd = parse_and_open(argc, argv, desc, opts);
        if (fd < 0)
-               return fd;
+               goto ret;
 
        err = flags = validate_output_format(cfg.output_format);
        if (flags < 0)
@@ -2369,7 +2369,8 @@ static int id_uuid(int argc, char **argv, struct command *cmd, struct plugin *pl
                perror("identify UUID list");
 close_fd:
        close(fd);
-       return err;
+ret:
+       return nvme_status_to_errno(err, false);;
 }
 
 static int id_iocs(int argc, char **argv, struct command *cmd, struct plugin *plugin)
@@ -5221,7 +5222,7 @@ static int verify_cmd(int argc, char **argv, struct command *cmd, struct plugin
 
        err = fd = parse_and_open(argc, argv, desc, opts);
        if (fd < 0)
-               goto err;
+               goto ret;
 
        if (cfg.prinfo > 0xf) {
                fprintf(stderr, "invalid 'prinfo' param:%u\n", cfg.prinfo);
@@ -5255,8 +5256,8 @@ static int verify_cmd(int argc, char **argv, struct command *cmd, struct plugin
 
 close_fd:
        close(fd);
-err:
-       return err;
+ret:
+       return nvme_status_to_errno(err, false);;
 }
 
 static int sec_recv(int argc, char **argv, struct command *cmd, struct plugin *plugin)