Various fixes/updates

[fio.git] / os / os-solaris.h

diff --git a/os/os-solaris.h b/os/os-solaris.h
index 175654e84bf49864c7dab08e3ad8906b45b8ca73..3e82543695de88d94797b0640030418368382e1a 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 "../file.h"
+
 #define FIO_HAVE_POSIXAIO
 #define FIO_HAVE_SOLARISAIO
 #define FIO_HAVE_FALLOCATE
@@ -14,6 +16,7 @@
 #define FIO_HAVE_CPU_AFFINITY
 #define FIO_HAVE_PSHARED_MUTEX
 #define FIO_USE_GENERIC_BDEV_SIZE
+#define FIO_HAVE_FDATASYNC
 
 #define OS_MAP_ANON            MAP_ANON
 #define OS_RAND_MAX            2147483648UL
@@ -25,7 +28,7 @@ struct solaris_rand_seed {
 typedef psetid_t os_cpu_mask_t;
 typedef struct solaris_rand_seed os_random_state_t;
 
-static inline int blockdev_invalidate_cache(int fd)
+static inline int blockdev_invalidate_cache(struct fio_file *f)
 {
        return EINVAL;
 }
@@ -103,17 +106,4 @@ static inline int fio_cpuset_exit(os_cpu_mask_t *mask)
 #define FIO_MADV_FREE  MADV_FREE
 #endif
 
-/*
- * Some Solaris versions don't have posix_memalign(), provide a private
- * weak alternative
- */
-static inline int __weak posix_memalign(void **ptr, size_t align, size_t size)
-{
-       *ptr = memalign(align, size);
-       if (*ptr)
-               return 0;
-
-       return ENOMEM;
-}
-
 #endif