X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=io_u.h;h=bdbac52577afeff573e6895621dccc903acc1d0a;hb=dc10c23ab9a7b34f50a4957789ce1f2e0883366b;hp=5a28689c36c24f02c4d25a7bba947b8999a06da1;hpb=b2da58c4e223f69531d88ff495f8a84ef77f8553;p=fio.git diff --git a/io_u.h b/io_u.h index 5a28689c..bdbac525 100644 --- a/io_u.h +++ b/io_u.h @@ -11,9 +11,6 @@ #ifdef CONFIG_LIBAIO #include #endif -#ifdef CONFIG_GUASI -#include -#endif enum { IO_U_F_FREE = 1 << 0, @@ -24,7 +21,7 @@ enum { IO_U_F_TRIMMED = 1 << 5, IO_U_F_BARRIER = 1 << 6, IO_U_F_VER_LIST = 1 << 7, - IO_U_F_PRIORITY = 1 << 8, + IO_U_F_HIGH_PRIO = 1 << 8, }; /* @@ -49,6 +46,11 @@ struct io_u { */ unsigned short numberio; + /* + * IO priority. + */ + unsigned short ioprio; + /* * Allocated/set buffer and length */ @@ -125,9 +127,6 @@ struct io_u { #ifdef FIO_HAVE_SGIO struct sg_io_hdr hdr; #endif -#ifdef CONFIG_GUASI - guasi_req_t greq; -#endif #ifdef CONFIG_SOLARISAIO aio_result_t resultp; #endif @@ -194,7 +193,6 @@ static inline enum fio_ddir acct_ddir(struct io_u *io_u) td_flags_clear((td), &(io_u->flags), (val)) #define io_u_set(td, io_u, val) \ td_flags_set((td), &(io_u)->flags, (val)) -#define io_u_is_prio(io_u) \ - (io_u->flags & (unsigned int) IO_U_F_PRIORITY) != 0 +#define io_u_is_high_prio(io_u) (io_u->flags & IO_U_F_HIGH_PRIO) #endif