diff --git a/ChangeLog b/ChangeLog index d83fc5ef2b..6c9ec184e6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +2009-03-02 Ulrich Drepper + + * sysdeps/unix/sysv/linux/fallocate.c: New file. + * sysdeps/unix/sysv/linux/fallocate64.c: New file. + * sysdeps/unix/sysv/linux/wordsize-64/fallocate64.c: New file. + * sysdeps/unix/sysv/linux/wordsize-64/fallocate.c: New file. + * sysdeps/unix/sysv/linux/i386/fallocate64.c: New file. + * sysdeps/unix/sysv/linux/i386/fallocate.c: New file. + * sysdeps/unix/sysv/linux/Versions: Export fallocate and fallocate64 + for GLIBC_2.10. + * sysdeps/unix/sysv/linux/Makefile [subdir=io] (sysdep_routines): + Add fallocate and fallocate64. + + * io/fcntl.h: Pretty printing. + 2009-03-02 Richard Guenther * misc/sys/cdefs.h (__extern_always_inline): Add __artificial__ diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile index c93538c1ea..170c042dd1 100644 --- a/sysdeps/unix/sysv/linux/Makefile +++ b/sysdeps/unix/sysv/linux/Makefile @@ -139,7 +139,7 @@ endif ifeq ($(subdir),io) sysdep_routines += xstatconv internal_statvfs internal_statvfs64 \ - sync_file_range open_2 open64_2 + sync_file_range open_2 open64_2 fallocate fallocate64 endif ifeq ($(subdir),elf) diff --git a/sysdeps/unix/sysv/linux/Versions b/sysdeps/unix/sysv/linux/Versions index 76ecae0013..b348570bda 100644 --- a/sysdeps/unix/sysv/linux/Versions +++ b/sysdeps/unix/sysv/linux/Versions @@ -138,6 +138,9 @@ libc { GLIBC_2.9 { epoll_create1; inotify_init1; } + GLIBC_2.10 { + fallocate; fallocate64; + } GLIBC_PRIVATE { # functions used in other libraries __syscall_rt_sigqueueinfo; diff --git a/sysdeps/unix/sysv/linux/fallocate.c b/sysdeps/unix/sysv/linux/fallocate.c new file mode 100644 index 0000000000..f65864f3f1 --- /dev/null +++ b/sysdeps/unix/sysv/linux/fallocate.c @@ -0,0 +1,30 @@ +/* Copyright (C) 2007, 2009 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 + + +/* Reserve storage for the data of the file associated with FD. */ +int +fallocate (int fd, int mode, __off_t offset, __off_t len) +{ + return INLINE_SYSCALL (fallocate, err, 6, fd, mode, + __LONG_LONG_PAIR (offset >> 31, offset), + __LONG_LONG_PAIR (len >> 31, len)); +} diff --git a/sysdeps/unix/sysv/linux/fallocate64.c b/sysdeps/unix/sysv/linux/fallocate64.c new file mode 100644 index 0000000000..b20486df39 --- /dev/null +++ b/sysdeps/unix/sysv/linux/fallocate64.c @@ -0,0 +1,32 @@ +/* Copyright (C) 2007, 2009 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 + + +/* Reserve storage for the data of the file associated with FD. */ +int +__fallocate64_l64 (int fd, int mode, __off64_t offset, __off64_t len) +{ + return INLINE_SYSCALL (fallocate, 6, fd, mode, + __LONG_LONG_PAIR ((long int) (offset >> 32), + (long int) offset), + __LONG_LONG_PAIR ((long int) (len >> 32), + (long int) len)); +} diff --git a/sysdeps/unix/sysv/linux/i386/fallocate.c b/sysdeps/unix/sysv/linux/i386/fallocate.c new file mode 100644 index 0000000000..7a943e44c0 --- /dev/null +++ b/sysdeps/unix/sysv/linux/i386/fallocate.c @@ -0,0 +1,32 @@ +/* Copyright (C) 2007, 2009 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 + + +extern int __call_fallocate (int fd, int mode, __off64_t offset, __off64_t len) + attribute_hidden; + + +/* Reserve storage for the data of the file associated with FD. */ +int +fallocate (int fd, int mode, __off_t offset, __off_t len) +{ + return __call_fallocate (fd, mode, offset, len); +} diff --git a/sysdeps/unix/sysv/linux/i386/fallocate64.c b/sysdeps/unix/sysv/linux/i386/fallocate64.c new file mode 100644 index 0000000000..b744710a96 --- /dev/null +++ b/sysdeps/unix/sysv/linux/i386/fallocate64.c @@ -0,0 +1,32 @@ +/* Copyright (C) 2007, 2009 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 + + +extern int __call_fallocate (int fd, int mode, __off64_t offset, __off64_t len) + attribute_hidden; + + +/* Reserve storage for the data of the file associated with FD. */ +int +__fallocate64_l64 (int fd, int mode, __off64_t offset, __off64_t len) +{ + return __call_fallocate (fd, mode, offset, len); +} diff --git a/sysdeps/unix/sysv/linux/wordsize-64/fallocate.c b/sysdeps/unix/sysv/linux/wordsize-64/fallocate.c new file mode 100644 index 0000000000..c89e318819 --- /dev/null +++ b/sysdeps/unix/sysv/linux/wordsize-64/fallocate.c @@ -0,0 +1,29 @@ +/* Copyright (C) 2007, 2009 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 + + +/* Reserve storage for the data of the file associated with FD. */ +int +fallocate (int fd, int mode, __off_t offset, __off_t len) +{ + return INLINE_SYSCALL (fallocate, 4, fd, mode, offset, len); +} +strong_alias (posix_fallocate, posix_fallocate64) diff --git a/sysdeps/unix/sysv/linux/wordsize-64/fallocate64.c b/sysdeps/unix/sysv/linux/wordsize-64/fallocate64.c new file mode 100644 index 0000000000..df33112d6b --- /dev/null +++ b/sysdeps/unix/sysv/linux/wordsize-64/fallocate64.c @@ -0,0 +1 @@ +/* fallocate64 is in posix_fallocate.c */