From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id C4123395B058; Fri, 11 Sep 2020 17:36:49 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C4123395B058 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Adhemerval Zanella To: glibc-cvs@sourceware.org Subject: [glibc] linux: Consolidate fxstatat{64} X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella X-Git-Refname: refs/heads/master X-Git-Oldrev: 5febe6a38ff2f87bdb8dd971632c97c916eafd9a X-Git-Newrev: 5f85cc2f4712da0d8dd6f9ebf5f7c563e5b6ff3a Message-Id: <20200911173649.C4123395B058@sourceware.org> Date: Fri, 11 Sep 2020 17:36:49 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Sep 2020 17:36:49 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=5f85cc2f4712da0d8dd6f9ebf5f7c563e5b6ff3a commit 5f85cc2f4712da0d8dd6f9ebf5f7c563e5b6ff3a Author: Adhemerval Zanella Date: Wed Jul 15 18:05:52 2020 +0000 linux: Consolidate fxstatat{64} The LFS support is implemented on fxstat64.c, instead of fxstat.c for 64-bit architectures. The fxstatat.c implements the non-LFS and it is a no-op for !XSTAT_IS_XSTAT64. The generic non-LFS implementation handles two cases: 1. New kABIs which uses generic pre 64-bit time Linux ABI (csky and nios): it issues __NR_fstatat64 plus handle the overflow on st_ino, st_size, or st_blocks. It only handles _STAT_VER_KERNEL. 2. Old kABIs with old non-LFS support (arm, i386, hppa, m68k, mips32, microblaze, s390, sh, powerpc, and sparc32). it issues __NR_fstatat64 and convert to non-LFS stat struct based on the version. Also non-LFS mips64 is an outlier and it has its own implementation since _STAT_VER_LINUX requires a different conversion function (it uses the kernel_stat as the sysissues argument since its exported ABI is different than the kernel one for both non-LFS and LFS implementation). The generic LFS implementation handles multiple cases: 1. XSTAT_IS_XSTAT64 being 1: 1.1. 64-bit kABI (aarch64, ia64, powerpc64*, s390x, riscv64, and x86_64): it issues __NR_newfstatat for _STAT_VER_KERNEL or _STAT_VER_LINUX. 1.2. 64-bit kABI outlier (sparc64): it issuess fstatat64 with a temporary stat64 and convert to output stat64 based on the input version (and using a sparc64 specific __xstat32_conv). 1.3. New 32-bit kABIs with only 64-bit time_t support (arc and riscv32): it issues __NR_statx and covert to struct stat64. 2. Old ABIs with XSTAT_IS_XSTAT64 being 0 (arm, csky, i386, hppa, m68k, microblaze, mips32, nios2, sh, powerpc32, and sparc32): it issues __NR_fstat64. Also, two special cases requires specific implementations: 1. alpha: it uses the __NR_fstatat64 syscall instead. 2. mips64: as for non-LFS implementation its ABIs differ from glibc exported one, which requires an specific conversion function to handle the kernel_stat. Checked with a build for all affected ABIs. I also checked on x86_64, i686, powerpc, powerpc64le, sparcv9, sparc64, s390, and s390x. Reviewed-by: Lukasz Majewski Diff: --- sysdeps/unix/sysv/linux/Makefile | 3 +- sysdeps/unix/sysv/linux/alpha/dl-fxstatat64.c | 1 - sysdeps/unix/sysv/linux/alpha/fxstatat.c | 52 ----------------- .../{generic/wordsize-32 => alpha}/fxstatat64.c | 35 ++++++------ sysdeps/unix/sysv/linux/arm/fxstatat.c | 1 - sysdeps/unix/sysv/linux/fxstatat.c | 53 +++++++----------- sysdeps/unix/sysv/linux/fxstatat64.c | 65 +++++++++++++--------- .../unix/sysv/linux/generic/wordsize-32/fxstatat.c | 56 ------------------- sysdeps/unix/sysv/linux/hppa/fxstatat.c | 1 - sysdeps/unix/sysv/linux/i386/fxstatat.c | 54 ------------------ sysdeps/unix/sysv/linux/m68k/fxstatat.c | 1 - sysdeps/unix/sysv/linux/microblaze/fxstatat.c | 1 - sysdeps/unix/sysv/linux/mips/mips32/fxstatat.c | 1 - .../linux/{wordsize-64 => mips/mips64}/fxstatat.c | 33 +++-------- sysdeps/unix/sysv/linux/mips/mips64/fxstatat64.c | 28 ++-------- .../unix/sysv/linux/powerpc/powerpc32/fxstatat.c | 1 - sysdeps/unix/sysv/linux/s390/s390-32/fxstatat.c | 1 - sysdeps/unix/sysv/linux/sh/fxstatat.c | 1 - sysdeps/unix/sysv/linux/sparc/sparc32/fxstatat.c | 1 - .../unix/sysv/linux/sparc/sparc64/dl-fxstatat64.c | 1 - sysdeps/unix/sysv/linux/sparc/sparc64/fxstatat.c | 1 - .../unix/sysv/linux/wordsize-64/dl-fxstatat64.c | 1 - sysdeps/unix/sysv/linux/wordsize-64/fxstatat64.c | 1 - 23 files changed, 92 insertions(+), 301 deletions(-) diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile index 5079f33655..7c87cd5417 100644 --- a/sysdeps/unix/sysv/linux/Makefile +++ b/sysdeps/unix/sysv/linux/Makefile @@ -281,8 +281,7 @@ tests += tst-fallocate tst-fallocate64 tst-o_path-locks endif ifeq ($(subdir),elf) -sysdep-rtld-routines += dl-brk dl-sbrk dl-getcwd dl-openat64 dl-opendir \ - dl-fxstatat64 +sysdep-rtld-routines += dl-brk dl-sbrk dl-getcwd dl-openat64 dl-opendir libof-lddlibc4 = lddlibc4 diff --git a/sysdeps/unix/sysv/linux/alpha/dl-fxstatat64.c b/sysdeps/unix/sysv/linux/alpha/dl-fxstatat64.c deleted file mode 100644 index 330b33f7c7..0000000000 --- a/sysdeps/unix/sysv/linux/alpha/dl-fxstatat64.c +++ /dev/null @@ -1 +0,0 @@ -#include "fxstatat.c" diff --git a/sysdeps/unix/sysv/linux/alpha/fxstatat.c b/sysdeps/unix/sysv/linux/alpha/fxstatat.c deleted file mode 100644 index c5953d250a..0000000000 --- a/sysdeps/unix/sysv/linux/alpha/fxstatat.c +++ /dev/null @@ -1,52 +0,0 @@ -/* Copyright (C) 2005-2020 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, see - . */ - -#define __fxstatat64 __fxstatat64_disable - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#undef __fxstatat64 - -/* Get information about the file NAME in BUF. */ -int -__fxstatat (int vers, int fd, const char *file, struct stat *st, int flag) -{ - int result, errno_out; - - /* ??? The __fxstatat entry point is new enough that it must be using - vers == _STAT_VER_KERNEL64. For the benefit of dl-fxstatat64.c, we - cannot actually check this, lest the compiler not optimize the rest - of the function away. */ - - result = INTERNAL_SYSCALL_CALL (fstatat64, fd, file, st, flag); - if (__glibc_likely (!INTERNAL_SYSCALL_ERROR_P (result))) - return result; - errno_out = INTERNAL_SYSCALL_ERRNO (result); - __set_errno (errno_out); - return -1; -} -libc_hidden_def (__fxstatat) -strong_alias (__fxstatat, __fxstatat64); -libc_hidden_ver(__fxstatat, __fxstatat64); diff --git a/sysdeps/unix/sysv/linux/generic/wordsize-32/fxstatat64.c b/sysdeps/unix/sysv/linux/alpha/fxstatat64.c similarity index 53% rename from sysdeps/unix/sysv/linux/generic/wordsize-32/fxstatat64.c rename to sysdeps/unix/sysv/linux/alpha/fxstatat64.c index 894f6dd396..f10c1d31e8 100644 --- a/sysdeps/unix/sysv/linux/generic/wordsize-32/fxstatat64.c +++ b/sysdeps/unix/sysv/linux/alpha/fxstatat64.c @@ -1,7 +1,6 @@ -/* __fxstatat64 () implementation. - Copyright (C) 2016-2020 Free Software Foundation, Inc. +/* fxstat using old-style Unix stat system call. + Copyright (C) 2004-2020 Free Software Foundation, Inc. This file is part of the GNU C Library. - Contributed by Chris Metcalf , 2011. The GNU C Library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -17,21 +16,21 @@ License along with the GNU C Library. If not, see . */ -/* Hide the prototype for __fxstatat so that GCC will not complain about - the different function signature if it is aliased to __fxstatat64. - If XSTAT_IS_XSTAT64 is set to non-zero then the stat and stat64 structures - have an identical layout but different type names. */ - -#define __fxstatat __fxstatat_disable - +#define __fxstatat __redirect___fxstatat64 #include -#undef _STAT_VER_LINUX -#define _STAT_VER_LINUX _STAT_VER_KERNEL - -#include - #undef __fxstatat -#if XSTAT_IS_XSTAT64 -weak_alias (__fxstatat64, __fxstatat) -libc_hidden_ver (__fxstatat64, __fxstatat) +#include +#include +#include + +/* Get information about the file NAME in BUF. */ +int +__fxstatat64 (int vers, int fd, const char *file, struct stat64 *st, int flag) +{ + return INLINE_SYSCALL_CALL (fstatat64, fd, file, st, flag); +} +libc_hidden_def (__fxstatat64) +#if IS_IN(libc) +strong_alias (__fxstatat64, __fxstatat); +hidden_ver (__fxstatat64, __fxstatat) #endif diff --git a/sysdeps/unix/sysv/linux/arm/fxstatat.c b/sysdeps/unix/sysv/linux/arm/fxstatat.c deleted file mode 100644 index 0f8b3135d8..0000000000 --- a/sysdeps/unix/sysv/linux/arm/fxstatat.c +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/sysdeps/unix/sysv/linux/fxstatat.c b/sysdeps/unix/sysv/linux/fxstatat.c index 937fec45c2..0291a2c598 100644 --- a/sysdeps/unix/sysv/linux/fxstatat.c +++ b/sysdeps/unix/sysv/linux/fxstatat.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2005-2020 Free Software Foundation, Inc. +/* fxstatat used on fstatat, Linux implementation. + Copyright (C) 2005-2020 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 @@ -15,48 +16,36 @@ License along with the GNU C Library; if not, see . */ -/* Ho hum, if fxstatat == fxstatat64 we must get rid of the prototype or gcc - will complain since they don't strictly match. */ -#define __fxstatat64 __fxstatat64_disable - -#include -#include -#include -#include -#include #include +#include #include - #include -#include -#include +#if !XSTAT_IS_XSTAT64 +# include +# include -/* Get information about the file NAME in BUF. */ +/* Get information about the file FD in BUF. */ int __fxstatat (int vers, int fd, const char *file, struct stat *st, int flag) { - int result; #if STAT_IS_KERNEL_STAT -# define kst (*st) -#else - struct kernel_stat kst; -#endif - - result = INTERNAL_SYSCALL_CALL (newfstatat, fd, file, &kst, flag); - if (!__glibc_likely (INTERNAL_SYSCALL_ERROR_P (result))) + /* New kABIs which uses generic pre 64-bit time Linux ABI, e.g. + csky, nios2 */ + if (vers == _STAT_VER_KERNEL) { -#if STAT_IS_KERNEL_STAT - return 0; + int r = INLINE_SYSCALL_CALL (fstatat64, fd, file, st, flag); + return r ?: stat_overflow (st); + } + return INLINE_SYSCALL_ERROR_RETURN_VALUE (EINVAL); #else - return __xstat_conv (vers, &kst, st); + /* Old kABIs with old non-LFS support, e.g. arm, i386, hppa, m68k, mips32, + microblaze, s390, sh, powerpc32, and sparc32. */ + struct stat64 st64; + int r = INLINE_SYSCALL_CALL (fstatat64, fd, file, &st64, flag); + return r ?: __xstat32_conv (vers, &st64, st); #endif - } - return INLINE_SYSCALL_ERROR_RETURN_VALUE (INTERNAL_SYSCALL_ERRNO (result)); } libc_hidden_def (__fxstatat) -#if XSTAT_IS_XSTAT64 -# undef __fxstatat64 -strong_alias (__fxstatat, __fxstatat64); -libc_hidden_def (__fxstatat64) -#endif + +#endif /* XSTAT_IS_XSTAT64 */ diff --git a/sysdeps/unix/sysv/linux/fxstatat64.c b/sysdeps/unix/sysv/linux/fxstatat64.c index e24b456604..ac33ab4fc9 100644 --- a/sysdeps/unix/sysv/linux/fxstatat64.c +++ b/sysdeps/unix/sysv/linux/fxstatat64.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2005-2020 Free Software Foundation, Inc. +/* fxstatat64 used on fstatat64, Linux implementation. + Copyright (C) 2005-2020 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 @@ -15,41 +16,53 @@ License along with the GNU C Library; if not, see . */ -#include -#include -#include -#include -#include +#define __fxstatat __redirect___fxstatat #include +#undef __fxstatat +#include #include - #include -#include - +#include #include -/* Get information about the file NAME in BUF. */ +/* Get information about the file FD in BUF. */ int __fxstatat64 (int vers, int fd, const char *file, struct stat64 *st, int flag) { - if (__glibc_unlikely (vers != _STAT_VER_LINUX)) - return INLINE_SYSCALL_ERROR_RETURN_VALUE (EINVAL); - - int result; - -#ifdef __NR_fstatat64 - result = INTERNAL_SYSCALL_CALL (fstatat64, fd, file, st, flag); +#if XSTAT_IS_XSTAT64 +# ifdef __NR_newfstatat + /* 64-bit kABI, e.g. aarch64, ia64, powerpc64*, s390x, riscv64, and + x86_64. */ + if (vers == _STAT_VER_KERNEL || vers == _STAT_VER_LINUX) + return INLINE_SYSCALL_CALL (newfstatat, fd, file, st, flag); +# elif defined __NR_fstatat64 + /* 64-bit kABI outlier, e.g. sparc64. */ + struct stat64 st64; + int r = INLINE_SYSCALL_CALL (fstatat64, fd, file, &st64, flag); + return r ?: __xstat32_conv (vers, &st64, (struct stat *) st); +# else + /* New 32-bit kABIs with only 64-bit time_t support, e.g. arc, riscv32. */ + if (vers == _STAT_VER_KERNEL) + { + struct statx tmp; + int r = INLINE_SYSCALL_CALL (statx, fd, file, AT_NO_AUTOMOUNT | flag, + STATX_BASIC_STATS, &tmp); + if (r == 0) + __cp_stat64_statx (st, &tmp); + return r; + } +# endif #else - struct statx tmp; - - result = INTERNAL_SYSCALL_CALL (statx, fd, file, AT_NO_AUTOMOUNT | flag, - STATX_BASIC_STATS, &tmp); - if (result == 0) - __cp_stat64_statx (st, &tmp); + /* All kABIs with non-LFS support, e.g. arm, csky, i386, hppa, m68k, + microblaze, mips32, nios2, sh, powerpc32, and sparc32. */ + if (vers == _STAT_VER_LINUX) + return INLINE_SYSCALL_CALL (fstatat64, fd, file, st, flag); #endif - if (!__glibc_likely (INTERNAL_SYSCALL_ERROR_P (result))) - return 0; - return INLINE_SYSCALL_ERROR_RETURN_VALUE (INTERNAL_SYSCALL_ERRNO (result)); + return INLINE_SYSCALL_ERROR_RETURN_VALUE (EINVAL); } libc_hidden_def (__fxstatat64) +#if XSTAT_IS_XSTAT64 && IS_IN(libc) +strong_alias (__fxstatat64, __fxstatat); +hidden_ver (__fxstatat64, __fxstatat) +#endif diff --git a/sysdeps/unix/sysv/linux/generic/wordsize-32/fxstatat.c b/sysdeps/unix/sysv/linux/generic/wordsize-32/fxstatat.c deleted file mode 100644 index 8df65ebea0..0000000000 --- a/sysdeps/unix/sysv/linux/generic/wordsize-32/fxstatat.c +++ /dev/null @@ -1,56 +0,0 @@ -/* Copyright (C) 2011-2020 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Chris Metcalf , 2011. - - 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, see - . */ - -#include -#include -#include -#include -#include -#include - -#include -#include - -#if !XSTAT_IS_XSTAT64 -#include "overflow.h" -#include - -/* Get information about the file NAME in BUF. */ -int -__fxstatat (int vers, int fd, const char *file, struct stat *buf, int flag) -{ - if (vers == _STAT_VER_KERNEL) - { -# ifdef __NR_fstatat64 - int rc = INLINE_SYSCALL (fstatat64, 4, fd, file, buf, flag); -# else - struct statx tmp; - int rc = INLINE_SYSCALL (statx, 5, fd, file, - AT_NO_AUTOMOUNT | flag, - STATX_BASIC_STATS, &tmp); - if (rc == 0) - __cp_stat64_statx ((struct stat64 *)buf, &tmp); -# endif - return rc ?: stat_overflow (buf); - } - - errno = EINVAL; - return -1; -} -libc_hidden_def (__fxstatat) -#endif diff --git a/sysdeps/unix/sysv/linux/hppa/fxstatat.c b/sysdeps/unix/sysv/linux/hppa/fxstatat.c deleted file mode 100644 index 0f8b3135d8..0000000000 --- a/sysdeps/unix/sysv/linux/hppa/fxstatat.c +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/sysdeps/unix/sysv/linux/i386/fxstatat.c b/sysdeps/unix/sysv/linux/i386/fxstatat.c deleted file mode 100644 index f720f6e429..0000000000 --- a/sysdeps/unix/sysv/linux/i386/fxstatat.c +++ /dev/null @@ -1,54 +0,0 @@ -/* Copyright (C) 2005-2020 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, see - . */ - -/* Ho hum, if fxstatat == fxstatat64 we must get rid of the prototype or gcc - will complain since they don't strictly match. */ -#define __fxstatat64 __fxstatat64_disable - -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -#include - - -/* Get information about the file NAME relative to FD in ST. */ -int -__fxstatat (int vers, int fd, const char *file, struct stat *st, int flag) -{ - int result; - struct stat64 st64; - - result = INTERNAL_SYSCALL_CALL (fstatat64, fd, file, &st64, flag); - if (__glibc_unlikely (INTERNAL_SYSCALL_ERROR_P (result))) - return INLINE_SYSCALL_ERROR_RETURN_VALUE (INTERNAL_SYSCALL_ERRNO (result)); - else - return __xstat32_conv (vers, &st64, st); -} -libc_hidden_def (__fxstatat) -#if XSTAT_IS_XSTAT64 -# undef __fxstatat64 -strong_alias (__fxstatat, __fxstatat64); -libc_hidden_ver (__fxstatat, __fxstatat64) -#endif diff --git a/sysdeps/unix/sysv/linux/m68k/fxstatat.c b/sysdeps/unix/sysv/linux/m68k/fxstatat.c deleted file mode 100644 index 0f8b3135d8..0000000000 --- a/sysdeps/unix/sysv/linux/m68k/fxstatat.c +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/sysdeps/unix/sysv/linux/microblaze/fxstatat.c b/sysdeps/unix/sysv/linux/microblaze/fxstatat.c deleted file mode 100644 index 0f8b3135d8..0000000000 --- a/sysdeps/unix/sysv/linux/microblaze/fxstatat.c +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/sysdeps/unix/sysv/linux/mips/mips32/fxstatat.c b/sysdeps/unix/sysv/linux/mips/mips32/fxstatat.c deleted file mode 100644 index 0f8b3135d8..0000000000 --- a/sysdeps/unix/sysv/linux/mips/mips32/fxstatat.c +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/sysdeps/unix/sysv/linux/wordsize-64/fxstatat.c b/sysdeps/unix/sysv/linux/mips/mips64/fxstatat.c similarity index 56% rename from sysdeps/unix/sysv/linux/wordsize-64/fxstatat.c rename to sysdeps/unix/sysv/linux/mips/mips64/fxstatat.c index b8f5ab562e..58410a1441 100644 --- a/sysdeps/unix/sysv/linux/wordsize-64/fxstatat.c +++ b/sysdeps/unix/sysv/linux/mips/mips64/fxstatat.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2005-2020 Free Software Foundation, Inc. +/* fxstat using old-style Unix fstat system call. + Copyright (C) 1991-2020 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 @@ -15,34 +16,18 @@ License along with the GNU C Library; if not, see . */ -/* Ho hum, since fxstatat == fxstatat64 we must get rid of the - prototype or gcc will complain since they don't strictly match. */ -#define __fxstatat64 __fxstatat64_disable - -#include -#include -#include -#include -#include #include - +#include +#include #include -#include - +#include -/* Get information about the file NAME relative to FD in ST. */ +/* Get information about the file FD in BUF. */ int __fxstatat (int vers, int fd, const char *file, struct stat *st, int flag) { - if (vers != _STAT_VER_KERNEL && vers != _STAT_VER_LINUX) - { - __set_errno (EINVAL); - return -1; - } - - return INLINE_SYSCALL (newfstatat, 4, fd, file, st, flag); + struct kernel_stat kst; + int r = INLINE_SYSCALL_CALL (newfstatat, fd, file, &kst, flag); + return r ?: __xstat_conv (vers, &kst, st); } libc_hidden_def (__fxstatat) -#undef __fxstatat64 -strong_alias (__fxstatat, __fxstatat64); -strong_alias (__fxstatat64, __GI___fxstatat64) diff --git a/sysdeps/unix/sysv/linux/mips/mips64/fxstatat64.c b/sysdeps/unix/sysv/linux/mips/mips64/fxstatat64.c index 62df5fb26c..e5416d8971 100644 --- a/sysdeps/unix/sysv/linux/mips/mips64/fxstatat64.c +++ b/sysdeps/unix/sysv/linux/mips/mips64/fxstatat64.c @@ -15,17 +15,9 @@ License along with the GNU C Library. If not, see . */ -#include -#include -#include -#include -#include #include #include - #include -#include - #include /* Get information about the file NAME in BUF. */ @@ -33,22 +25,12 @@ int __fxstatat64 (int vers, int fd, const char *file, struct stat64 *st, int flag) { - if (__builtin_expect (vers != _STAT_VER_LINUX, 0)) - { - __set_errno (EINVAL); - return -1; - } - - int result; - struct kernel_stat kst; - - result = INTERNAL_SYSCALL_CALL (newfstatat, fd, file, &kst, flag); - if (!__glibc_likely (INTERNAL_SYSCALL_ERROR_P (result))) - return __xstat64_conv (vers, &kst, st); - else + if (vers == _STAT_VER_LINUX) { - __set_errno (INTERNAL_SYSCALL_ERRNO (result)); - return -1; + struct kernel_stat kst; + int r = INLINE_SYSCALL_CALL (newfstatat, fd, file, &kst, flag);; + return r ?: __xstat64_conv (vers, &kst, st); } + return INLINE_SYSCALL_ERROR_RETURN_VALUE (EINVAL); } libc_hidden_def (__fxstatat64) diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fxstatat.c b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fxstatat.c deleted file mode 100644 index 0f8b3135d8..0000000000 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fxstatat.c +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/fxstatat.c b/sysdeps/unix/sysv/linux/s390/s390-32/fxstatat.c deleted file mode 100644 index 0f8b3135d8..0000000000 --- a/sysdeps/unix/sysv/linux/s390/s390-32/fxstatat.c +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/sysdeps/unix/sysv/linux/sh/fxstatat.c b/sysdeps/unix/sysv/linux/sh/fxstatat.c deleted file mode 100644 index 0f8b3135d8..0000000000 --- a/sysdeps/unix/sysv/linux/sh/fxstatat.c +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/fxstatat.c b/sysdeps/unix/sysv/linux/sparc/sparc32/fxstatat.c deleted file mode 100644 index 0f8b3135d8..0000000000 --- a/sysdeps/unix/sysv/linux/sparc/sparc32/fxstatat.c +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/dl-fxstatat64.c b/sysdeps/unix/sysv/linux/sparc/sparc64/dl-fxstatat64.c deleted file mode 100644 index 330b33f7c7..0000000000 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/dl-fxstatat64.c +++ /dev/null @@ -1 +0,0 @@ -#include "fxstatat.c" diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/fxstatat.c b/sysdeps/unix/sysv/linux/sparc/sparc64/fxstatat.c deleted file mode 100644 index db08af8e0f..0000000000 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/fxstatat.c +++ /dev/null @@ -1 +0,0 @@ -#include "../../i386/fxstatat.c" diff --git a/sysdeps/unix/sysv/linux/wordsize-64/dl-fxstatat64.c b/sysdeps/unix/sysv/linux/wordsize-64/dl-fxstatat64.c deleted file mode 100644 index 330b33f7c7..0000000000 --- a/sysdeps/unix/sysv/linux/wordsize-64/dl-fxstatat64.c +++ /dev/null @@ -1 +0,0 @@ -#include "fxstatat.c" diff --git a/sysdeps/unix/sysv/linux/wordsize-64/fxstatat64.c b/sysdeps/unix/sysv/linux/wordsize-64/fxstatat64.c deleted file mode 100644 index 05e7f413bb..0000000000 --- a/sysdeps/unix/sysv/linux/wordsize-64/fxstatat64.c +++ /dev/null @@ -1 +0,0 @@ -/* fxstatat64 is in fxstatat.c */