mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-03 10:21:05 +00:00
646ce7e0be
kernel-features.h has a macro __ASSUME_ST_INO_64_BIT, with a comment
"However, SH is lame, and still does not have a 64-bit inode field.".
The macro is, in fact, defined to 0 by Alpha as well as SH. The Alpha
case is, however, trivially useless: none of the files that test
__ASSUME_ST_INO_64_BIT are built for Alpha (which gained kernel
support for stat64 syscalls, with a 64-bit st_ino field, in Linux
2.6.4; the define to 0 for Alpha in glibc predates that).
The SH kernel gained support for a 64-bit st_ino in struct stat64 in
commit 760bcb1deec13c50e20399c84cb6a8ea41cc2820 ("sh: Fix fstatat64()
syscall."), which is in Linux 2.6.22 and later. So the redefinition
of __ASSUME_ST_INO_64_BIT to 0 is of no use for SH either; three of
the files testing it do so immediately after a stat64-family syscall
has been used, which will always have set the 64-bit st_ino correctly
(in addition to the 32-bit __st_ino), while the relevant code
__xstat32_conv executes only after such a syscall in the function
calling __xstat32_conv.
Thus this patch removes __ASSUME_ST_INO_64_BIT and code testing it.
Removing the useless [!__ASSUME_ST_INO_64_BIT] code in __xstat32_conv
renders the [_HAVE_STAT64___ST_INO] and [!_HAVE_STAT64___ST_INO] cases
around it identical, so that conditional is also removed.
Tested compilation with build-many-glibcs.py for its Alpha and SH
configurations; also ran the glibc testsuite for x86_64 and x86.
* sysdeps/unix/sysv/linux/kernel-features.h
(__ASSUME_ST_INO_64_BIT): Remove macro definition.
* sysdeps/unix/sysv/linux/alpha/kernel-features.h
(__ASSUME_ST_INO_64_BIT): Do not undefine and define.
* sysdeps/unix/sysv/linux/sh/kernel-features.h
(__ASSUME_ST_INO_64_BIT): Likewise.
* sysdeps/unix/sysv/linux/fxstat64.c: Do not include
<kernel-features.h>.
(___fxstat64) [_HAVE_STAT64___ST_INO && !__ASSUME_ST_INO_64_BIT]:
Remove conditional code.
* sysdeps/unix/sysv/linux/lxstat64.c: Do not include
<kernel-features.h>.
(___lxstat64) [_HAVE_STAT64___ST_INO && !__ASSUME_ST_INO_64_BIT]:
Remove conditional code.
* sysdeps/unix/sysv/linux/xstat64.c: Do not include
<kernel-features.h>.
(___xstat64) [_HAVE_STAT64___ST_INO && !__ASSUME_ST_INO_64_BIT]:
Remove conditional code.
* sysdeps/unix/sysv/linux/xstatconv.c: Do not include
<kernel-features.h>.
(__xstat32_conv) [_HAVE_STAT64___ST_INO]: Remove conditional code.
[!_HAVE_STAT64___ST_INO]: Make code unconditional.
47 lines
1.5 KiB
C
47 lines
1.5 KiB
C
/* lxstat64 using Linux lstat64 system call.
|
|
Copyright (C) 1997-2018 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
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#include <errno.h>
|
|
#include <stddef.h>
|
|
#include <sys/stat.h>
|
|
#include <kernel_stat.h>
|
|
|
|
#include <sysdep.h>
|
|
#include <sys/syscall.h>
|
|
|
|
/* Get information about the file NAME in BUF. */
|
|
int
|
|
___lxstat64 (int vers, const char *name, struct stat64 *buf)
|
|
{
|
|
int result;
|
|
result = INLINE_SYSCALL (lstat64, 2, name, buf);
|
|
return result;
|
|
}
|
|
|
|
#include <shlib-compat.h>
|
|
|
|
#if SHLIB_COMPAT(libc, GLIBC_2_1, GLIBC_2_2)
|
|
versioned_symbol (libc, ___lxstat64, __lxstat64, GLIBC_2_2);
|
|
strong_alias (___lxstat64, __old__lxstat64)
|
|
compat_symbol (libc, __old__lxstat64, __lxstat64, GLIBC_2_1);
|
|
hidden_ver (___lxstat64, __lxstat64)
|
|
#else
|
|
strong_alias (___lxstat64, __lxstat64);
|
|
hidden_def (__lxstat64)
|
|
#endif
|