* sysdeps/pthread/aio_misc.c (handle_fildes_io): Avoid unnecessary

complications for 64-bit platforms.
This commit is contained in:
Ulrich Drepper 2007-11-10 19:40:16 +00:00
parent 7f745396c4
commit 01e7fdbb74
2 changed files with 8 additions and 3 deletions

View File

@ -1,5 +1,8 @@
2007-11-10 Ulrich Drepper <drepper@redhat.com> 2007-11-10 Ulrich Drepper <drepper@redhat.com>
* sysdeps/pthread/aio_misc.c (handle_fildes_io): Avoid unnecessary
complications for 64-bit platforms.
* sysdeps/unix/sysv/linux/open64.c: Move __open64_2 implementation to.. * sysdeps/unix/sysv/linux/open64.c: Move __open64_2 implementation to..
* sysdeps/unix/sysv/linux/open64_2.c: ...here. New file. * sysdeps/unix/sysv/linux/open64_2.c: ...here. New file.
* sysdeps/unix/sysv/linux/Makefile [subdir=io] (sysdep_routines): Add * sysdeps/unix/sysv/linux/Makefile [subdir=io] (sysdep_routines): Add

View File

@ -1,5 +1,5 @@
/* Handle general operations. /* Handle general operations.
Copyright (C) 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2006 Copyright (C) 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2006, 2007
Free Software Foundation, Inc. Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
@ -512,7 +512,8 @@ handle_fildes_io (void *arg)
by signals. */ by signals. */
if ((aiocbp->aiocb.aio_lio_opcode & 127) == LIO_READ) if ((aiocbp->aiocb.aio_lio_opcode & 127) == LIO_READ)
{ {
if (aiocbp->aiocb.aio_lio_opcode & 128) if (sizeof (off_t) != sizeof (off64_t)
&& aiocbp->aiocb.aio_lio_opcode & 128)
aiocbp->aiocb.__return_value = aiocbp->aiocb.__return_value =
TEMP_FAILURE_RETRY (__pread64 (fildes, (void *) TEMP_FAILURE_RETRY (__pread64 (fildes, (void *)
aiocbp->aiocb64.aio_buf, aiocbp->aiocb64.aio_buf,
@ -537,7 +538,8 @@ handle_fildes_io (void *arg)
} }
else if ((aiocbp->aiocb.aio_lio_opcode & 127) == LIO_WRITE) else if ((aiocbp->aiocb.aio_lio_opcode & 127) == LIO_WRITE)
{ {
if (aiocbp->aiocb.aio_lio_opcode & 128) if (sizeof (off_t) != sizeof (off64_t)
&& aiocbp->aiocb.aio_lio_opcode & 128)
aiocbp->aiocb.__return_value = aiocbp->aiocb.__return_value =
TEMP_FAILURE_RETRY (__pwrite64 (fildes, (const void *) TEMP_FAILURE_RETRY (__pwrite64 (fildes, (const void *)
aiocbp->aiocb64.aio_buf, aiocbp->aiocb64.aio_buf,