summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2009-04-16 06:26:59 +0000
committerJakub Jelinek <jakub@redhat.com>2009-04-16 06:26:59 +0000
commit66f8b81220a9afb6405e2714eff1edb0eab2c783 (patch)
tree8eaa54ca342f03e264a5b283df4face9d551b3c7
parentdc3be966c0050d3847ab528387801b9c93a2f831 (diff)
Updated to fedora-glibc-20090416T0610cvs/fedora-glibc-2_9_90-18
-rw-r--r--ChangeLog1
-rw-r--r--fedora/branch.mk4
-rw-r--r--fedora/glibc.spec.in6
-rw-r--r--sysdeps/unix/sysv/linux/fallocate.c2
-rw-r--r--sysdeps/unix/sysv/linux/fallocate64.c2
-rw-r--r--sysdeps/unix/sysv/linux/wordsize-64/fallocate.c5
6 files changed, 15 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 609ae61280..37ee696fda 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,6 +22,7 @@
* sysdeps/unix/sysv/linux/fallocate.c: Handle old kernel headers.
* sysdeps/unix/sysv/linux/fallocate64.c: Likewise.
+ * sysdeps/unix/sysv/linux/wordsize-64/fallocate.c: Likewise.
2009-03-25 Andrew Stubbs <ams@codesourcery.com>
diff --git a/fedora/branch.mk b/fedora/branch.mk
index 507bd62742..d8505286dd 100644
--- a/fedora/branch.mk
+++ b/fedora/branch.mk
@@ -3,5 +3,5 @@ glibc-branch := fedora
glibc-base := HEAD
DIST_BRANCH := devel
COLLECTION := dist-f8
-fedora-sync-date := 2009-04-15 16:19 UTC
-fedora-sync-tag := fedora-glibc-20090415T1619
+fedora-sync-date := 2009-04-16 06:10 UTC
+fedora-sync-tag := fedora-glibc-20090416T0610
diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in
index 5c76e5a408..93e24c9240 100644
--- a/fedora/glibc.spec.in
+++ b/fedora/glibc.spec.in
@@ -19,7 +19,7 @@
Summary: The GNU libc libraries
Name: glibc
Version: @glibcversion@
-Release: 17
+Release: 18
# GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries.
# Things that are linked directly into dynamically linked programs
# and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional
@@ -1009,6 +1009,10 @@ rm -f *.filelist*
%endif
%changelog
+* Thu Apr 16 2009 Jakub Jelinek <jakub@redhat.com> 2.9.90-18
+- update from trunk
+ - fix fallocate
+
* Wed Apr 15 2009 Jakub Jelinek <jakub@redhat.com> 2.9.90-17
- update from trunk
- if threads have very small stack sizes, use much smaller buffer
diff --git a/sysdeps/unix/sysv/linux/fallocate.c b/sysdeps/unix/sysv/linux/fallocate.c
index 116f00046e..dc2b4e92ca 100644
--- a/sysdeps/unix/sysv/linux/fallocate.c
+++ b/sysdeps/unix/sysv/linux/fallocate.c
@@ -25,7 +25,7 @@
int
fallocate (int fd, int mode, __off_t offset, __off_t len)
{
-#ifndef __NR_fallocate
+#ifdef __NR_fallocate
return INLINE_SYSCALL (fallocate, 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
index 2fbe988910..ebcaf671b3 100644
--- a/sysdeps/unix/sysv/linux/fallocate64.c
+++ b/sysdeps/unix/sysv/linux/fallocate64.c
@@ -25,7 +25,7 @@
int
__fallocate64_l64 (int fd, int mode, __off64_t offset, __off64_t len)
{
-#ifndef __NR_fallocate
+#ifdef __NR_fallocate
return INLINE_SYSCALL (fallocate, 6, fd, mode,
__LONG_LONG_PAIR ((long int) (offset >> 32),
(long int) offset),
diff --git a/sysdeps/unix/sysv/linux/wordsize-64/fallocate.c b/sysdeps/unix/sysv/linux/wordsize-64/fallocate.c
index 0eabab9781..3e8954f0b7 100644
--- a/sysdeps/unix/sysv/linux/wordsize-64/fallocate.c
+++ b/sysdeps/unix/sysv/linux/wordsize-64/fallocate.c
@@ -25,6 +25,11 @@
int
fallocate (int fd, int mode, __off_t offset, __off_t len)
{
+#ifdef __NR_fallocate
return INLINE_SYSCALL (fallocate, 4, fd, mode, offset, len);
+#else
+ __set_errno (ENOSYS);
+ return -1;
+#endif
}
strong_alias (fallocate, fallocate64)