engines/io_uring: ensure sqe stores are ordered SQ ring tail update

[fio.git] / engines / splice.c

diff --git a/engines/splice.c b/engines/splice.c
index eba093e810ea72934773f08292345799eb5e0e3b..feb764feb2f4f4766275dd53e938cab1ce3e5292 100644 (file)
--- a/engines/splice.c
+++ b/engines/splice.c
@@ -9,8 +9,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <errno.h>
-#include <assert.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <sys/mman.h>
 
 #include "../fio.h"
@@ -32,7 +31,7 @@ static int fio_splice_read_old(struct thread_data *td, struct io_u *io_u)
        struct fio_file *f = io_u->file;
        int ret, ret2, buflen;
        off_t offset;
-       void *p;
+       char *p;
 
        offset = io_u->offset;
        buflen = io_u->xfer_buflen;
@@ -77,7 +76,8 @@ static int fio_splice_read(struct thread_data *td, struct io_u *io_u)
        struct iovec iov;
        int ret , buflen, mmap_len;
        off_t offset;
-       void *p, *map;
+       void *map;
+       char *p;
 
        ret = 0;
        offset = io_u->offset;
@@ -199,7 +199,8 @@ static int fio_splice_write(struct thread_data *td, struct io_u *io_u)
        return io_u->xfer_buflen;
 }
 
-static int fio_spliceio_queue(struct thread_data *td, struct io_u *io_u)
+static enum fio_q_status fio_spliceio_queue(struct thread_data *td,
+                                           struct io_u *io_u)
 {
        struct spliceio_data *sd = td->io_ops_data;
        int ret = 0;