Use glibc_likely instead __builtin_expect.

[thirdparty/glibc.git] / sysdeps / unix / sysv / linux / i386 / fallocate.c

diff --git a/sysdeps/unix/sysv/linux/i386/fallocate.c b/sysdeps/unix/sysv/linux/i386/fallocate.c
index 1434a833f99049208cd4cbe774157e782490ae05..3a4299ee29326d5a216106c88583b5d28692fc72 100644 (file)
--- a/sysdeps/unix/sysv/linux/i386/fallocate.c
+++ b/sysdeps/unix/sysv/linux/i386/fallocate.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2007, 2009 Free Software Foundation, Inc.
+/* Copyright (C) 2007-2014 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
@@ -12,13 +12,12 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <fcntl.h>
-#include <sysdep.h>
+#include <sysdep-cancel.h>
 
 
 extern int __call_fallocate (int fd, int mode, __off64_t offset, __off64_t len)
@@ -30,8 +29,18 @@ int
 fallocate (int fd, int mode, __off_t offset, __off_t len)
 {
 #ifdef __NR_fallocate
-  int err = __call_fallocate (fd, mode, offset, len);
-  if (__builtin_expect (err, 0))
+  int err;
+  if (SINGLE_THREAD_P)
+    err = __call_fallocate (fd, mode, offset, len);
+  else
+    {
+      int oldtype = LIBC_CANCEL_ASYNC ();
+
+      err = __call_fallocate (fd, mode, offset, len);
+
+      LIBC_CANCEL_RESET (oldtype);
+    }
+  if (__glibc_unlikely (err))
     {
       __set_errno (err);
       err = -1;