From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 30882 invoked by alias); 4 Nov 2009 21:59:12 -0000 Received: (qmail 30866 invoked by uid 22791); 4 Nov 2009 21:59:12 -0000 X-SWARE-Spam-Status: No, hits=-2.3 required=5.0 tests=AWL,BAYES_00 X-Spam-Check-By: sourceware.org Received: from sunsite.ms.mff.cuni.cz (HELO sunsite.mff.cuni.cz) (195.113.15.26) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 04 Nov 2009 21:59:07 +0000 Received: from sunsite.mff.cuni.cz (localhost [127.0.0.1]) by sunsite.mff.cuni.cz (8.14.3/8.14.3) with ESMTP id nA4Lx4nL003093 for ; Wed, 4 Nov 2009 22:59:04 +0100 Received: (from jj@localhost) by sunsite.mff.cuni.cz (8.14.3/8.14.3/Submit) id nA4Lx4TH003092 for libc-hacker@sources.redhat.com; Wed, 4 Nov 2009 22:59:04 +0100 Date: Wed, 04 Nov 2009 21:59:00 -0000 From: Jakub Jelinek To: Glibc hackers Subject: [PATCH] Fix preadv, pwritev and fallocate for -D_FILE_OFFSET_BITS=64 Message-ID: <20091104215904.GJ3047@sunsite.ms.mff.cuni.cz> Reply-To: Jakub Jelinek MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.19 (2009-01-05) Mailing-List: contact libc-hacker-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-hacker-owner@sourceware.org X-SW-Source: 2009-11/txt/msg00001.txt.bz2 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 * 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