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

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

diff --git a/engines/fio-engine-splice.c b/engines/fio-engine-splice.c
index 30984f16e2385e980667409ca5d6e9af54a4b7a6..192fbd00bffdf14184a249e481dbfc95ab4e7f07 100644 (file)
--- a/engines/fio-engine-splice.c
+++ b/engines/fio-engine-splice.c
@@ -16,11 +16,6 @@ struct spliceio_data {
        int pipe[2];
 };
 
-static int fio_spliceio_sync(struct thread_data *td)
-{
-       return fsync(td->fd);
-}
-
 static int fio_spliceio_getevents(struct thread_data *td, int fio_unused min,
                                  int max, struct timespec fio_unused *t)
 {
@@ -53,6 +48,7 @@ static struct io_u *fio_spliceio_event(struct thread_data *td, int event)
 static int fio_splice_read(struct thread_data *td, struct io_u *io_u)
 {
        struct spliceio_data *sd = td->io_ops->data;
+       struct fio_file *f = io_u->file;
        int ret, ret2, buflen;
        off_t offset;
        void *p;
@@ -66,7 +62,7 @@ static int fio_splice_read(struct thread_data *td, struct io_u *io_u)
                if (this_len > SPLICE_DEF_SIZE)
                        this_len = SPLICE_DEF_SIZE;
 
-               ret = splice(td->fd, &offset, sd->pipe[1], NULL, this_len, SPLICE_F_MORE);
+               ret = splice(f->fd, &offset, sd->pipe[1], NULL, this_len, SPLICE_F_MORE);
                if (ret < 0) {
                        if (errno == ENODATA || errno == EAGAIN)
                                continue;
@@ -103,6 +99,7 @@ static int fio_splice_write(struct thread_data *td, struct io_u *io_u)
                }
        };
        struct pollfd pfd = { .fd = sd->pipe[1], .events = POLLOUT, };
+       struct fio_file *f = io_u->file;
        off_t off = io_u->offset;
        int ret, ret2;
 
@@ -118,7 +115,7 @@ static int fio_splice_write(struct thread_data *td, struct io_u *io_u)
                iov[0].iov_base += ret;
 
                while (ret) {
-                       ret2 = splice(sd->pipe[0], NULL, td->fd, &off, ret, 0);
+                       ret2 = splice(sd->pipe[0], NULL, f->fd, &off, ret, 0);
                        if (ret2 < 0)
                                return errno;
 
@@ -132,14 +129,16 @@ static int fio_splice_write(struct thread_data *td, struct io_u *io_u)
 static int fio_spliceio_queue(struct thread_data *td, struct io_u *io_u)
 {
        struct spliceio_data *sd = td->io_ops->data;
-       int ret;
+       unsigned int ret;
 
        if (io_u->ddir == DDIR_READ)
                ret = fio_splice_read(td, io_u);
-       else
+       else if (io_u->ddir == DDIR_WRITE)
                ret = fio_splice_write(td, io_u);
+       else
+               ret = fsync(io_u->file->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 = ENODATA;
@@ -188,6 +187,5 @@ struct ioengine_ops ioengine = {
        .getevents      = fio_spliceio_getevents,
        .event          = fio_spliceio_event,
        .cleanup        = fio_spliceio_cleanup,
-       .sync           = fio_spliceio_sync,
        .flags          = FIO_SYNCIO,
 };