about summary refs log tree commit diff
path: root/sysdeps/unix/sysv/linux/llseek.c
diff options
context:
space:
mode:
Diffstat (limited to 'sysdeps/unix/sysv/linux/llseek.c')
-rw-r--r--sysdeps/unix/sysv/linux/llseek.c21
1 files changed, 5 insertions, 16 deletions
diff --git a/sysdeps/unix/sysv/linux/llseek.c b/sysdeps/unix/sysv/linux/llseek.c
index 9ee340d476..dcfd9dde9a 100644
--- a/sysdeps/unix/sysv/linux/llseek.c
+++ b/sysdeps/unix/sysv/linux/llseek.c
@@ -1,5 +1,5 @@
 /* Long-long seek operation.
-   Copyright (C) 1996,1997,1998,1999,2000,2002 Free Software Foundation, Inc.
+   Copyright (C) 1996-2000,2002,2003 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
@@ -20,7 +20,7 @@
 #include <errno.h>
 #include <sys/types.h>
 
-#include <sysdep-cancel.h>
+#include <sysdep.h>
 #include <sys/syscall.h>
 
 extern int __syscall__llseek (int fd, off_t offset_hi, off_t offset_lo,
@@ -34,20 +34,9 @@ __llseek (int fd, loff_t offset, int whence)
 {
   loff_t retval;
 
-  if (SINGLE_THREAD_P)
-    return (loff_t) (INLINE_SYSCALL (_llseek, 5, fd, (off_t) (offset >> 32),
-				     (off_t) (offset & 0xffffffff),
-				     __ptrvalue (&retval), whence) ?: retval);
-
-  int oldtype = LIBC_CANCEL_ASYNC ();
-
-  int result = (loff_t) INLINE_SYSCALL (_llseek, 5, fd, (off_t) (offset >> 32),
-					(off_t) (offset & 0xffffffff),
-					__ptrvalue (&retval), whence);
-
-  LIBC_CANCEL_RESET (oldtype);
-
-  return (loff_t) result ?: retval;
+  return (loff_t) (INLINE_SYSCALL (_llseek, 5, fd, (off_t) (offset >> 32),
+				   (off_t) (offset & 0xffffffff),
+				   __ptrvalue (&retval), whence) ?: retval);
 }
 weak_alias (__llseek, llseek)
 strong_alias (__llseek, __libc_lseek64)