X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=fio.h;h=ca9fede63f66962f8d3ea4e171e8991c97ee57ea;hb=e6026f9c9e41226cbc0c526dac8ec5a5c355348a;hp=2e43473f0ab5ba34d45e35e7c45cbd17086358be;hpb=10927316a4bd0e2ceba98e62c062e352c0e312fe;p=fio.git diff --git a/fio.h b/fio.h index 2e43473f..ca9fede6 100644 --- a/fio.h +++ b/fio.h @@ -23,10 +23,6 @@ #include "os/os.h" #include "mutex.h" -#ifdef FIO_HAVE_SYSLET -#include "syslet.h" -#endif - #ifdef FIO_HAVE_GUASI #include #endif @@ -99,14 +95,6 @@ struct io_piece { }; }; -#ifdef FIO_HAVE_SYSLET -struct syslet_req { - struct syslet_uatom atom; /* the atom to submit */ - struct syslet_uatom *head; /* head of the sequence */ - long ret; /* syscall return value */ -}; -#endif - enum { IO_U_F_FREE = 1 << 0, IO_U_F_FLIGHT = 1 << 1, @@ -128,9 +116,6 @@ struct io_u { #ifdef FIO_HAVE_SGIO struct sg_io_hdr hdr; #endif -#ifdef FIO_HAVE_SYSLET - struct syslet_req req; -#endif #ifdef FIO_HAVE_GUASI guasi_req_t greq; #endif @@ -898,7 +883,7 @@ extern int __must_check td_io_init(struct thread_data *); extern int __must_check td_io_prep(struct thread_data *, struct io_u *); extern int __must_check td_io_queue(struct thread_data *, struct io_u *); extern int __must_check td_io_sync(struct thread_data *, struct fio_file *); -extern int __must_check td_io_getevents(struct thread_data *, int, int, struct timespec *); +extern int __must_check td_io_getevents(struct thread_data *, unsigned int, unsigned int, struct timespec *); extern int __must_check td_io_commit(struct thread_data *); extern int __must_check td_io_open_file(struct thread_data *, struct fio_file *); extern void td_io_close_file(struct thread_data *, struct fio_file *); @@ -935,7 +920,7 @@ struct ioengine_ops { int (*prep)(struct thread_data *, struct io_u *); int (*queue)(struct thread_data *, struct io_u *); int (*commit)(struct thread_data *); - int (*getevents)(struct thread_data *, int, int, struct timespec *); + int (*getevents)(struct thread_data *, unsigned int, unsigned int, struct timespec *); struct io_u *(*event)(struct thread_data *, int); int (*cancel)(struct thread_data *, struct io_u *); void (*cleanup)(struct thread_data *); @@ -945,7 +930,7 @@ struct ioengine_ops { void *dlhandle; }; -#define FIO_IOOPS_VERSION 7 +#define FIO_IOOPS_VERSION 8 extern struct ioengine_ops *load_ioengine(struct thread_data *, const char *); extern void register_ioengine(struct ioengine_ops *);