From 9e74047542cbe90bd63660638ceb30313327027f Mon Sep 17 00:00:00 2001 From: "Peter S. Mazinger" Date: Wed, 6 Apr 2011 15:36:54 +0200 Subject: posix_fadvise: make posix_fadvise[64] similar on all archs Remove all versions, that can be covered by the common one. Drop incorrectly implemented fallback support, if __NR_fadvise64_64 is not available. To support 64 bit ppc, move ppc support into common. Cleanup including headers. Signed-off-by: Peter S. Mazinger Signed-off-by: Bernhard Reutner-Fischer --- libc/sysdeps/linux/common/posix_fadvise.c | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) (limited to 'libc/sysdeps/linux/common/posix_fadvise.c') diff --git a/libc/sysdeps/linux/common/posix_fadvise.c b/libc/sysdeps/linux/common/posix_fadvise.c index 84b7c40d0..22df56982 100644 --- a/libc/sysdeps/linux/common/posix_fadvise.c +++ b/libc/sysdeps/linux/common/posix_fadvise.c @@ -9,23 +9,31 @@ */ #include -#include #ifdef __NR_fadvise64 -#define __NR_posix_fadvise __NR_fadvise64 +# include +# include +# include + int posix_fadvise(int fd, off_t offset, off_t len, int advice) { int ret; INTERNAL_SYSCALL_DECL(err); - ret = (int) (INTERNAL_SYSCALL(posix_fadvise, err, 5, fd, - __LONG_LONG_PAIR (offset >> 31, offset), len, advice)); - if (INTERNAL_SYSCALL_ERROR_P (ret, err)) - return INTERNAL_SYSCALL_ERRNO (ret, err); - return 0; +# if __WORDSIZE == 64 + ret = INTERNAL_SYSCALL(fadvise64, err, 4, fd, offset, len, advice); +# else +# ifdef __powerpc__ + ret = INTERNAL_SYSCALL(fadvise64, err, 6, fd, /*unused*/0, +# else + ret = INTERNAL_SYSCALL(fadvise64, err, 5, fd, +# endif + __LONG_LONG_PAIR (offset >> 31, offset), len, advice); +# endif + if (INTERNAL_SYSCALL_ERROR_P (ret, err)) + return INTERNAL_SYSCALL_ERRNO (ret, err); + return 0; } - -# if defined __UCLIBC_HAS_LFS__ && !defined __NR_fadvise64_64 +# if defined __UCLIBC_HAS_LFS__ && (!defined __NR_fadvise64_64 || __WORDSIZE == 64) strong_alias(posix_fadvise,posix_fadvise64) # endif - #endif -- cgit v1.2.3