X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=engines%2Fsg.c;h=f955c20a74ca770f3a69b6d06361e0ca0cb3c485;hp=27139760ba5bd14354c0e8a6e8c5bec666938463;hb=22819ec237297fc39435ed566bee01a4225bfb39;hpb=3af6ef399a9df324ffe4a8c8e03b52a42f587229;ds=sidebyside

diff --git a/engines/sg.c b/engines/sg.c
index 27139760..f955c20a 100644
--- a/engines/sg.c
+++ b/engines/sg.c
@@ -95,9 +95,9 @@ static int fio_sgio_getevents(struct thread_data *td, int min, int max,
 
 			ret = poll(sd->pfds, td->nr_files, -1);
 			if (ret < 0) {
-				td_verror(td, errno);
 				if (!r)
-					r = -1;
+					r = -errno;
+				td_verror(td, errno);
 				break;
 			} else if (!ret)
 				continue;
@@ -117,8 +117,8 @@ re_read:
 			if (ret < 0) {
 				if (errno == EAGAIN)
 					continue;
+				r = -errno;
 				td_verror(td, errno);
-				r = -1;
 				break;
 			} else if (ret) {
 				p += ret;
@@ -162,7 +162,7 @@ static int fio_sgio_ioctl_doio(struct thread_data *td,
 
 	ret = ioctl(f->fd, SG_IO, hdr);
 	if (ret < 0)
-		return ret;
+		return -errno;
 
 	return FIO_Q_COMPLETED;
 }
@@ -179,7 +179,7 @@ static int fio_sgio_rw_doio(struct fio_file *f, struct io_u *io_u, int sync)
 	if (sync) {
 		ret = read(f->fd, hdr, sizeof(*hdr));
 		if (ret < 0)
-			return errno;
+			return -errno;
 		return FIO_Q_COMPLETED;
 	}