X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=os%2Fos-solaris.h;h=5029d38f356e5983992bb58ae04cfffa77773a5d;hb=23d2461974c334d77eb7a06a2dbd1f37aeee85d4;hp=35148d2dfcec7bf6aff5de95af36a30357842b84;hpb=f356d01d0cf8fec2ee58f66a9b5c00c93defbc47;p=fio.git

diff --git a/os/os-solaris.h b/os/os-solaris.h
index 35148d2d..5029d38f 100644
--- a/os/os-solaris.h
+++ b/os/os-solaris.h
@@ -1,6 +1,7 @@
 #ifndef FIO_OS_SOLARIS_H
 #define FIO_OS_SOLARIS_H
 
+#include <errno.h>
 #include <sys/types.h>
 #include <sys/fcntl.h>
 #include <sys/pset.h>
@@ -22,12 +23,15 @@ struct solaris_rand_seed {
 typedef psetid_t os_cpu_mask_t;
 typedef struct solaris_rand_seed os_random_state_t;
 
-/*
- * FIXME
- */
 static inline int blockdev_size(int fd, unsigned long long *bytes)
 {
-	return EINVAL;
+	off_t end = lseek(fd, 0, SEEK_END);
+
+	if (end < 0)
+		return errno;
+
+	*bytes = end;
+	return 0;
 }
 
 static inline int blockdev_invalidate_cache(int fd)
@@ -68,8 +72,8 @@ static inline int fio_set_odirect(int fd)
 /*
  * pset binding hooks for fio
  */
-#define fio_setaffinity(td)		\
-	pset_bind((td)->o.cpumask, P_PID, (td)->pid, NULL)
+#define fio_setaffinity(pid, cpumask)		\
+	pset_bind((cpumask), P_PID, (pid), NULL)
 #define fio_getaffinity(pid, ptr)	({ 0; })
 
 #define fio_cpu_clear(mask, cpu)	pset_assign(PS_NONE, (cpu), NULL)
@@ -104,4 +108,8 @@ static inline int fio_cpuset_exit(os_cpu_mask_t *mask)
  */
 #define FIO_MAX_CPUS			16384
 
+#ifdef MADV_FREE
+#define FIO_MADV_FREE	MADV_FREE
+#endif
+
 #endif