[Ocfs2-test-devel] [PATCH 4/4] Ocfs2-test: Modify splice_test correspondingly after moving splice() to kapi-compat.

[Tristan Ye]

Move splice_test.h to kap-compat, and only use such a private splice() version when
the one in bits/fcntl.h was unavailable.

Signed-off-by: Tristan Ye <tristan.ye at oracle.com>
---
 programs/splice/Makefile       |    4 +++-
 programs/splice/splice_read.c  |    9 ++++++++-
 programs/splice/splice_test.h  |   39 ---------------------------------------
 programs/splice/splice_write.c |    9 ++++++++-
 4 files changed, 19 insertions(+), 42 deletions(-)
 delete mode 100644 programs/splice/splice_test.h

diff --git a/programs/splice/Makefile b/programs/splice/Makefile
index f1ecd1a..37159bf 100644
--- a/programs/splice/Makefile
+++ b/programs/splice/Makefile
@@ -6,7 +6,9 @@ TESTS = splice_read splice_write
 
 CFLAGS = -O2 -Wall -g
 
-SPLICE_READ_SOURCES = splice_read.c splice_test.h
+CFLAGS += $(EXTRA_CFLAGS)
+
+SPLICE_READ_SOURCES = splice_read.c
 SPLICE_READ_OBJECTS = $(patsubst %.c,%.o,$(SPLICE_READ_SOURCES))
 SPLICE_WRITE_SOURCES = splice_write.c
 SPLICE_WRITE_OBJECTS = $(patsubst %.c,%.o,$(SPLICE_WRITE_SOURCES))
diff --git a/programs/splice/splice_read.c b/programs/splice/splice_read.c
index c25522e..42e29bf 100644
--- a/programs/splice/splice_read.c
+++ b/programs/splice/splice_read.c
@@ -1,5 +1,12 @@
 /* splice_read.c */
-#include "splice_test.h"
+#define _GNU_SOURCE
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <assert.h>
+#include <errno.h>
+#include <limits.h>
 
 int main(int argc, char *argv[])
 {
diff --git a/programs/splice/splice_test.h b/programs/splice/splice_test.h
deleted file mode 100644
index 5113bbb..0000000
--- a/programs/splice/splice_test.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#define _GNU_SOURCE
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <assert.h>
-#include <errno.h>
-#include <limits.h>
-
-#if defined(__i386__)
-
-#define __NR_splice	313
-
-#elif defined(__x86_64__)
-
-#define __NR_splice	275
-
-#elif defined(__powerpc__)
-
-#define __NR_splice	283
-
-#elif defined(__s390__)
-
-#define __NR_splice	306
-
-#elif defined(__ia64__)
-
-#define __NR_splice	1297
-
-#else
-#error unsupported arch
-#endif
-
-int splice(int fdin, loff_t *off_in, int fdout,
-			 loff_t *off_out, size_t len, unsigned int flags)
-{
-	return syscall(__NR_splice, fdin, off_in, fdout, off_out, len, flags);
-}
-
diff --git a/programs/splice/splice_write.c b/programs/splice/splice_write.c
index a4d8c1a..e273fbc 100644
--- a/programs/splice/splice_write.c
+++ b/programs/splice/splice_write.c
@@ -1,5 +1,12 @@
 /* splice_write.c */
-#include "splice_test.h"
+#define _GNU_SOURCE
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <assert.h>
+#include <errno.h>
+#include <limits.h>
 
 int main(int argc, char *argv[])
 {
-- 
1.5.5