From 97fbdfa1a48a6b535d420e3f53bcb62ed4eff3f1 Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Thu, 5 Oct 2006 13:44:15 +0200 Subject: [PATCH] [PATCH] Fix compile on hosts that have the splice stuff included Newer distros (FC6-test3 at least) do have the splice syscall and flag definitions, so check for that in os-linux.h Signed-off-by: Jens Axboe --- os-linux.h | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/os-linux.h b/os-linux.h index fd5356b9..4c54c8cc 100644 --- a/os-linux.h +++ b/os-linux.h @@ -5,6 +5,7 @@ #include #include #include +#include #include #define FIO_HAVE_LIBAIO @@ -39,33 +40,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) -- 2.25.1