X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;ds=sidebyside;f=engines%2Flibaio.c;h=bd8ebb8b65553fe1c8067815811b8a9393b788dc;hb=a1c58075279454a91ec43366846b93e8dcf9753c;hp=99170b5394f6952060626b1f55d4ed8db85e29a5;hpb=15d182aa276b2ef60aec0b8b3c55b6a0806ca7ed;p=fio.git

diff --git a/engines/libaio.c b/engines/libaio.c
index 99170b53..bd8ebb8b 100644
--- a/engines/libaio.c
+++ b/engines/libaio.c
@@ -32,7 +32,7 @@ static int fio_libaio_prep(struct thread_data fio_unused *td, struct io_u *io_u)
 		io_prep_pread(&io_u->iocb, f->fd, io_u->xfer_buf, io_u->xfer_buflen, io_u->offset);
 	else if (io_u->ddir == DDIR_WRITE)
 		io_prep_pwrite(&io_u->iocb, 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_prep_fsync(&io_u->iocb, f->fd);
 	else
 		return 1;
@@ -64,11 +64,11 @@ static int fio_libaio_getevents(struct thread_data *td, unsigned int min,
 				unsigned int max, struct timespec *t)
 {
 	struct libaio_data *ld = td->io_ops->data;
-	long r;
+	int r;
 
 	do {
 		r = io_getevents(ld->aio_ctx, min, max, ld->aio_events, t);
-		if (r >= min)
+		if (r >= (int) min)
 			break;
 		else if (r == -EAGAIN) {
 			usleep(100);
@@ -103,6 +103,13 @@ static int fio_libaio_queue(struct thread_data *td, struct io_u *io_u)
 		if (fsync(io_u->file->fd) < 0)
 			io_u->error = errno;
 
+		return FIO_Q_COMPLETED;
+	} else if (io_u->ddir == DDIR_DATASYNC) {
+		if (ld->iocbs_nr)
+			return FIO_Q_BUSY;
+		if (fdatasync(io_u->file->fd) < 0)
+			io_u->error = errno;
+
 		return FIO_Q_COMPLETED;
 	}
 
@@ -223,6 +230,7 @@ static struct ioengine_ops ioengine = {
 	.cleanup	= fio_libaio_cleanup,
 	.open_file	= generic_open_file,
 	.close_file	= generic_close_file,
+	.get_file_size	= generic_get_file_size,
 };
 
 #else /* FIO_HAVE_LIBAIO */