X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=os-linux.h;h=e456ebcaea22204ffbcbf562377e8f6b6312d16c;hp=f9094cb437148929c336ac1cd109ef15300188de;hb=74b025b071b5bfbffa7ad7682b66b749e8d1f955;hpb=6dfd46b99af38cc1e5f702f53c59212129fe615e;ds=inline

diff --git a/os-linux.h b/os-linux.h
index f9094cb4..e456ebca 100644
--- a/os-linux.h
+++ b/os-linux.h
@@ -5,7 +5,8 @@
 #include <sys/uio.h>
 #include <sys/syscall.h>
 #include <unistd.h>
-#include <asm/unistd.h>
+#include <fcntl.h>
+#include <linux/unistd.h>
 
 #define FIO_HAVE_LIBAIO
 #define FIO_HAVE_POSIXAIO
@@ -16,6 +17,8 @@
 #define FIO_HAVE_IOPRIO
 #define FIO_HAVE_SPLICE
 #define FIO_HAVE_IOSCHED_SWITCH
+#define FIO_HAVE_ODIRECT
+#define FIO_HAVE_HUGETLB
 
 #define OS_MAP_ANON		(MAP_ANONYMOUS)
 
@@ -38,33 +41,35 @@ static inline int ioprio_set(int which, int who, int ioprio)
 	return syscall(__NR_ioprio_set, which, who, ioprio);
 }
 
-static _syscall6(int, sys_splice, int, fdin, loff_t *, off_in, int, fdout, loff_t *, off_out, size_t, len, unsigned int, flags);
-static _syscall4(int, sys_vmsplice, int, fd, const struct iovec *, iov, unsigned long, nr_segs, unsigned int, flags);
-static _syscall4(int, sys_tee, int, fdin, int, fdout, size_t, len, unsigned int, flags);
+/*
+ * Just check for SPLICE_F_MOVE, if that isn't there, assume the others
+ * aren't either.
+ */
+#ifndef SPLICE_F_MOVE
+#define SPLICE_F_MOVE	(0x01)	/* move pages instead of copying */
+#define SPLICE_F_NONBLOCK (0x02) /* don't block on the pipe splicing (but */
+				 /* we may still block on the fd we splice */
+				 /* from/to, of course */
+#define SPLICE_F_MORE	(0x04)	/* expect more data */
+#define SPLICE_F_GIFT   (0x08)  /* pages passed in are a gift */
 
 static inline int splice(int fdin, loff_t *off_in, int fdout, loff_t *off_out,
 			 size_t len, unsigned long flags)
 {
-	return sys_splice(fdin, off_in, fdout, off_out, len, flags);
+	return syscall(__NR_sys_splice, fdin, off_in, fdout, off_out, len, flags);
 }
 
 static inline int tee(int fdin, int fdout, size_t len, unsigned int flags)
 {
-	return sys_tee(fdin, fdout, len, flags);
+	return syscall(__NR_sys_tee, fdin, fdout, len, flags);
 }
 
 static inline int vmsplice(int fd, const struct iovec *iov,
 			   unsigned long nr_segs, unsigned int flags)
 {
-	return sys_vmsplice(fd, iov, nr_segs, flags);
+	return syscall(__NR_sys_vmsplice, fd, iov, nr_segs, flags);
 }
-
-#define SPLICE_F_MOVE	(0x01)	/* move pages instead of copying */
-#define SPLICE_F_NONBLOCK (0x02) /* don't block on the pipe splicing (but */
-				 /* we may still block on the fd we splice */
-				 /* from/to, of course */
-#define SPLICE_F_MORE	(0x04)	/* expect more data */
-#define SPLICE_F_GIFT   (0x08)  /* pages passed in are a gift */
+#endif
 
 #define SPLICE_DEF_SIZE	(64*1024)
 
@@ -80,6 +85,18 @@ enum {
 #define BLKGETSIZE64	_IOR(0x12,114,size_t)
 #endif
 
+#ifndef BLKFLSBUF
+#define BLKFLSBUF	_IO(0x12,97)
+#endif
+
+static inline int blockdev_invalidate_cache(int fd)
+{
+	if (!ioctl(fd, BLKFLSBUF))
+		return 0;
+
+	return errno;
+}
+
 static inline int blockdev_size(int fd, unsigned long long *bytes)
 {
 	if (!ioctl(fd, BLKGETSIZE64, bytes))