mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-21 01:12:26 +08:00
Define __ASSUME_ST_INO_64_BIT on all platforms.
* sysdeps/unix/sysv/linux/alpha/kernel-features.h: #define __ASSUME_ST_INO_64_BIT as 0 * sysdeps/unix/sysv/linux/sh/kernel-features.h: Likewise. * sysdeps/unix/sysv/linux/fxstat64.c: Replace #ifdef with #if over the code where __ASSUME_ST_INO_64_BIT is used. * sysdeps/unix/sysv/linux/lxstat64.c: Likewise. * sysdeps/unix/sysv/linux/xstat64.c: Likewise. * sysdeps/unix/sysv/linux/xstatconv.c: Likewise.
This commit is contained in:
parent
c74940f2a7
commit
327792ce57
12
ChangeLog
12
ChangeLog
@ -1,3 +1,15 @@
|
||||
2016-11-07 Yury Norov <ynorov@caviumnetworks.com>
|
||||
Steve Ellcey <sellcey@caviumnetworks.com>
|
||||
|
||||
* sysdeps/unix/sysv/linux/alpha/kernel-features.h: #define
|
||||
__ASSUME_ST_INO_64_BIT as 0
|
||||
* sysdeps/unix/sysv/linux/sh/kernel-features.h: Likewise.
|
||||
* sysdeps/unix/sysv/linux/fxstat64.c: Replace #ifdef with #if
|
||||
over the code where __ASSUME_ST_INO_64_BIT is used.
|
||||
* sysdeps/unix/sysv/linux/lxstat64.c: Likewise.
|
||||
* sysdeps/unix/sysv/linux/xstat64.c: Likewise.
|
||||
* sysdeps/unix/sysv/linux/xstatconv.c: Likewise.
|
||||
|
||||
2016-11-07 Florian Weimer <fweimer@redhat.com>
|
||||
|
||||
* sysdeps/aarch64/nptl/bits/pthreadtypes.h (struct __pthread_mutex_s):
|
||||
|
@ -23,6 +23,7 @@
|
||||
#include_next <kernel-features.h>
|
||||
|
||||
#undef __ASSUME_ST_INO_64_BIT
|
||||
#define __ASSUME_ST_INO_64_BIT 0
|
||||
|
||||
/* There never has been support for fstat64. */
|
||||
#undef __ASSUME_STATFS64
|
||||
|
@ -33,7 +33,7 @@ ___fxstat64 (int vers, int fd, struct stat64 *buf)
|
||||
{
|
||||
int result;
|
||||
result = INLINE_SYSCALL (fstat64, 2, fd, buf);
|
||||
#if defined _HAVE_STAT64___ST_INO && !defined __ASSUME_ST_INO_64_BIT
|
||||
#if defined _HAVE_STAT64___ST_INO && !__ASSUME_ST_INO_64_BIT
|
||||
if (__builtin_expect (!result, 1) && buf->__st_ino != (__ino_t) buf->st_ino)
|
||||
buf->st_ino = buf->__st_ino;
|
||||
#endif
|
||||
|
@ -32,7 +32,7 @@ ___lxstat64 (int vers, const char *name, struct stat64 *buf)
|
||||
{
|
||||
int result;
|
||||
result = INLINE_SYSCALL (lstat64, 2, name, buf);
|
||||
#if defined _HAVE_STAT64___ST_INO && !defined __ASSUME_ST_INO_64_BIT
|
||||
#if defined _HAVE_STAT64___ST_INO && !__ASSUME_ST_INO_64_BIT
|
||||
if (__builtin_expect (!result, 1) && buf->__st_ino != (__ino_t) buf->st_ino)
|
||||
buf->st_ino = buf->__st_ino;
|
||||
#endif
|
||||
|
@ -44,6 +44,7 @@
|
||||
|
||||
/* SH does not have a 64-bit inode field. */
|
||||
#undef __ASSUME_ST_INO_64_BIT
|
||||
#define __ASSUME_ST_INO_64_BIT 0
|
||||
|
||||
/* SH4 ABI does not really require argument alignment for 64-bits, but
|
||||
the kernel interface for p{read,write}64 adds a dummy long argument
|
||||
|
@ -33,7 +33,7 @@ ___xstat64 (int vers, const char *name, struct stat64 *buf)
|
||||
{
|
||||
int result;
|
||||
result = INLINE_SYSCALL (stat64, 2, name, buf);
|
||||
#if defined _HAVE_STAT64___ST_INO && !defined __ASSUME_ST_INO_64_BIT
|
||||
#if defined _HAVE_STAT64___ST_INO && !__ASSUME_ST_INO_64_BIT
|
||||
if (__builtin_expect (!result, 1) && buf->__st_ino != (__ino_t) buf->st_ino)
|
||||
buf->st_ino = buf->__st_ino;
|
||||
#endif
|
||||
|
@ -190,7 +190,7 @@ __xstat32_conv (int vers, struct stat64 *kbuf, struct stat *buf)
|
||||
buf->__pad1 = 0;
|
||||
#endif
|
||||
#ifdef _HAVE_STAT64___ST_INO
|
||||
# ifndef __ASSUME_ST_INO_64_BIT
|
||||
# if !__ASSUME_ST_INO_64_BIT
|
||||
if (kbuf->st_ino == 0)
|
||||
buf->st_ino = kbuf->__st_ino;
|
||||
else
|
||||
|
Loading…
Reference in New Issue
Block a user