[git commit] libc: handle sync_file_range

[Bernhard Reutner-Fischer]

commit: http://git.uclibc.org/uClibc/commit/?id=ff6efa4488b338e0a72f574b26e4fff669acab8d
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/master

Add cancellation and support arm, ppc64, mips32.
Compile-tested.

Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop at gmail.com>
---
 libc/sysdeps/linux/common/sync_file_range.c |   34 +++++++++++++++++---------
 1 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/libc/sysdeps/linux/common/sync_file_range.c b/libc/sysdeps/linux/common/sync_file_range.c
index b07f8e5..66751c6 100644
--- a/libc/sysdeps/linux/common/sync_file_range.c
+++ b/libc/sysdeps/linux/common/sync_file_range.c
@@ -4,24 +4,34 @@
  *
  * Copyright (C) 2008 Bernhard Reutner-Fischer <uclibc at uclibc.org>
  *
- * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
+ * Licensed under the LGPL v2.1 or later, see the file COPYING.LIB in this tarball.
  */
 
 #include <sys/syscall.h>
-
-#if defined __NR_sync_file_range && defined __UCLIBC_HAS_LFS__ && defined __USE_GNU
+#if defined __UCLIBC_HAS_LFS__ && defined __USE_GNU
+# include <bits/wordsize.h>
+# include <endian.h>
 # include <fcntl.h>
+# include <cancel.h>
 
-# define __NR___syscall_sync_file_range __NR_sync_file_range
-static __inline__ _syscall6(int, __syscall_sync_file_range, int, fd,
-			    off_t, offset_hi, off_t, offset_lo,
-			    off_t, nbytes_hi, off_t, nbytes_lo, unsigned int, flags)
+# ifdef __NR_sync_file_range2
+#  undef __NR_sync_file_range
+#  define __NR_sync_file_range __NR_sync_file_range2
+# endif
 
-int sync_file_range(int fd, off64_t offset, off64_t nbytes, unsigned int flags)
+# ifdef __NR_sync_file_range
+static int __NC(sync_file_range)(int fd, off64_t offset, off64_t nbytes, unsigned int flags)
 {
-	return __syscall_sync_file_range(fd,
-		__LONG_LONG_PAIR((long)(offset >> 32), (long)(offset & 0xffffffff)),
-		__LONG_LONG_PAIR((long)(nbytes >> 32), (long)(nbytes & 0xffffffff)),
-		flags);
+#  if defined __powerpc__ && __WORDSIZE == 64
+	return INLINE_SYSCALL(sync_file_range, 4, fd, offset, nbytes, flags);
+#  elif defined __mips__ && __WORDSIZE == 32
+	return INLINE_SYSCALL(sync_file_range, 7, fd, 0,
+			OFF64_HI_LO(offset), OFF64_HI_LO(nbytes), flags);
+#  else
+	return INLINE_SYSCALL(sync_file_range, 6, fd,
+			OFF64_HI_LO(offset), OFF64_HI_LO(nbytes), flags);
+#  endif
 }
+CANCELLABLE_SYSCALL(int, sync_file_range, (int fd, off64_t offset, off64_t nbytes, unsigned int flags), (fd, offset, nbytes, flags))
+# endif
 #endif