X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=os%2Fos-mac.h;h=0d97f6b984c60196cbc66a11737a612bc815e1e9;hb=b10b1e70afaff8c9b00005e9238f2ad347a9c00a;hp=a1536c70fabaf9e2de907eab9ffec0740f2bb3db;hpb=1be7afd7329ebdca520d637f571d2b31c33f6ba1;p=fio.git diff --git a/os/os-mac.h b/os/os-mac.h index a1536c70..0d97f6b9 100644 --- a/os/os-mac.h +++ b/os/os-mac.h @@ -16,7 +16,6 @@ #include "../file.h" -#define FIO_USE_GENERIC_RAND #define FIO_USE_GENERIC_INIT_RANDOM_STATE #define FIO_HAVE_GETTID #define FIO_HAVE_CHARDEV_SIZE @@ -41,9 +40,9 @@ typedef unsigned int clockid_t; #endif #define FIO_OS_DIRECTIO -static inline int fio_set_odirect(int fd) +static inline int fio_set_odirect(struct fio_file *f) { - if (fcntl(fd, F_NOCACHE, 1) == -1) + if (fcntl(f->fd, F_NOCACHE, 1) == -1) return errno; return 0; } @@ -91,16 +90,12 @@ static inline unsigned long long os_phys_mem(void) return mem; } +#ifndef CONFIG_HAVE_GETTID static inline int gettid(void) { return mach_thread_self(); } - -/* - * For some reason, there's no header definition for fdatasync(), even - * if it exists. - */ -extern int fdatasync(int fd); +#endif static inline bool fio_fallocate(struct fio_file *f, uint64_t offset, uint64_t len) {