X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=engines%2Fsyslet-rw.c;h=15e4c2578fe9ee978af4f4a1847ecf571871718e;hb=d175907a7bd0b78cdd18bf47882428368a448057;hp=7bb1be83618959ee5b7a87ec8e79bdfbbfb095a2;hpb=e6026f9c9e41226cbc0c526dac8ec5a5c355348a;p=fio.git diff --git a/engines/syslet-rw.c b/engines/syslet-rw.c index 7bb1be83..15e4c257 100644 --- a/engines/syslet-rw.c +++ b/engines/syslet-rw.c @@ -14,9 +14,7 @@ #include #include "../fio.h" -#include "../indirect.h" -#include "../syslet.h" -#include "../fls.h" +#include "../lib/fls.h" #ifdef FIO_HAVE_SYSLET @@ -133,6 +131,12 @@ static void fio_syslet_prep_sync(struct fio_file *f, FILL_IN(*regs, __NR_fsync, (long) f->fd); } +static void fio_syslet_prep_datasync(struct fio_file *f, + struct indirect_registers *regs) +{ + FILL_IN(*regs, __NR_fdatasync, (long) f->fd); +} + static void fio_syslet_prep_rw(struct io_u *io_u, struct fio_file *f, struct indirect_registers *regs) { @@ -156,6 +160,8 @@ static void fio_syslet_prep(struct io_u *io_u, struct indirect_registers *regs) if (io_u->ddir == DDIR_SYNC) fio_syslet_prep_sync(f, regs); + else if (io_u->ddir == DDIR_DATASYNC) + fio_syslet_prep_datasync(f, regs); else fio_syslet_prep_rw(io_u, f, regs); } @@ -224,7 +230,6 @@ static void fio_syslet_cleanup(struct thread_data *td) free(sd->events); free(sd->ring); free(sd); - td->io_ops->data = NULL; } } @@ -245,7 +250,7 @@ static int fio_syslet_init(struct thread_data *td) */ ring_nr = td->o.iodepth; if (ring_nr & (ring_nr - 1)) - ring_nr = 1 << fls(ring_nr); + ring_nr = 1 << __fls(ring_nr); ring_size = sizeof(struct syslet_ring) + ring_nr * sizeof(struct syslet_completion); @@ -287,6 +292,7 @@ static struct ioengine_ops ioengine = { .cleanup = fio_syslet_cleanup, .open_file = generic_open_file, .close_file = generic_close_file, + .get_file_size = generic_get_file_size, }; #else /* FIO_HAVE_SYSLET */ @@ -298,7 +304,7 @@ static struct ioengine_ops ioengine = { */ static int fio_syslet_init(struct thread_data fio_unused *td) { - fprintf(stderr, "fio: syslet not available\n"); + log_err("fio: syslet not available\n"); return 1; }