X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=engines%2Fglusterfs_sync.c;h=de73261f6c88fbc4778d5f2b45e9447b40bcb7d8;hb=e1ce5b385c65803b170e512a1b5256bbe99f98f0;hp=235d74f64e1e3c9cfed9067d4ed75cff608e97eb;hpb=38ef9c90fbe4fddc209f94b277b49e78f7f6a424;p=fio.git diff --git a/engines/glusterfs_sync.c b/engines/glusterfs_sync.c index 235d74f6..de73261f 100644 --- a/engines/glusterfs_sync.c +++ b/engines/glusterfs_sync.c @@ -7,11 +7,11 @@ #include "gfapi.h" -#define LAST_POS(f) ((f)->engine_data) +#define LAST_POS(f) ((f)->engine_pos) static int fio_gf_prep(struct thread_data *td, struct io_u *io_u) { struct fio_file *f = io_u->file; - struct gf_data *g = td->io_ops->data; + struct gf_data *g = td->io_ops_data; dprint(FD_FILE, "fio prep\n"); @@ -29,23 +29,36 @@ static int fio_gf_prep(struct thread_data *td, struct io_u *io_u) return 0; } -static int fio_gf_queue(struct thread_data *td, struct io_u *io_u) +static enum fio_q_status fio_gf_queue(struct thread_data *td, struct io_u *io_u) { - struct gf_data *g = td->io_ops->data; + struct gf_data *g = td->io_ops_data; int ret = 0; - dprint(FD_FILE, "fio queue len %lu\n", io_u->xfer_buflen); + dprint(FD_FILE, "fio queue len %llu\n", io_u->xfer_buflen); fio_ro_check(td, io_u); if (io_u->ddir == DDIR_READ) ret = glfs_read(g->fd, io_u->xfer_buf, io_u->xfer_buflen, 0); else if (io_u->ddir == DDIR_WRITE) ret = glfs_write(g->fd, io_u->xfer_buf, io_u->xfer_buflen, 0); + else if (io_u->ddir == DDIR_SYNC) +#if defined(CONFIG_GF_NEW_API) + ret = glfs_fsync(g->fd, NULL, NULL); +#else + ret = glfs_fsync(g->fd); +#endif + else if (io_u->ddir == DDIR_DATASYNC) +#if defined(CONFIG_GF_NEW_API) + ret = glfs_fdatasync(g->fd, NULL, NULL); +#else + ret = glfs_fdatasync(g->fd); +#endif else { log_err("unsupported operation.\n"); - return -EINVAL; + io_u->error = EINVAL; + return FIO_Q_COMPLETED; } - dprint(FD_FILE, "fio len %lu ret %d\n", io_u->xfer_buflen, ret); + dprint(FD_FILE, "fio len %llu ret %d\n", io_u->xfer_buflen, ret); if (io_u->file && ret >= 0 && ddir_rw(io_u->ddir)) LAST_POS(io_u->file) = io_u->offset + ret;