X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=engines%2Fguasi.c;h=c9c742959902793f34e98f94acb9b61be7a7bb86;hp=3802f2c21e4ea4ff9a6db588a41df60e4ee36087;hb=0ac5d398d9343ffba60821924fe0c386aee545b4;hpb=9d7dfdaef1ed5f6227fd31117d310ac15ae63152

diff --git a/engines/guasi.c b/engines/guasi.c
index 3802f2c2..c9c74295 100644
--- a/engines/guasi.c
+++ b/engines/guasi.c
@@ -3,12 +3,7 @@
  *
  * IO engine using the GUASI library.
  *
- * This is currently disabled. To enable it, execute:
- *
- * $ export EXTFLAGS="-DFIO_HAVE_GUASI"
- * $ export EXTLIBS="-lguasi"
- *
- * before running make. You'll need the GUASI lib as well:
+ * Before running make. You'll need the GUASI lib as well:
  *
  * http://www.xmailserver.org/guasi-lib.html
  *
@@ -21,8 +16,6 @@
 
 #include "../fio.h"
 
-#ifdef FIO_HAVE_GUASI
-
 #define GFIO_MIN_THREADS 32
 #ifndef GFIO_MAX_THREADS
 #define GFIO_MAX_THREADS 2000
@@ -174,7 +167,7 @@ static int fio_guasi_commit(struct thread_data *td)
 			io_u->greq = guasi__pwrite(ld->hctx, ld, io_u, 0,
 						   f->fd, io_u->xfer_buf, io_u->xfer_buflen,
 						   io_u->offset);
-		else if (io_u->ddir == DDIR_SYNC)
+		else if (ddir_sync(io_u->ddir))
 			io_u->greq = guasi__fsync(ld->hctx, ld, io_u, 0, f->fd);
 		else {
 			log_err("fio_guasi_commit() FAILED: unknow request %d\n",
@@ -264,27 +257,6 @@ static struct ioengine_ops ioengine = {
 	.get_file_size	= generic_get_file_size,
 };
 
-#else /* FIO_HAVE_GUASI */
-
-/*
- * When we have a proper configure system in place, we simply wont build
- * and install this io engine. For now install a crippled version that
- * just complains and fails to load.
- */
-static int fio_guasi_init(struct thread_data fio_unused *td)
-{
-	fprintf(stderr, "fio: guasi not available\n");
-	return 1;
-}
-
-static struct ioengine_ops ioengine = {
-	.name		= "guasi",
-	.version	= FIO_IOOPS_VERSION,
-	.init		= fio_guasi_init,
-};
-
-#endif
-
 static void fio_init fio_guasi_register(void)
 {
 	register_ioengine(&ioengine);