Fix bug in $mb_memory keyword

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

diff --git a/os/os-linux.h b/os/os-linux.h
index df0ec2dbdb51a692cc52f93097a0238844aad1ef..024ef89ae23d1d4548b6c4a7982de9db1b6913b2 100644 (file)
--- 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
@@ -30,12 +32,16 @@
 #define FIO_HAVE_BLKTRACE
 #define FIO_HAVE_STRSEP
 #define FIO_HAVE_FALLOCATE
+#define FIO_HAVE_LINUX_FALLOCATE
 #define FIO_HAVE_POSIXAIO_FSYNC
 #define FIO_HAVE_PSHARED_MUTEX
 #define FIO_HAVE_CL_SIZE
 #define FIO_HAVE_CGROUPS
 #define FIO_HAVE_FDATASYNC
 #define FIO_HAVE_FS_STAT
+#define FIO_HAVE_TRIM
+#define FIO_HAVE_BINJECT
+#define FIO_HAVE_CLOCK_MONOTONIC
 
 #ifdef SYNC_FILE_RANGE_WAIT_BEFORE
 #define FIO_HAVE_SYNC_FILE_RANGE
@@ -185,14 +191,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;
@@ -298,4 +308,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