X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=os%2Fos-dragonfly.h;h=713046f53543442a89d21c55ace2cbcd05839d4b;hb=7c5489c06986f8576b387c05f1228f5e1cc89865;hp=8d15833562785ba4db31f1d31bd0e45c30587550;hpb=dad0ea54b595ad656aca4087014afb438c7d44f0;p=fio.git diff --git a/os/os-dragonfly.h b/os/os-dragonfly.h index 8d158335..713046f5 100644 --- a/os/os-dragonfly.h +++ b/os/os-dragonfly.h @@ -15,6 +15,7 @@ #include #include "../file.h" +#include "../lib/types.h" #define FIO_HAVE_ODIRECT #define FIO_USE_GENERIC_RAND @@ -107,12 +108,9 @@ static inline void fio_cpu_set(os_cpu_mask_t *mask, int cpu) CPUMASK_ORBIT(*mask, cpu); } -static inline int fio_cpu_isset(os_cpu_mask_t *mask, int cpu) +static inline bool fio_cpu_isset(os_cpu_mask_t *mask, int cpu) { - if (CPUMASK_TESTBIT(*mask, cpu)) - return 1; - - return 0; + return CPUMASK_TESTBIT(*mask, cpu) != 0; } static inline int fio_setaffinity(int pid, os_cpu_mask_t mask) @@ -216,7 +214,7 @@ static inline unsigned long long get_fs_free_size(const char *path) return ret; } -static inline int os_trim(int fd, unsigned long long start, +static inline int os_trim(struct fio_file *f, unsigned long long start, unsigned long long len) { off_t range[2]; @@ -224,7 +222,7 @@ static inline int os_trim(int fd, unsigned long long start, range[0] = start; range[1] = len; - if (!ioctl(fd, IOCTLTRIM, range)) + if (!ioctl(f->fd, IOCTLTRIM, range)) return 0; return errno;