From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 2209 invoked by alias); 1 Aug 2007 09:48:32 -0000 Received: (qmail 2192 invoked by uid 22791); 1 Aug 2007 09:48:31 -0000 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.31) with ESMTP; Wed, 01 Aug 2007 09:48:25 +0000 Received: from sunsite.mff.cuni.cz (localhost.localdomain [127.0.0.1]) by sunsite.mff.cuni.cz (8.13.8/8.13.8) with ESMTP id l719r8FY022420; Wed, 1 Aug 2007 11:53:08 +0200 Received: (from jakub@localhost) by sunsite.mff.cuni.cz (8.13.8/8.13.8/Submit) id l719r8Fq022419; Wed, 1 Aug 2007 11:53:08 +0200 Date: Wed, 01 Aug 2007 09:48:00 -0000 From: Jakub Jelinek To: Ulrich Drepper Cc: Glibc hackers Subject: [PATCH] Fix posix_fallocate{,64} on i386 Message-ID: <20070801095307.GC4603@sunsite.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.4.2.2i 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: 2007-08/txt/msg00000.txt.bz2 Hi! On i386 INTERNAL_SYSCALL doesn't support 6 argument syscalls, but as we for !__ASSUME_FALLOCATE case need a fallback written in C, we can't just code the whole routine as i386/posix_fallocate{,64}.S. Fortunately PSEUDO_* handles 6 argument syscalls. I used __fallocate64, so that if we decide to export the fallocate syscall in addition to posix_fallocate{,64}, it doesn't clash with the private internal helper for posix_fallocate* if we decide it should return -1 and set errno on error rather than return 0 or error value directly. 2007-08-01 Jakub Jelinek * sysdeps/unix/sysv/linux/i386/syscalls.list (fallocate): Add fallocate syscall as __fallocate64. * sysdeps/unix/sysv/linux/i386/posix_fallocate.c: New file. * sysdeps/unix/sysv/linux/i386/posix_fallocate64.c: New file. --- libc/sysdeps/unix/sysv/linux/i386/syscalls.list.jj 2005-12-20 08:52:13.000000000 +0100 +++ libc/sysdeps/unix/sysv/linux/i386/syscalls.list 2007-08-01 11:33:03.000000000 +0200 @@ -6,3 +6,4 @@ vm86 - vm86 i:ip __vm86 vm86@@GLIBC_2 oldgetrlimit EXTRA getrlimit i:ip __old_getrlimit getrlimit@GLIBC_2.0 oldsetrlimit EXTRA setrlimit i:ip __old_setrlimit setrlimit@GLIBC_2.0 waitpid - waitpid Ci:ipi __waitpid waitpid __libc_waitpid +fallocate64 EXTRA fallocate Vi:iiiiii __fallocate64 --- libc/sysdeps/unix/sysv/linux/i386/posix_fallocate.c.jj 2007-08-01 11:14:15.000000000 +0200 +++ libc/sysdeps/unix/sysv/linux/i386/posix_fallocate.c 2007-08-01 11:34:04.000000000 +0200 @@ -0,0 +1,58 @@ +/* Copyright (C) 2007 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 + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + 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. */ + +#include +#include +#include + +#define posix_fallocate static internal_fallocate +#include +#undef posix_fallocate + +#if !defined __ASSUME_FALLOCATE && defined __NR_fallocate +int __have_fallocate attribute_hidden; +#endif + +extern int __fallocate64 (int fd, int mode, __off64_t offset, __off64_t len) + attribute_hidden; + +/* Reserve storage for the data of the file associated with FD. */ +int +posix_fallocate (int fd, __off_t offset, __off_t len) +{ +#ifdef __NR_fallocate +# ifndef __ASSUME_FALLOCATE + if (__builtin_expect (__have_fallocate >= 0, 1)) +# endif + { + int res = __fallocate64 (fd, 0, offset, len); + if (! res) + return 0; + +# ifndef __ASSUME_FALLOCATE + if (__builtin_expect (res == ENOSYS, 0)) + __have_fallocate = -1; + else +# endif + if (res != EOPNOTSUPP) + return res; + } +#endif + + return internal_fallocate (fd, offset, len); +} --- libc/sysdeps/unix/sysv/linux/i386/posix_fallocate64.c.jj 2007-08-01 11:14:18.000000000 +0200 +++ libc/sysdeps/unix/sysv/linux/i386/posix_fallocate64.c 2007-08-01 11:34:22.000000000 +0200 @@ -0,0 +1,61 @@ +/* Copyright (C) 2007 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 + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + 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. */ + +#include +#include +#include + +extern int __posix_fallocate64_l64 (int fd, __off64_t offset, __off64_t len); +#define __posix_fallocate64_l64 static internal_fallocate64 +#include +#undef __posix_fallocate64_l64 + +#if !defined __ASSUME_FALLOCATE && defined __NR_fallocate +/* Defined in posix_fallocate.c. */ +extern int __have_fallocate attribute_hidden; +#endif + +extern int __fallocate64 (int fd, int mode, __off64_t offset, __off64_t len) + attribute_hidden; + +/* Reserve storage for the data of the file associated with FD. */ +int +__posix_fallocate64_l64 (int fd, __off64_t offset, __off64_t len) +{ +#ifdef __NR_fallocate +# ifndef __ASSUME_FALLOCATE + if (__builtin_expect (__have_fallocate >= 0, 1)) +# endif + { + int res = __fallocate64 (fd, 0, offset, len); + + if (! res) + return 0; + +# ifndef __ASSUME_FALLOCATE + if (__builtin_expect (res == ENOSYS, 0)) + __have_fallocate = -1; + else +# endif + if (res != EOPNOTSUPP) + return res; + } +#endif + + return internal_fallocate64 (fd, offset, len); +} Jakub