From afb124f7f2ac3272d0f79d72a149664d273eb5c5 Mon Sep 17 00:00:00 2001 From: Gollu Appalanaidu Date: Tue, 15 Jun 2021 00:53:20 +0530 Subject: [PATCH] nvme: add status to error number for id_uuid and verify_cmd Signed-off-by: Gollu Appalanaidu --- nvme.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/nvme.c b/nvme.c index 81d7db1c..c738a2e5 100644 --- a/nvme.c +++ b/nvme.c @@ -2346,9 +2346,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) @@ -2367,7 +2367,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) @@ -5325,7 +5326,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) { err = EINVAL; @@ -5357,8 +5358,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) -- 2.50.1