7 files changed, 21 insertions, 22 deletions

diff --git a/sbin/nvmecontrol/identify.c b/sbin/nvmecontrol/identify.c
index 7093de234453..f3c488281fcd 100644
--- a/sbin/nvmecontrol/identify.c
+++ b/sbin/nvmecontrol/identify.c
@@ -241,7 +241,7 @@ identify(const struct cmd *f, int argc, char *argv[])
 	if (arg_parse(argc, argv, f))
 		return;
 
-	open_dev(opt.dev, &fd, 1, 1);
+	open_dev(opt.dev, &fd, 0, 1);
 	get_nsid(fd, &path, &nsid);
 	if (nsid != 0) {
 		/*
@@ -251,7 +251,7 @@ identify(const struct cmd *f, int argc, char *argv[])
 		 * the IDENTIFY command itself.
 		 */
 		close(fd);
-		open_dev(path, &fd, 1, 1);
+		open_dev(path, &fd, 0, 1);
 	}
 	free(path);
 	if (opt.nsid != NONE)
diff --git a/sbin/nvmecontrol/logpage.c b/sbin/nvmecontrol/logpage.c
index 93a96f0f776f..2451822d058f 100644
--- a/sbin/nvmecontrol/logpage.c
+++ b/sbin/nvmecontrol/logpage.c
@@ -687,13 +687,13 @@ logpage(const struct cmd *f, int argc, char *argv[])
 		fprintf(stderr, "Missing page_id (-p).\n");
 		arg_help(argc, argv, f);
 	}
-	open_dev(opt.dev, &fd, 1, 1);
+	open_dev(opt.dev, &fd, 0, 1);
 	get_nsid(fd, &path, &nsid);
 	if (nsid == 0) {
 		nsid = NVME_GLOBAL_NAMESPACE_TAG;
 	} else {
 		close(fd);
-		open_dev(path, &fd, 1, 1);
+		open_dev(path, &fd, 0, 1);
 	}
 	free(path);
 
diff --git a/sbin/nvmecontrol/ns.c b/sbin/nvmecontrol/ns.c
index 8c6c9737fe47..cb629dc999bf 100644
--- a/sbin/nvmecontrol/ns.c
+++ b/sbin/nvmecontrol/ns.c
@@ -404,7 +404,7 @@ nsactive(const struct cmd *f, int argc, char *argv[])
 
 	if (arg_parse(argc, argv, f))
 		return;
-	open_dev(active_opt.dev, &fd, 1, 1);
+	open_dev(active_opt.dev, &fd, 0, 1);
 
 	memset(&pt, 0, sizeof(pt));
 	pt.cmd.opc = NVME_OPC_IDENTIFY;
@@ -435,7 +435,7 @@ nsallocated(const struct cmd *f, int argc, char *argv[])
 
 	if (arg_parse(argc, argv, f))
 		return;
-	open_dev(active_opt.dev, &fd, 1, 1);
+	open_dev(active_opt.dev, &fd, 0, 1);
 	read_controller_data(fd, &cd);
 
 	/* Check that controller can execute this command. */
@@ -472,7 +472,7 @@ nscontrollers(const struct cmd *f, int argc, char *argv[])
 
 	if (arg_parse(argc, argv, f))
 		return;
-	open_dev(controllers_opt.dev, &fd, 1, 1);
+	open_dev(controllers_opt.dev, &fd, 0, 1);
 	read_controller_data(fd, &cd);
 
 	/* Check that controller can execute this command. */
@@ -781,7 +781,7 @@ nsattached(const struct cmd *f, int argc, char *argv[])
 		fprintf(stderr, "No valid NSID specified\n");
 		arg_help(argc, argv, f);
 	}
-	open_dev(attached_opt.dev, &fd, 1, 1);
+	open_dev(attached_opt.dev, &fd, 0, 1);
 	read_controller_data(fd, &cd);
 
 	/* Check that controller can execute this command. */
@@ -825,7 +825,7 @@ nsidentify(const struct cmd *f, int argc, char *argv[])
 		fprintf(stderr, "No valid NSID specified\n");
 		arg_help(argc, argv, f);
 	}
-	open_dev(identify_opt.dev, &fd, 1, 1);
+	open_dev(identify_opt.dev, &fd, 0, 1);
 	read_controller_data(fd, &cd);
 
 	/* Check that controller can execute this command. */
diff --git a/sbin/nvmecontrol/nsid.c b/sbin/nvmecontrol/nsid.c
index 4f98863c5d9f..34671901b49c 100644
--- a/sbin/nvmecontrol/nsid.c
+++ b/sbin/nvmecontrol/nsid.c
@@ -73,7 +73,7 @@ gnsid(const struct cmd *f, int argc, char *argv[])
 	if (arg_parse(argc, argv, f))
 		return;
 
