* [PATCH] Fix preadv, pwritev and fallocate for -D_FILE_OFFSET_BITS=64
@ 2009-11-04 21:59 Jakub Jelinek
0 siblings, 0 replies; only message in thread
From: Jakub Jelinek @ 2009-11-04 21:59 UTC (permalink / raw)
To: Glibc hackers
Hi!
As reported in http://bugzilla.redhat.com/533063 , preadv/pwritev prototypes
are wrong on 32-bit arches with -D_FILE_OFFSET_BITS=64 and as I've just
found, fallocate is wrong too.
The problem is that only off_t is remapped to the 64-bit type transparently,
__off_t is not.
Fixed thusly.
2009-11-04 Jakub Jelinek <jakub@redhat.com>
* misc/sys/uio.h (preadv, pwritev): Fix type of last argument
when -D_FILE_OFFSET_BITS=64.
* sysdeps/unix/sysv/linux/ia64/bits/fcntl.h (fallocate): Fix types
of last two arguments when -D_FILE_OFFSET_BITS=64.
* sysdeps/unix/sysv/linux/i386/bits/fcntl.h (fallocate): Likewise.
* sysdeps/unix/sysv/linux/s390/bits/fcntl.h (fallocate): Likewise.
* sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h (fallocate): Likewise.
* sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h (fallocate): Likewise.
* sysdeps/unix/sysv/linux/sparc/bits/fcntl.h (fallocate): Likewise.
* sysdeps/unix/sysv/linux/sh/bits/fcntl.h (fallocate): Likewise.
--- libc/misc/sys/uio.h.jj 2009-05-16 19:23:36.000000000 +0200
+++ libc/misc/sys/uio.h 2009-11-04 22:40:37.000000000 +0100
@@ -80,10 +80,10 @@ extern ssize_t pwritev (int __fd, __cons
# else
# ifdef __REDIRECT
extern ssize_t __REDIRECT (preadv, (int __fd, __const struct iovec *__iovec,
- int __count, __off_t __offset),
+ int __count, __off64_t __offset),
preadv64) __wur;
extern ssize_t __REDIRECT (pwritev, (int __fd, __const struct iovec *__iovec,
- int __count, __off_t __offset),
+ int __count, __off64_t __offset),
pwritev64) __wur;
# else
# define preadv preadv64
--- libc/sysdeps/unix/sysv/linux/ia64/bits/fcntl.h.jj 2009-11-02 13:54:31.000000000 +0100
+++ libc/sysdeps/unix/sysv/linux/ia64/bits/fcntl.h 2009-11-04 22:43:43.000000000 +0100
@@ -253,8 +253,8 @@ extern ssize_t tee (int __fdin, int __fd
extern int fallocate (int __fd, int __mode, __off_t __offset, __off_t __len);
# else
# ifdef __REDIRECT
-extern int __REDIRECT (fallocate, (int __fd, int __mode, __off_t __offset,
- __off_t __len),
+extern int __REDIRECT (fallocate, (int __fd, int __mode, __off64_t __offset,
+ __off64_t __len),
fallocate64);
# else
# define fallocate fallocate64
--- libc/sysdeps/unix/sysv/linux/i386/bits/fcntl.h.jj 2009-11-02 13:54:31.000000000 +0100
+++ libc/sysdeps/unix/sysv/linux/i386/bits/fcntl.h 2009-11-04 22:43:54.000000000 +0100
@@ -259,8 +259,8 @@ extern ssize_t tee (int __fdin, int __fd
extern int fallocate (int __fd, int __mode, __off_t __offset, __off_t __len);
# else
# ifdef __REDIRECT
-extern int __REDIRECT (fallocate, (int __fd, int __mode, __off_t __offset,
- __off_t __len),
+extern int __REDIRECT (fallocate, (int __fd, int __mode, __off64_t __offset,
+ __off64_t __len),
fallocate64);
# else
# define fallocate fallocate64
--- libc/sysdeps/unix/sysv/linux/s390/bits/fcntl.h.jj 2009-11-02 13:54:31.000000000 +0100
+++ libc/sysdeps/unix/sysv/linux/s390/bits/fcntl.h 2009-11-04 22:44:06.000000000 +0100
@@ -279,8 +279,8 @@ extern ssize_t tee (int __fdin, int __fd
extern int fallocate (int __fd, int __mode, __off_t __offset, __off_t __len);
# else
# ifdef __REDIRECT
-extern int __REDIRECT (fallocate, (int __fd, int __mode, __off_t __offset,
- __off_t __len),
+extern int __REDIRECT (fallocate, (int __fd, int __mode, __off64_t __offset,
+ __off64_t __len),
fallocate64);
# else
# define fallocate fallocate64
--- libc/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h.jj 2009-11-02 13:54:31.000000000 +0100
+++ libc/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h 2009-11-04 22:44:23.000000000 +0100
@@ -259,8 +259,8 @@ extern ssize_t tee (int __fdin, int __fd
extern int fallocate (int __fd, int __mode, __off_t __offset, __off_t __len);
# else
# ifdef __REDIRECT
-extern int __REDIRECT (fallocate, (int __fd, int __mode, __off_t __offset,
- __off_t __len),
+extern int __REDIRECT (fallocate, (int __fd, int __mode, __off64_t __offset,
+ __off64_t __len),
fallocate64);
# else
# define fallocate fallocate64
--- libc/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h.jj 2009-11-02 13:54:31.000000000 +0100
+++ libc/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h 2009-11-04 22:44:31.000000000 +0100
@@ -273,8 +273,8 @@ extern ssize_t tee (int __fdin, int __fd
extern int fallocate (int __fd, int __mode, __off_t __offset, __off_t __len);
# else
# ifdef __REDIRECT
-extern int __REDIRECT (fallocate, (int __fd, int __mode, __off_t __offset,
- __off_t __len),
+extern int __REDIRECT (fallocate, (int __fd, int __mode, __off64_t __offset,
+ __off64_t __len),
fallocate64);
# else
# define fallocate fallocate64
--- libc/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h.jj 2009-11-02 13:54:31.000000000 +0100
+++ libc/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h 2009-11-04 22:44:38.000000000 +0100
@@ -278,8 +278,8 @@ extern ssize_t tee (int __fdin, int __fd
extern int fallocate (int __fd, int __mode, __off_t __offset, __off_t __len);
# else
# ifdef __REDIRECT
-extern int __REDIRECT (fallocate, (int __fd, int __mode, __off_t __offset,
- __off_t __len),
+extern int __REDIRECT (fallocate, (int __fd, int __mode, __off64_t __offset,
+ __off64_t __len),
fallocate64);
# else
# define fallocate fallocate64
--- libc/sysdeps/unix/sysv/linux/sh/bits/fcntl.h.jj 2009-11-02 13:54:31.000000000 +0100
+++ libc/sysdeps/unix/sysv/linux/sh/bits/fcntl.h 2009-11-04 22:44:47.000000000 +0100
@@ -259,8 +259,8 @@ extern ssize_t tee (int __fdin, int __fd
extern int fallocate (int __fd, int __mode, __off_t __offset, __off_t __len);
# else
# ifdef __REDIRECT
-extern int __REDIRECT (fallocate, (int __fd, int __mode, __off_t __offset,
- __off_t __len),
+extern int __REDIRECT (fallocate, (int __fd, int __mode, __off64_t __offset,
+ __off64_t __len),
fallocate64);
# else
# define fallocate fallocate64
Jakub
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2009-11-04 21:59 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-11-04 21:59 [PATCH] Fix preadv, pwritev and fallocate for -D_FILE_OFFSET_BITS=64 Jakub Jelinek
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).