projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Get rid of warning on platforms for casting char -> int
[fio.git]
/
os
/
os-linux.h
diff --git
a/os/os-linux.h
b/os/os-linux.h
index 20f2a94ef4d06783aa006e202a37644ce64f7a1e..024ef89ae23d1d4548b6c4a7982de9db1b6913b2 100644
(file)
--- a/
os/os-linux.h
+++ b/
os/os-linux.h
@@
-15,6
+15,7
@@
#include "indirect.h"
#include "binject.h"
#include "indirect.h"
#include "binject.h"
+#include "../file.h"
#define FIO_HAVE_LIBAIO
#define FIO_HAVE_POSIXAIO
#define FIO_HAVE_LIBAIO
#define FIO_HAVE_POSIXAIO
@@
-31,6
+32,7
@@
#define FIO_HAVE_BLKTRACE
#define FIO_HAVE_STRSEP
#define FIO_HAVE_FALLOCATE
#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_POSIXAIO_FSYNC
#define FIO_HAVE_PSHARED_MUTEX
#define FIO_HAVE_CL_SIZE
@@
-39,6
+41,7
@@
#define FIO_HAVE_FS_STAT
#define FIO_HAVE_TRIM
#define FIO_HAVE_BINJECT
#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
#ifdef SYNC_FILE_RANGE_WAIT_BEFORE
#define FIO_HAVE_SYNC_FILE_RANGE
@@
-192,14
+195,14
@@
enum {
#define BLKDISCARD _IO(0x12,119)
#endif
#define BLKDISCARD _IO(0x12,119)
#endif
-static inline int blockdev_invalidate_cache(
int fd
)
+static inline int blockdev_invalidate_cache(
struct fio_file *f
)
{
{
- return ioctl(fd, BLKFLSBUF);
+ return ioctl(f
->f
d, 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
->f
d, BLKGETSIZE64, bytes))
return 0;
return errno;
return 0;
return errno;