system/glibc
3
0
Fork 0
Code Issues Projects Releases Wiki Activity

__ASSUME_FALLOCATE is always true on 32-bit architectures

Browse Source 
This means we can clean up the generic code a bit.  The 64-bit
variant still needs to support !__ASSUME_FALLOCATE for alpha.
This commit is contained in:
Florian Weimer 2015-04-24 13:50:18 +02:00
parent 4bd40bcf44
commit d0ccd0d977
6 changed files with 45 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ChangeLog
View File

@ -1,3 +1,16 @@
2015-05-05 Florian Weimer <fweimer@redhat.com>
* sysdeps/unix/sysv/linux/posix_fallocate.c (posix_fallocate):
Assume __ASSUME_FALLOCATE is always true.
* sysdeps/unix/sysv/linux/posix_fallocate64.c
(__posix_fallocate64_l64): Likweise.
* sysdeps/unix/sysv/linux/mips/mips64/n32/posix_fallocate.c
(posix_fallocate): Likewise.
* sysdeps/unix/sysv/linux/mips/mips64/n32/posix_fallocate64.c
(__posix_fallocate64_l64): Likewise.
* sysdeps/unix/sysv/linux/wordsize-64/posix_fallocate.c
[!__ASSUME_FALLOCATE]: Add comment.
2015-05-05 Florian Weimer <fweimer@redhat.com> 2015-05-05 Florian Weimer <fweimer@redhat.com>
* sysdeps/unix/sysv/linux/i386/Makefile * sysdeps/unix/sysv/linux/i386/Makefile

32
sysdeps/unix/sysv/linux/mips/mips64/n32/posix_fallocate.c
View File

@ -16,42 +16,22 @@
<http://www.gnu.org/licenses/>. */ <http://www.gnu.org/licenses/>. */
#include <fcntl.h> #include <fcntl.h>
#include <kernel-features.h>
#include <sysdep.h> #include <sysdep.h>
#define posix_fallocate static internal_fallocate #define posix_fallocate static internal_fallocate
#include <sysdeps/posix/posix_fallocate.c> #include <sysdeps/posix/posix_fallocate.c>
#undef posix_fallocate #undef posix_fallocate
#if !defined __ASSUME_FALLOCATE && defined __NR_fallocate
int __have_fallocate attribute_hidden;
#endif
/* Reserve storage for the data of the file associated with FD. */ /* Reserve storage for the data of the file associated with FD. */
int int
posix_fallocate (int fd, __off_t offset, __off_t len) posix_fallocate (int fd, __off_t offset, __off_t len)
{ {
#ifdef __NR_fallocate INTERNAL_SYSCALL_DECL (err);
# ifndef __ASSUME_FALLOCATE int res = INTERNAL_SYSCALL (fallocate, err, 4, fd, 0, offset, len);
if (__builtin_expect (__have_fallocate >= 0, 1))
# endif
{
INTERNAL_SYSCALL_DECL (err);
int res = INTERNAL_SYSCALL (fallocate, err, 4, fd, 0, offset, len);
if (! INTERNAL_SYSCALL_ERROR_P (res, err))
return 0;
# ifndef __ASSUME_FALLOCATE
if (__builtin_expect (INTERNAL_SYSCALL_ERRNO (res, err) == ENOSYS, 0))
__have_fallocate = -1;
else
# endif
if (INTERNAL_SYSCALL_ERRNO (res, err) != EOPNOTSUPP)
return INTERNAL_SYSCALL_ERRNO (res, err);
}
#endif
if (! INTERNAL_SYSCALL_ERROR_P (res, err))
return 0;
if (INTERNAL_SYSCALL_ERRNO (res, err) != EOPNOTSUPP)
return INTERNAL_SYSCALL_ERRNO (res, err);
return internal_fallocate (fd, offset, len); return internal_fallocate (fd, offset, len);
} }

33
sysdeps/unix/sysv/linux/mips/mips64/n32/posix_fallocate64.c
View File

