From: root <slw26c@gmail.com>
Date: Tue, 21 Jun 2016 22:31:29 +0000 (-0700)
Subject: Enhanced both reset and subsystem-reset to return an error message on older kernels... 
X-Git-Tag: v0.8~3^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=514b25c9950ace6b0b9b939c318b92c15ea8b6d8;p=users%2Fhch%2Fnvme-cli.git

Enhanced both reset and subsystem-reset to return an error message on older kernels with no ioctl support
Added "zeroes based" to the block count documentation for write-uncorr and write-zeroes
---

diff --git a/nvme.c b/nvme.c
index b6d967c..690a213 100644
--- a/nvme.c
+++ b/nvme.c
@@ -1277,14 +1277,26 @@ static void clear_args(int argc, char **argv)
 
 static int subsystem_reset(int argc, char **argv, struct command *cmd, struct plugin *plugin)
 {
+	int err;
 	clear_args(argc, argv);
-	return nvme_subsystem_reset(fd);
+	err = nvme_subsystem_reset(fd);
+	if (err < 0) {
+		perror("Subsystem-reset");
+		return errno;
+	}
+	return err;
 }
 
 static int reset(int argc, char **argv, struct command *cmd, struct plugin *plugin)
 {
+	int err;
 	clear_args(argc, argv);
-	return nvme_reset_controller(fd);
+	err = nvme_reset_controller(fd);
+	if (err < 0) {
+		perror("Reset");
+		return errno;
+	}
+	return err;
 }
 
 static void print_lo_hi_64(uint32_t *val)
@@ -1592,7 +1604,7 @@ static int write_uncor(int argc, char **argv, struct command *cmd, struct plugin
 			"range of logical blocks to invalid.";
 	const char *namespace_id = "desired namespace";
 	const char *start_block = "64-bit LBA of first block to access";
-	const char *block_count = "number of blocks on device to access";
+	const char *block_count = "number of blocks (zeroes based) on device to access";
 
 	struct config {
 		__u64 start_block;
@@ -1637,7 +1649,7 @@ static int write_zeroes(int argc, char **argv, struct command *cmd, struct plugi
 			"range of logical blocks to zero.";
 	const char *namespace_id = "desired namespace";
 	const char *start_block = "64-bit LBA of first block to access";
-	const char *block_count = "number of blocks on device to access";
+	const char *block_count = "number of blocks (zeroes based) on device to access";
 	const char *limited_retry = "limit media access attempts";
 	const char *force = "force device to commit data before command completes";
 	const char *prinfo = "PI and check field";