OS headers need fio_file definition now

Signed-off-by: Jens Axboe <jaxboe@fusionio.com>

diff --git a/file.h b/file.h
index 10c5379c2f3ec6fee8141cc770dadea3b8467532..7948a4124caddca07d9ddc88b7166193b6546bce 100644 (file)
--- a/file.h
+++ b/file.h
@@ -1,6 +1,7 @@
 #ifndef FIO_FILE_H
 #define FIO_FILE_H
 
 #ifndef FIO_FILE_H
 #define FIO_FILE_H
 

+#include <string.h>

 #include "compiler/compiler.h"
 #include "io_ddir.h"
 #include "flist.h"
 #include "compiler/compiler.h"
 #include "io_ddir.h"
 #include "flist.h"

diff --git a/os/os-aix.h b/os/os-aix.h
index b5ee5bb35e6a38f73c25bc05df8d3b0a0ed0ace1..8e4a71d51fc69ce29bc4d1221c2d048298452844 100644 (file)
--- a/os/os-aix.h
+++ b/os/os-aix.h
@@ -6,6 +6,8 @@
 #include <sys/devinfo.h>
 #include <sys/ioctl.h>
 
 #include <sys/devinfo.h>
 #include <sys/ioctl.h>
 

+#include "../file.h"
+

 #define FIO_HAVE_POSIXAIO
 #define FIO_HAVE_ODIRECT
 #define FIO_USE_GENERIC_RAND
 #define FIO_HAVE_POSIXAIO
 #define FIO_HAVE_ODIRECT
 #define FIO_USE_GENERIC_RAND

diff --git a/os/os-freebsd.h b/os/os-freebsd.h
index 0cb7ae5e5ca079380e20a514f1f0f1b9df3748c2..1f114f8c49b38d10d53074ee3e183703d00ea30a 100644 (file)
--- a/os/os-freebsd.h
+++ b/os/os-freebsd.h
@@ -5,6 +5,8 @@
 #include <sys/sysctl.h>
 #include <sys/disk.h>
 
 #include <sys/sysctl.h>
 #include <sys/disk.h>
 

+#include "../file.h"
+

 #define FIO_HAVE_POSIXAIO
 #define FIO_HAVE_ODIRECT
 #define FIO_HAVE_IOPRIO
 #define FIO_HAVE_POSIXAIO
 #define FIO_HAVE_ODIRECT
 #define FIO_HAVE_IOPRIO

diff --git a/os/os-linux.h b/os/os-linux.h
index aab74e581e5fc4cb76fa1eb00739ae1c145c9bb4..70c993b5de61d449051cfff989482a728cdfd2ad 100644 (file)
--- a/os/os-linux.h
+++ b/os/os-linux.h
@@ -15,6 +15,7 @@
 
 #include "indirect.h"
 #include "binject.h"
 
 #include "indirect.h"
 #include "binject.h"

+#include "../file.h"

 
 #define FIO_HAVE_LIBAIO
 #define FIO_HAVE_POSIXAIO
 
 #define FIO_HAVE_LIBAIO
 #define FIO_HAVE_POSIXAIO


@@ -193,7 +194,7 @@ enum {
 #define BLKDISCARD     _IO(0x12,119)
 #endif
 
 #define BLKDISCARD     _IO(0x12,119)
 #endif
 

-static inline int blockdev_invalidate_cache(struct fio_file *fd)
+static inline int blockdev_invalidate_cache(struct fio_file *f)

 {
        return ioctl(f->fd, BLKFLSBUF);
 }
 {
        return ioctl(f->fd, BLKFLSBUF);
 }

diff --git a/os/os-mac.h b/os/os-mac.h
index 39a2f827408fd25bf30172e05921908170bef180..068bc5c84e3860efbe6367efeecfcc08467c9b2f 100644 (file)
--- a/os/os-mac.h
+++ b/os/os-mac.h
@@ -4,6 +4,8 @@
 #include <errno.h>
 #include <sys/sysctl.h>
 
 #include <errno.h>
 #include <sys/sysctl.h>
 

+#include "../file.h"
+

 #ifndef CLOCK_MONOTONIC
 #define CLOCK_MONOTONIC 1
 #endif
 #ifndef CLOCK_MONOTONIC
 #define CLOCK_MONOTONIC 1
 #endif

diff --git a/os/os-netbsd.h b/os/os-netbsd.h
index ecfcddbb31b14f1fb6843fde7e9d8b25e3dbea75..6478f30d6546191d4622900318fe4fdc170b5a8d 100644 (file)
--- a/os/os-netbsd.h
+++ b/os/os-netbsd.h
@@ -10,6 +10,8 @@
 #undef rb_left
 #undef rb_right
 
 #undef rb_left
 #undef rb_right
 

+#include "../file.h"
+

 #define FIO_HAVE_POSIXAIO
 #define FIO_HAVE_FADVISE
 #define FIO_HAVE_ODIRECT
 #define FIO_HAVE_POSIXAIO
 #define FIO_HAVE_FADVISE
 #define FIO_HAVE_ODIRECT

diff --git a/os/os-solaris.h b/os/os-solaris.h
index 14164b01b47cfccfdfe45fd4c340d8a1e2313a19..e292172dcf0ebcd1e81d06915ac91d1e80cfeeae 100644 (file)
--- a/os/os-solaris.h
+++ b/os/os-solaris.h
@@ -7,6 +7,8 @@
 #include <sys/fcntl.h>
 #include <sys/pset.h>
 
 #include <sys/fcntl.h>
 #include <sys/pset.h>
 

+#include "../file.h"
+

 #define FIO_HAVE_POSIXAIO
 #define FIO_HAVE_SOLARISAIO
 #define FIO_HAVE_FALLOCATE
 #define FIO_HAVE_POSIXAIO
 #define FIO_HAVE_SOLARISAIO
 #define FIO_HAVE_FALLOCATE