@ -16,7 +16,6 @@
<http://www.gnu.org/licenses/>. */ <http://www.gnu.org/licenses/>. */
#include <fcntl.h> #include <fcntl.h>
#include <kernel-features.h>
#include <sysdep.h> #include <sysdep.h>
extern int __posix_fallocate64_l64 (int fd, __off64_t offset, __off64_t len); extern int __posix_fallocate64_l64 (int fd, __off64_t offset, __off64_t len);
@ -24,36 +23,16 @@ extern int __posix_fallocate64_l64 (int fd, __off64_t offset, __off64_t len);
#include <sysdeps/posix/posix_fallocate64.c> #include <sysdeps/posix/posix_fallocate64.c>
#undef __posix_fallocate64_l64 #undef __posix_fallocate64_l64
#if !defined __ASSUME_FALLOCATE && defined __NR_fallocate
/* Defined in posix_fallocate.c. */
extern int __have_fallocate attribute_hidden;
#endif
/* Reserve storage for the data of the file associated with FD. */ /* Reserve storage for the data of the file associated with FD. */
int int
__posix_fallocate64_l64 (int fd, __off64_t offset, __off64_t len) __posix_fallocate64_l64 (int fd, __off64_t offset, __off64_t len)
{ {
#ifdef __NR_fallocate INTERNAL_SYSCALL_DECL (err);
# ifndef __ASSUME_FALLOCATE int res = INTERNAL_SYSCALL (fallocate, err, 4, fd, 0, offset, len);
if (__builtin_expect (__have_fallocate >= 0, 1))
# endif
{
INTERNAL_SYSCALL_DECL (err);
int res = INTERNAL_SYSCALL (fallocate, err, 4, fd, 0, offset, len);
if (! INTERNAL_SYSCALL_ERROR_P (res, err))
return 0;
# ifndef __ASSUME_FALLOCATE
if (__builtin_expect (INTERNAL_SYSCALL_ERRNO (res, err) == ENOSYS, 0))
__have_fallocate = -1;
else
# endif
if (INTERNAL_SYSCALL_ERRNO (res, err) != EOPNOTSUPP)
return INTERNAL_SYSCALL_ERRNO (res, err);
}
#endif
if (! INTERNAL_SYSCALL_ERROR_P (res, err))
return 0;
if (INTERNAL_SYSCALL_ERRNO (res, err) != EOPNOTSUPP)
return INTERNAL_SYSCALL_ERRNO (res, err);
return internal_fallocate64 (fd, offset, len); return internal_fallocate64 (fd, offset, len);
} }

36
sysdeps/unix/sysv/linux/posix_fallocate.c
View File

@ -16,44 +16,24 @@
<http://www.gnu.org/licenses/>. */ <http://www.gnu.org/licenses/>. */
#include <fcntl.h> #include <fcntl.h>
#include <kernel-features.h>
#include <sysdep.h> #include <sysdep.h>
#define posix_fallocate static internal_fallocate #define posix_fallocate static internal_fallocate
#include <sysdeps/posix/posix_fallocate.c> #include <sysdeps/posix/posix_fallocate.c>
#undef posix_fallocate #undef posix_fallocate
#if !defined __ASSUME_FALLOCATE && defined __NR_fallocate
int __have_fallocate attribute_hidden;
#endif
/* Reserve storage for the data of the file associated with FD. */ /* Reserve storage for the data of the file associated with FD. */
int int
posix_fallocate (int fd, __off_t offset, __off_t len) posix_fallocate (int fd, __off_t offset, __off_t len)
{ {
#ifdef __NR_fallocate INTERNAL_SYSCALL_DECL (err);
# ifndef __ASSUME_FALLOCATE int res = INTERNAL_SYSCALL (fallocate, err, 6, fd, 0,
if (__glibc_likely (__have_fallocate >= 0)) __LONG_LONG_PAIR (offset >> 31, offset),
# endif __LONG_LONG_PAIR (len >> 31, len));
{
INTERNAL_SYSCALL_DECL (err);
int res = INTERNAL_SYSCALL (fallocate, err, 6, fd, 0,
__LONG_LONG_PAIR (offset >> 31, offset),
__LONG_LONG_PAIR (len >> 31, len));
if (! INTERNAL_SYSCALL_ERROR_P (res, err))
return 0;
# ifndef __ASSUME_FALLOCATE
if (__glibc_unlikely (INTERNAL_SYSCALL_ERRNO (res, err) == ENOSYS))
__have_fallocate = -1;
else
# endif
if (INTERNAL_SYSCALL_ERRNO (res, err) != EOPNOTSUPP)
return INTERNAL_SYSCALL_ERRNO (res, err);
}
#endif
if (! INTERNAL_SYSCALL_ERROR_P (res, err))
return 0;
if (INTERNAL_SYSCALL_ERRNO (res, err) != EOPNOTSUPP)
return INTERNAL_SYSCALL_ERRNO (res, err);
return internal_fallocate (fd, offset, len); return internal_fallocate (fd, offset, len);
} }

