summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Arnold <ryanarn@etna.rchland.ibm.com>2009-07-27 16:10:05 -0500
committerRyan Arnold <ryanarn@etna.rchland.ibm.com>2009-07-29 09:58:51 -0500
commitedb28855cd85db391fb3dfd7ba04c53aa5d5395b (patch)
treeffc0074aaf836604660fc2f646d6cc0c473f8a0c
parent6c87b112586e095cee2079c294d9d98ff9443ea6 (diff)
downloadglibc-edb28855cd85db391fb3dfd7ba04c53aa5d5395b.tar.gz
Revert "Add Linux fallocate support."
This reverts commit a14f7dce07b58c6af4d7af89eb596320ecee7f9b.
-rw-r--r--sysdeps/unix/sysv/linux/Makefile2
-rw-r--r--sysdeps/unix/sysv/linux/Versions3
-rw-r--r--sysdeps/unix/sysv/linux/fallocate.c30
-rw-r--r--sysdeps/unix/sysv/linux/fallocate64.c32
-rw-r--r--sysdeps/unix/sysv/linux/i386/fallocate.c32
-rw-r--r--sysdeps/unix/sysv/linux/i386/fallocate64.c32
-rw-r--r--sysdeps/unix/sysv/linux/wordsize-64/fallocate.c29
-rw-r--r--sysdeps/unix/sysv/linux/wordsize-64/fallocate64.c1
8 files changed, 1 insertions, 160 deletions
diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
index 3dcad749e0..ddbb4f68f8 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 fallocate fallocate64
+ sync_file_range open_2 open64_2
endif
ifeq ($(subdir),elf)
diff --git a/sysdeps/unix/sysv/linux/Versions b/sysdeps/unix/sysv/linux/Versions
index af12084add..af4c293c26 100644
--- a/sysdeps/unix/sysv/linux/Versions
+++ b/sysdeps/unix/sysv/linux/Versions
@@ -135,9 +135,6 @@ libc {
GLIBC_2.8 {
timerfd_create; timerfd_settime; timerfd_gettime;
}
- 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
deleted file mode 100644
index f65864f3f1..0000000000
--- a/sysdeps/unix/sysv/linux/fallocate.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/* 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 <fcntl.h>
-#include <sysdep.h>
-
-
-/* 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
deleted file mode 100644
index b20486df39..0000000000
--- a/sysdeps/unix/sysv/linux/fallocate64.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/* 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 <fcntl.h>
-#include <sysdep.h>
-
-
-/* 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
deleted file mode 100644
index 7a943e44c0..0000000000
--- a/sysdeps/unix/sysv/linux/i386/fallocate.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/* 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 <fcntl.h>
-#include <sysdep.h>
-
-
-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
deleted file mode 100644
index b744710a96..0000000000
--- a/sysdeps/unix/sysv/linux/i386/fallocate64.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/* 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 <fcntl.h>
-#include <sysdep.h>
-
-
-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
deleted file mode 100644
index c89e318819..0000000000
--- a/sysdeps/unix/sysv/linux/wordsize-64/fallocate.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/* 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 <fcntl.h>
-#include <sysdep.h>
-
-
-/* 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
deleted file mode 100644
index df33112d6b..0000000000
--- a/sysdeps/unix/sysv/linux/wordsize-64/fallocate64.c
+++ /dev/null
@@ -1 +0,0 @@
-/* fallocate64 is in posix_fallocate.c */