about summary refs log tree commit diff
path: root/sysdeps/unix/sysv/linux/fallocate.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@gmail.com>2011-04-01 11:15:08 -0400
committerUlrich Drepper <drepper@gmail.com>2011-04-01 11:15:08 -0400
commit748876bf1c45cd10f998f8578c434156eae53b7e (patch)
tree2fcf11637d6246f8e4783a4ad6a4c9aff9ca972f /sysdeps/unix/sysv/linux/fallocate.c
parent6e63d5e1aebc659a95223cf8862a7b42c67dbb1c (diff)
downloadglibc-748876bf1c45cd10f998f8578c434156eae53b7e.tar.gz
glibc-748876bf1c45cd10f998f8578c434156eae53b7e.tar.xz
glibc-748876bf1c45cd10f998f8578c434156eae53b7e.zip
Really implement fallocate{,64} and sync_file_range as cancellation points.
Diffstat (limited to 'sysdeps/unix/sysv/linux/fallocate.c')
-rw-r--r--sysdeps/unix/sysv/linux/fallocate.c22
1 files changed, 17 insertions, 5 deletions
diff --git a/sysdeps/unix/sysv/linux/fallocate.c b/sysdeps/unix/sysv/linux/fallocate.c
index dc2b4e92ca..a7d3ff079b 100644
--- a/sysdeps/unix/sysv/linux/fallocate.c
+++ b/sysdeps/unix/sysv/linux/fallocate.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2007, 2009 Free Software Foundation, Inc.
+/* Copyright (C) 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
@@ -18,7 +18,7 @@
 
 #include <errno.h>
 #include <fcntl.h>
-#include <sysdep.h>
+#include <sysdep-cancel.h>
 
 
 /* Reserve storage for the data of the file associated with FD.  */
@@ -26,9 +26,21 @@ int
 fallocate (int fd, int mode, __off_t offset, __off_t len)
 {
 #ifdef __NR_fallocate
-  return INLINE_SYSCALL (fallocate, 6, fd, mode,
-			 __LONG_LONG_PAIR (offset >> 31, offset),
-			 __LONG_LONG_PAIR (len >> 31, len));
+  if (SINGLE_THREAD_P)
+    return INLINE_SYSCALL (fallocate, 6, fd, mode,
+			   __LONG_LONG_PAIR (offset >> 31, offset),
+			   __LONG_LONG_PAIR (len >> 31, len));
+
+  int result;
+  int oldtype = LIBC_CANCEL_ASYNC ();
+
+  result = INLINE_SYSCALL (fallocate, 6, fd, mode,
+			   __LONG_LONG_PAIR (offset >> 31, offset),
+			   __LONG_LONG_PAIR (len >> 31, len));
+
+  LIBC_CANCEL_RESET (oldtype);
+
+  return result;
 #else
   __set_errno (ENOSYS);
   return -1;