X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=os%2Fos-linux.h;h=a36552ba68ba93caf6ca58e5fc9761fc53c0b88d;hb=70e0c3166fdb8048b1e7f84be2371fc60af04f87;hp=b6ba569a46f603a389a12d959b19820be801079a;hpb=2e3bd4c21cc239fbda992a4ede89ebb85f550920;p=fio.git

diff --git a/os/os-linux.h b/os/os-linux.h
index b6ba569a..a36552ba 100644
--- a/os/os-linux.h
+++ b/os/os-linux.h
@@ -14,6 +14,8 @@
 #include <linux/major.h>
 
 #include "indirect.h"
+#include "binject.h"
+#include "../file.h"
 
 #define FIO_HAVE_LIBAIO
 #define FIO_HAVE_POSIXAIO
@@ -35,8 +37,23 @@
 #define FIO_HAVE_CL_SIZE
 #define FIO_HAVE_CGROUPS
 #define FIO_HAVE_FDATASYNC
-#define FIO_HAVE_SYNC_FILE_RANGE
 #define FIO_HAVE_FS_STAT
+#define FIO_HAVE_TRIM
+#define FIO_HAVE_BINJECT
+#define FIO_HAVE_CLOCK_MONOTONIC
+#define FIO_HAVE_GETTID
+
+/*
+ * Can only enable this for newer glibcs, or the header and defines are
+ * missing
+ */
+#if __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 6
+#define FIO_HAVE_LINUX_FALLOCATE
+#endif
+
+#ifdef SYNC_FILE_RANGE_WAIT_BEFORE
+#define FIO_HAVE_SYNC_FILE_RANGE
+#endif
 
 #define OS_MAP_ANON		MAP_ANONYMOUS
 
@@ -93,6 +110,11 @@ static inline int ioprio_set(int which, int who, int ioprio)
 	return syscall(__NR_ioprio_set, which, who, ioprio);
 }
 
+static inline int gettid(void)
+{
+	return syscall(__NR_gettid);
+}
+
 /*
  * Just check for SPLICE_F_MOVE, if that isn't there, assume the others
  * aren't either.
@@ -182,14 +204,18 @@ enum {
 #define BLKFLSBUF	_IO(0x12,97)
 #endif
 
-static inline int blockdev_invalidate_cache(int fd)
+#ifndef BLKDISCARD
+#define BLKDISCARD	_IO(0x12,119)
+#endif
+
+static inline int blockdev_invalidate_cache(struct fio_file *f)
 {
-	return ioctl(fd, BLKFLSBUF);
+	return ioctl(f->fd, BLKFLSBUF);
 }
 
-static inline int blockdev_size(int fd, unsigned long long *bytes)
+static inline int blockdev_size(struct fio_file *f, unsigned long long *bytes)
 {
-	if (!ioctl(fd, BLKGETSIZE64, bytes))
+	if (!ioctl(f->fd, BLKGETSIZE64, bytes))
 		return 0;
 
 	return errno;
@@ -295,4 +321,18 @@ static inline unsigned long long get_fs_size(const char *path)
 	return ret;
 }
 
+static inline int os_trim(int fd, unsigned long long start,
+			  unsigned long long len)
+{
+	uint64_t range[2];
+
+	range[0] = start;
+	range[1] = len;
+
+	if (!ioctl(fd, BLKDISCARD, range))
+		return 0;
+
+	return errno;
+}
+
 #endif