nvme: check errno not return value

Unfortunately, libnvme follows the POSIX way to return errors. This
means the return value is not containing the error code, it is in
errno.

While at it, also print the returned value only when debug mode
is enabled.

Signed-off-by: Daniel Wagner <[email protected]>

Author: igaw

fabrics.c

@@ -179,12 +179,15 @@ static int nvme_add_ctrl(nvme_host_t h, nvme_ctrl_t c,
 
 retry:
 	ret = nvmf_add_ctrl(h, c, cfg);
-	if (ret == EAGAIN || (ret == EINTR && !nvme_sigint_received)) {
-		printf("nvmf_add_ctrl returned '%s'\n", strerror(ret));
+	if (!ret)
+		return 0;
+
+	if (errno == EAGAIN || (errno == EINTR && !nvme_sigint_received)) {
+		print_debug("nvmf_add_ctrl returned '%s'\n", strerror(errno));
 		goto retry;
 	}
 
-	return ret;
+	return -errno;
 }
 
 static nvme_ctrl_t __create_discover_ctrl(nvme_root_t r, nvme_host_t h,

util/logging.c

@@ -116,8 +116,9 @@ int nvme_submit_passthru(int fd, unsigned long ioctl_cmd,
 	if (!dry_run) {
 retry:
 		err = ioctl(fd, ioctl_cmd, cmd);
-		if (err == EAGAIN || (err == EINTR && !nvme_sigint_received)) {
-			nvme_log_retry(err);
+		if (err && (errno == EAGAIN ||
+			    (errno == EINTR && !nvme_sigint_received))) {
+			nvme_log_retry(errno);
 			goto retry;
 		}
 	}
@@ -148,8 +149,9 @@ int nvme_submit_passthru64(int fd, unsigned long ioctl_cmd,
 	if (!dry_run) {
 retry:
 		err = ioctl(fd, ioctl_cmd, cmd);
-		if (err == EAGAIN || (err == EINTR && !nvme_sigint_received)) {
-			nvme_log_retry(err);
+		if (err && (errno == EAGAIN ||
+			    (errno == EINTR && !nvme_sigint_received))) {
+			nvme_log_retry(errno);
 			goto retry;
 		}
 	}