diff options
| author | Florian Weimer <fweimer@redhat.com> | 2015-04-24 13:50:18 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2015-05-05 08:28:35 +0200 |
| commit | d0ccd0d977df62f0fe0f6c91237613b95f5d5a5f (patch) | |
| tree | 61b625b7a4b8e040654762c661cb2f59e8a70539 /sysdeps/unix/sysv/linux/posix_fallocate64.c | |
| parent | 4bd40bcf44e79e610189d4498c49bba3ecb01c42 (diff) | |
| download | glibc-d0ccd0d977df62f0fe0f6c91237613b95f5d5a5f.tar.gz glibc-d0ccd0d977df62f0fe0f6c91237613b95f5d5a5f.tar.xz glibc-d0ccd0d977df62f0fe0f6c91237613b95f5d5a5f.zip | |
__ASSUME_FALLOCATE is always true on 32-bit architectures
This means we can clean up the generic code a bit. The 64-bit variant still needs to support !__ASSUME_FALLOCATE for alpha.
Diffstat (limited to 'sysdeps/unix/sysv/linux/posix_fallocate64.c')
| -rw-r--r-- | sysdeps/unix/sysv/linux/posix_fallocate64.c | 43 |
1 files changed, 11 insertions, 32 deletions
diff --git a/sysdeps/unix/sysv/linux/posix_fallocate64.c b/sysdeps/unix/sysv/linux/posix_fallocate64.c index 9545459013..771e59cb0b 100644 --- a/sysdeps/unix/sysv/linux/posix_fallocate64.c +++ b/sysdeps/unix/sysv/linux/posix_fallocate64.c @@ -16,7 +16,6 @@ <http://www.gnu.org/licenses/>. */ #include <fcntl.h> -#include <kernel-features.h> #include <sysdep.h> 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> #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. */ int __posix_fallocate64_l64 (int fd, __off64_t offset, __off64_t len) { -#ifdef __NR_fallocate -# ifndef __ASSUME_FALLOCATE - if (__glibc_likely (__have_fallocate >= 0)) -# endif - { - INTERNAL_SYSCALL_DECL (err); - 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 - + INTERNAL_SYSCALL_DECL (err); + 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; + if (INTERNAL_SYSCALL_ERRNO (res, err) != EOPNOTSUPP) + return INTERNAL_SYSCALL_ERRNO (res, err); return internal_fallocate64 (fd, offset, len); } |