-	open_dev(nsid_opt.dev, &fd, 1, 1);
+	open_dev(nsid_opt.dev, &fd, 0, 1);
 	get_nsid(fd, &path, &nsid);
 	close(fd);
 	printf("%s\t%u\n", path, nsid);
diff --git a/sbin/nvmecontrol/nvmecontrol.c b/sbin/nvmecontrol/nvmecontrol.c
index 91e42de0266a..03c026858ba1 100644
--- a/sbin/nvmecontrol/nvmecontrol.c
+++ b/sbin/nvmecontrol/nvmecontrol.c
@@ -142,18 +142,17 @@ read_namespace_data(int fd, uint32_t nsid, struct nvme_namespace_data *nsdata)
 }
 
 int
-open_dev(const char *str, int *fd, int show_error, int exit_on_error)
+open_dev(const char *str, int *fd, int write, int exit_on_error)
 {
 	char		full_path[64];
 
 	snprintf(full_path, sizeof(full_path), _PATH_DEV"%s", str);
-	*fd = open(full_path, O_RDWR);
+	*fd = open(full_path, write ? O_RDWR : O_RDONLY);
 	if (*fd < 0) {
-		if (show_error)
-			warn("could not open %s", full_path);
-		if (exit_on_error)
-			exit(1);
-		else
+		if (exit_on_error) {
+			err(1, "could not open %s%s", full_path,
+			    write ? " for write" : "");
+		} else
 			return (errno);
 	}
 
diff --git a/sbin/nvmecontrol/nvmecontrol.h b/sbin/nvmecontrol/nvmecontrol.h
index f5dc61f27b00..67fcac94b82c 100644
--- a/sbin/nvmecontrol/nvmecontrol.h
+++ b/sbin/nvmecontrol/nvmecontrol.h
@@ -68,7 +68,7 @@ void logpage_register(struct logpage_function *p);
 #define NVME_CTRLR_PREFIX	"nvme"
 #define NVME_NS_PREFIX		"ns"
 
-int open_dev(const char *str, int *fd, int show_error, int exit_on_error);
+int open_dev(const char *str, int *fd, int write, int exit_on_error);
 void get_nsid(int fd, char **ctrlr_str, uint32_t *nsid);
 void read_controller_data(int fd, struct nvme_controller_data *cdata);
 void read_namespace_data(int fd, uint32_t nsid, struct nvme_namespace_data *nsdata);
diff --git a/sbin/nvmecontrol/resv.c b/sbin/nvmecontrol/resv.c
index 1121a0d777da..1acd9ac405e3 100644
--- a/sbin/nvmecontrol/resv.c
+++ b/sbin/nvmecontrol/resv.c
@@ -242,7 +242,7 @@ resvacquire(const struct cmd *f, int argc, char *argv[])
 
 	if (arg_parse(argc, argv, f))
 		return;
-	open_dev(acquire_opt.dev, &fd, 1, 1);
+	open_dev(acquire_opt.dev, &fd, 0, 1);
 	get_nsid(fd, NULL, &nsid);
 	if (nsid == 0) {
 		fprintf(stderr, "This command require namespace-id\n");
@@ -280,7 +280,7 @@ resvregister(const struct cmd *f, int argc, char *argv[])
 
 	if (arg_parse(argc, argv, f))
 		return;
-	open_dev(register_opt.dev, &fd, 1, 1);
+	open_dev(register_opt.dev, &fd, 0, 1);
 	get_nsid(fd, NULL, &nsid);
 	if (nsid == 0) {
 		fprintf(stderr, "This command require namespace-id\n");
@@ -318,7 +318,7 @@ resvrelease(const struct cmd *f, int argc, char *argv[])
 
 	if (arg_parse(argc, argv, f))
 		return;
-	open_dev(release_opt.dev, &fd, 1, 1);
+	open_dev(release_opt.dev, &fd, 0, 1);
 	get_nsid(fd, NULL, &nsid);
 	if (nsid == 0) {
 		fprintf(stderr, "This command require namespace-id\n");
@@ -358,7 +358,7 @@ resvreport(const struct cmd *f, int argc, char *argv[])
 
 	if (arg_parse(argc, argv, f))
 		return;
-	open_dev(report_opt.dev, &fd, 1, 1);
+	open_dev(report_opt.dev, &fd, 0, 1);
 	get_nsid(fd, NULL, &nsid);
 	if (nsid == 0) {
 		fprintf(stderr, "This command require namespace-id\n");