X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=engines%2Fsg.c;h=d7c0a6d5dc9a69a9774fb667ddcfcf6e1edccdcc;hb=556e831d2b6e788fd48f724047d22ebb29676d42;hp=3462688a8d5295980bb6204c56f77581825989ea;hpb=15ba640a7a17e8efb1b6d73a8edf0ed18d25431b;p=fio.git

diff --git a/engines/sg.c b/engines/sg.c
index 3462688a..d7c0a6d5 100644
--- a/engines/sg.c
+++ b/engines/sg.c
@@ -12,7 +12,6 @@
 #include <sys/poll.h>
 
 #include "../fio.h"
-#include "../os.h"
 
 #ifdef FIO_HAVE_SGIO
 
@@ -62,18 +61,14 @@ static int pollin_events(struct pollfd *pfds, int fds)
 	return 0;
 }
 
-static int fio_sgio_getevents(struct thread_data *td, int min, int max,
-			      struct timespec fio_unused *t)
+static int fio_sgio_getevents(struct thread_data *td, unsigned int min,
+			      unsigned int max, struct timespec fio_unused *t)
 {
-	/*
-	 * normally hard coding &td->files[0] is a bug that needs to be fixed,
-	 * but it's ok here as all files should point to the same device.
-	 */
-	struct fio_file *f = &td->files[0];
 	struct sgio_data *sd = td->io_ops->data;
 	int left = max, ret, r = 0;
 	void *buf = sd->sgbuf;
 	unsigned int i, events;
+	struct fio_file *f;
 
 	/*
 	 * Fill in the file descriptors
@@ -247,6 +242,8 @@ static int fio_sgio_queue(struct thread_data *td, struct io_u *io_u)
 	struct sg_io_hdr *hdr = &io_u->hdr;
 	int ret;
 
+	fio_ro_check(td, io_u);
+
 	ret = fio_sgio_doio(td, io_u, io_u->ddir == DDIR_SYNC);
 
 	if (ret < 0)
@@ -280,7 +277,7 @@ static int fio_sgio_get_bs(struct thread_data *td, unsigned int *bs)
 	int ret;
 
 	io_u = __get_io_u(td);
-	io_u->file = &td->files[0];
+	io_u->file = td->files[0];
 	assert(io_u);
 
 	hdr = &io_u->hdr;
@@ -314,8 +311,6 @@ static void fio_sgio_cleanup(struct thread_data *td)
 		free(sd->pfds);
 		free(sd->sgbuf);
 		free(sd);
-
-		td->io_ops->data = NULL;
 	}
 }
 
@@ -367,7 +362,7 @@ static int fio_sgio_type_check(struct thread_data *td, struct fio_file *f)
 		if (ret)
 			return 1;
 	} else {
-		log_err("ioengine sgio only works on block devices\n");
+		log_err("ioengine sg only works on block devices\n");
 		return 1;
 	}
 
@@ -391,7 +386,7 @@ static int fio_sgio_open(struct thread_data *td, struct fio_file *f)
 		return ret;
 
 	if (sd && !sd->type_checked && fio_sgio_type_check(td, f)) {
-		generic_close_file(td, f);
+		ret = generic_close_file(td, f);
 		return 1;
 	}
 
@@ -421,12 +416,12 @@ static struct ioengine_ops ioengine = {
  */
 static int fio_sgio_init(struct thread_data fio_unused *td)
 {
-	fprintf(stderr, "fio: sgio not available\n");
+	fprintf(stderr, "fio: ioengine sg not available\n");
 	return 1;
 }
 
 static struct ioengine_ops ioengine = {
-	.name		= "sgio",
+	.name		= "sg",
 	.version	= FIO_IOOPS_VERSION,
 	.init		= fio_sgio_init,
 };