Permalink
Browse files

MFC r253436, r253458:

  Simplify open_dev() by returning errno values rather than just 0 or 1.

  Also remove stat() call and just rely on errno from open() call to discern
  whether dev node exists or not.

Approved by:	re (kib)
Sponsored by:	Intel
  • Loading branch information...
1 parent 7ee507b commit f343e955ead74576f397f61c6cf400084e2292c4 @jimharris jimharris committed Jul 24, 2013
Showing with 4 additions and 13 deletions.
  1. +2 −1 sbin/nvmecontrol/devlist.c
  2. +2 −12 sbin/nvmecontrol/nvmecontrol.c
@@ -30,6 +30,7 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <err.h>
+#include <errno.h>
#include <fcntl.h>
#include <stddef.h>
#include <stdio.h>
@@ -80,7 +81,7 @@ devlist(int argc, char *argv[])
ret = open_dev(name, &fd, 0, 0);
if (ret != 0) {
- if (fd < 0) {
+ if (ret == EACCES) {
warnx("could not open /dev/%s\n", name);
continue;
} else
@@ -163,7 +163,6 @@ read_namespace_data(int fd, int nsid, struct nvme_namespace_data *nsdata)
int
open_dev(const char *str, int *fd, int show_error, int exit_on_error)
{
- struct stat devstat;
char full_path[64];
if (!strnstr(str, NVME_CTRLR_PREFIX, strlen(NVME_CTRLR_PREFIX))) {
@@ -173,27 +172,18 @@ open_dev(const char *str, int *fd, int show_error, int exit_on_error)
if (exit_on_error)
exit(1);
else
- return (1);
+ return (EINVAL);
}
snprintf(full_path, sizeof(full_path), "/dev/%s", str);
- if (stat(full_path, &devstat) != 0) {
- if (show_error)
- warn("could not stat %s", full_path);
- if (exit_on_error)
- exit(1);
- else
- return (1);
- }
-
*fd = open(full_path, O_RDWR);
if (*fd < 0) {
if (show_error)
warn("could not open %s", full_path);
if (exit_on_error)
exit(1);
else
- return (1);
+ return (errno);
}
return (0);

0 comments on commit f343e95

Please sign in to comment.