Make ppc sync_file_range cancelable.

(cherry picked from commit f12a32e6f02c058c4996a138f16828f772059116)

diff --git a/ChangeLog b/ChangeLog
index bb98ede6c76b4d398e0399c41e699720fc94f181..a9a37e88f0473d3efeef4570f547df203dfbcbe2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-04-08  Andreas Schwab  <schwab@linux-m68k.org>
+
+       * sysdeps/unix/sysv/linux/powerpc/powerpc64/sync_file_range.c:
+       Make cancelable.
+
 2011-03-14  Andreas Schwab  <schwab@redhat.com>
 
        * elf/dl-load.c (_dl_dst_substitute): When skipping the first

diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/sync_file_range.c b/sysdeps/unix/sysv/linux/powerpc/powerpc64/sync_file_range.c
index 1ca4ce66df283000c19bda3977b782b02d50fe1e..ccbca4d25068f6ce4f2d61ea7d8bf0f5cfdfa0db 100644 (file)
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/sync_file_range.c
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/sync_file_range.c
@@ -1,5 +1,5 @@
 /* Selective file content synch'ing.
-   Copyright (C) 2006, 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2007, 2009, 2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -21,7 +21,7 @@
 #include <fcntl.h>
 #include <sys/types.h>
 
-#include <sysdep.h>
+#include <sysdep-cancel.h>
 #include <sys/syscall.h>
 
 
@@ -29,7 +29,17 @@
 int
 sync_file_range (int fd, __off64_t from, __off64_t to, unsigned int flags)
 {
-  return INLINE_SYSCALL (sync_file_range2, 4, fd, flags, from, to);
+  if (SINGLE_THREAD_P)
+    return INLINE_SYSCALL (sync_file_range2, 4, fd, flags, from, to);
+
+  int result;
+  int oldtype = LIBC_CANCEL_ASYNC ();
+
+  result = INLINE_SYSCALL (sync_file_range2, 4, fd, flags, from, to);
+
+  LIBC_CANCEL_RESET (oldtype);
+
+  return result;
 }
 #else
 int