[PATCH] Make ->buflen == 0 on SYNC io_u's

[fio.git] / engines / fio-engine-sync.c

diff --git a/engines/fio-engine-sync.c b/engines/fio-engine-sync.c
index abc29f40f9a27a613c43127aec31372ffad634b5..43f42ca2ffcace7068656a0ebd4453453af69d7b 100644 (file)
--- a/engines/fio-engine-sync.c
+++ b/engines/fio-engine-sync.c
@@ -14,11 +14,6 @@ struct syncio_data {
        struct io_u *last_io_u;
 };
 
-static int fio_syncio_sync(struct thread_data *td)
-{
-       return fsync(td->fd);
-}
-
 static int fio_syncio_getevents(struct thread_data *td, int fio_unused min,
                                int max, struct timespec fio_unused *t)
 {
@@ -45,7 +40,12 @@ static struct io_u *fio_syncio_event(struct thread_data *td, int event)
 
 static int fio_syncio_prep(struct thread_data *td, struct io_u *io_u)
 {
-       if (lseek(td->fd, io_u->offset, SEEK_SET) == -1) {
+       struct fio_file *f = io_u->file;
+
+       if (io_u->ddir == DDIR_SYNC)
+               return 0;
+
+       if (lseek(f->fd, io_u->offset, SEEK_SET) == -1) {
                td_verror(td, errno);
                return 1;
        }
@@ -56,14 +56,17 @@ static int fio_syncio_prep(struct thread_data *td, struct io_u *io_u)
 static int fio_syncio_queue(struct thread_data *td, struct io_u *io_u)
 {
        struct syncio_data *sd = td->io_ops->data;
-       int ret;
+       struct fio_file *f = io_u->file;
+       unsigned int ret;
 
        if (io_u->ddir == DDIR_READ)
-               ret = read(td->fd, io_u->buf, io_u->buflen);
+               ret = read(f->fd, io_u->buf, io_u->buflen);
+       else if (io_u->ddir == DDIR_WRITE)
+               ret = write(f->fd, io_u->buf, io_u->buflen);
        else
-               ret = write(td->fd, io_u->buf, io_u->buflen);
+               ret = fsync(f->fd);
 
-       if ((unsigned int) ret != io_u->buflen) {
+       if (ret != io_u->buflen) {
                if (ret > 0) {
                        io_u->resid = io_u->buflen - ret;
                        io_u->error = EIO;
@@ -103,6 +106,5 @@ struct ioengine_ops ioengine = {
        .getevents      = fio_syncio_getevents,
        .event          = fio_syncio_event,
        .cleanup        = fio_syncio_cleanup,
-       .sync           = fio_syncio_sync,
        .flags          = FIO_SYNCIO,
 };