projects
/
fio.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
compact
(merge:
f24254e
495ee9b
)
Merge branch 'master' of ssh://router/data/git/fio
author
Jens Axboe
<jens.axboe@oracle.com>
Wed, 13 Jun 2007 17:04:20 +0000
(19:04 +0200)
committer
Jens Axboe
<jens.axboe@oracle.com>
Wed, 13 Jun 2007 17:04:20 +0000
(19:04 +0200)
1
2
os/os-linux.h
patch
|
diff1
|
diff2
|
blob
|
history
diff --combined
os/os-linux.h
index 836a52f390c65a9cd8efb9be7709c9a424dfd23c,f4b6a22361bfa1b5d6f04ece4d6f53c882755f50..11f767c5b2e8105c6ab9fec7f10baf17f9a566d2
---
1
/
os/os-linux.h
---
2
/
os/os-linux.h
+++ b/
os/os-linux.h
@@@
-69,7
-69,7
+69,7
@@@
static inline int ioprio_set(int which
#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)
+ size_t len, unsigned
int
flags)
{
return syscall(__NR_sys_splice, fdin, off_in, fdout, off_out, len, flags);
}
@@@
-86,10
-86,6
+86,10
@@@
static inline int vmsplice(int fd, cons
}
#endif
+#ifdef SPLICE_F_UNMAP
+#define SPLICE_F_UNMAP (0x10)
+#endif
+
#define SPLICE_DEF_SIZE (64*1024)
#ifdef FIO_HAVE_SYSLET