41
sysdeps/unix/sysv/linux/posix_fallocate64.c
View File

@ -16,7 +16,6 @@
<http://www.gnu.org/licenses/>. */ <http://www.gnu.org/licenses/>. */
#include <fcntl.h> #include <fcntl.h>
#include <kernel-features.h>
#include <sysdep.h> #include <sysdep.h>
extern int __posix_fallocate64_l64 (int fd, __off64_t offset, __off64_t len); extern int __posix_fallocate64_l64 (int fd, __off64_t offset, __off64_t len);
@ -24,40 +23,20 @@ extern int __posix_fallocate64_l64 (int fd, __off64_t offset, __off64_t len);
#include <sysdeps/posix/posix_fallocate64.c> #include <sysdeps/posix/posix_fallocate64.c>
#undef __posix_fallocate64_l64 #undef __posix_fallocate64_l64
#if !defined __ASSUME_FALLOCATE && defined __NR_fallocate
/* Defined in posix_fallocate.c. */
extern int __have_fallocate attribute_hidden;
#endif
/* Reserve storage for the data of the file associated with FD. */ /* Reserve storage for the data of the file associated with FD. */
int int
__posix_fallocate64_l64 (int fd, __off64_t offset, __off64_t len) __posix_fallocate64_l64 (int fd, __off64_t offset, __off64_t len)
{ {
#ifdef __NR_fallocate INTERNAL_SYSCALL_DECL (err);
# ifndef __ASSUME_FALLOCATE int res = INTERNAL_SYSCALL (fallocate, err, 6, fd, 0,
if (__glibc_likely (__have_fallocate >= 0)) __LONG_LONG_PAIR ((long int) (offset >> 32),
# endif (long int) offset),
{ __LONG_LONG_PAIR ((long int) (len >> 32),
INTERNAL_SYSCALL_DECL (err); (long int) len));
int res = INTERNAL_SYSCALL (fallocate, err, 6, fd, 0,
__LONG_LONG_PAIR ((long int) (offset >> 32),
(long int) offset),
__LONG_LONG_PAIR ((long int) (len >> 32),
(long int) len));
if (! INTERNAL_SYSCALL_ERROR_P (res, err))
return 0;
# ifndef __ASSUME_FALLOCATE
if (__glibc_unlikely (INTERNAL_SYSCALL_ERRNO (res, err) == ENOSYS))
__have_fallocate = -1;
else
# endif
if (INTERNAL_SYSCALL_ERRNO (res, err) != EOPNOTSUPP)
return INTERNAL_SYSCALL_ERRNO (res, err);
}
#endif
if (! INTERNAL_SYSCALL_ERROR_P (res, err))
return 0;
if (INTERNAL_SYSCALL_ERRNO (res, err) != EOPNOTSUPP)
return INTERNAL_SYSCALL_ERRNO (res, err);
return internal_fallocate64 (fd, offset, len); return internal_fallocate64 (fd, offset, len);
} }

2
sysdeps/unix/sysv/linux/wordsize-64/posix_fallocate.c
View File

@ -23,6 +23,8 @@
#include <sysdeps/posix/posix_fallocate.c> #include <sysdeps/posix/posix_fallocate.c>
#undef posix_fallocate #undef posix_fallocate
/* The alpha architecture introduced the fallocate system call in
2.6.33-rc1, so we still need the fallback code. */
#if !defined __ASSUME_FALLOCATE && defined __NR_fallocate #if !defined __ASSUME_FALLOCATE && defined __NR_fallocate
static int __have_fallocate; static int __have_fallocate;
#endif #endif