From: Maurizio Lombardi <mlombard@redhat.com>
Date: Tue, 8 Nov 2022 14:28:51 +0000 (+0100)
Subject: nvme: fix unreacheable code in verify_cmd()
X-Git-Tag: v2.3~44
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=3bc7a50707205dd8f6bdc9834fd3d958c11f3eb5;p=users%2Fsagi%2Fnvme-cli.git

nvme: fix unreacheable code in verify_cmd()

the "if (err < 0)" condition should be checked before "if (err)",
otherwise it would be never caught.

Signed-off-by: Maurizio Lombardi <mlombard@redhat.com>
---

diff --git a/nvme.c b/nvme.c
index d1e517c4..74970649 100644
--- a/nvme.c
+++ b/nvme.c
@@ -5723,12 +5723,12 @@ static int write_zeroes(int argc, char **argv, struct command *cmd, struct plugi
 	}
 
 	err = nvme_cli_identify_ns(dev, cfg.namespace_id, &ns);
-	if (err) {
-		nvme_show_status(err);
-		goto close_dev;
-	} else if (err < 0) {
+	if (err < 0) {
 		fprintf(stderr, "identify namespace: %s\n", nvme_strerror(errno));
 		goto close_dev;
+	} else if (err) {
+		nvme_show_status(err);
+		goto close_dev;
 	}
 
 	err = nvme_identify_ns_csi(dev_fd(dev), cfg.namespace_id, 0,
@@ -6955,12 +6955,12 @@ static int verify_cmd(int argc, char **argv, struct command *cmd, struct plugin
 	}
 
 	err = nvme_cli_identify_ns(dev, cfg.namespace_id, &ns);
-	if (err) {
-		nvme_show_status(err);
-		goto close_dev;
-	} else if (err < 0) {
+	if (err < 0) {
 		fprintf(stderr, "identify namespace: %s\n", nvme_strerror(errno));
 		goto close_dev;
+	} else if (err) {
+		nvme_show_status(err);
+		goto close_dev;
 	}
 
 	err = nvme_identify_ns_csi(dev_fd(dev), cfg.namespace_id, 0,