From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id 269ED388C006; Thu, 30 Jul 2020 13:26:28 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 269ED388C006 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/azanella/y2038] linux: Always define STAT_IS_KERNEL_STAT X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella X-Git-Refname: refs/heads/azanella/y2038 X-Git-Oldrev: 095f20bcaba7ae03f9a58ad1bfaae5c5d32bbcc3 X-Git-Newrev: 06fcf2fcec6b70dcfd7c1ff52679ec74e703a97e Message-Id: <20200730132628.269ED388C006@sourceware.org> Date: Thu, 30 Jul 2020 13:26:28 +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: Thu, 30 Jul 2020 13:26:28 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=06fcf2fcec6b70dcfd7c1ff52679ec74e703a97e commit 06fcf2fcec6b70dcfd7c1ff52679ec74e703a97e Author: Adhemerval Zanella Date: Wed Jul 15 12:42:32 2020 +0000 linux: Always define STAT_IS_KERNEL_STAT It allows to check for its value instead of its existence. Checked with a build for all affected ABIS. Diff: --- sysdeps/unix/sysv/linux/alpha/kernel_stat.h | 1 + sysdeps/unix/sysv/linux/fxstat.c | 2 +- sysdeps/unix/sysv/linux/fxstatat.c | 4 ++-- sysdeps/unix/sysv/linux/hppa/kernel_stat.h | 1 + sysdeps/unix/sysv/linux/kernel_stat.h | 1 + sysdeps/unix/sysv/linux/lxstat.c | 2 +- sysdeps/unix/sysv/linux/microblaze/kernel_stat.h | 1 + sysdeps/unix/sysv/linux/mips/kernel_stat.h | 1 + sysdeps/unix/sysv/linux/powerpc/powerpc32/kernel_stat.h | 1 + sysdeps/unix/sysv/linux/sparc/sparc32/kernel_stat.h | 1 + sysdeps/unix/sysv/linux/sparc/sparc64/kernel_stat.h | 1 + sysdeps/unix/sysv/linux/xstat.c | 2 +- sysdeps/unix/sysv/linux/xstatconv.c | 2 +- sysdeps/unix/sysv/linux/xstatconv.h | 2 +- 14 files changed, 15 insertions(+), 7 deletions(-) diff --git a/sysdeps/unix/sysv/linux/alpha/kernel_stat.h b/sysdeps/unix/sysv/linux/alpha/kernel_stat.h index d637e099cf..9bcc96c577 100644 --- a/sysdeps/unix/sysv/linux/alpha/kernel_stat.h +++ b/sysdeps/unix/sysv/linux/alpha/kernel_stat.h @@ -85,5 +85,6 @@ struct glibc21_stat long __glibc_reserved[4]; }; +#define STAT_IS_KERNEL_STAT 0 #define XSTAT_IS_XSTAT64 1 #define STATFS_IS_STATFS64 0 diff --git a/sysdeps/unix/sysv/linux/fxstat.c b/sysdeps/unix/sysv/linux/fxstat.c index ce474dcd47..a88404b5c3 100644 --- a/sysdeps/unix/sysv/linux/fxstat.c +++ b/sysdeps/unix/sysv/linux/fxstat.c @@ -38,7 +38,7 @@ __fxstat (int vers, int fd, struct stat *buf) if (vers == _STAT_VER_KERNEL) return INLINE_SYSCALL (fstat, 2, fd, buf); -#ifdef STAT_IS_KERNEL_STAT +#if STAT_IS_KERNEL_STAT return INLINE_SYSCALL_ERROR_RETURN_VALUE (EINVAL); #else struct kernel_stat kbuf; diff --git a/sysdeps/unix/sysv/linux/fxstatat.c b/sysdeps/unix/sysv/linux/fxstatat.c index 3eb898e322..937fec45c2 100644 --- a/sysdeps/unix/sysv/linux/fxstatat.c +++ b/sysdeps/unix/sysv/linux/fxstatat.c @@ -37,7 +37,7 @@ int __fxstatat (int vers, int fd, const char *file, struct stat *st, int flag) { int result; -#ifdef STAT_IS_KERNEL_STAT +#if STAT_IS_KERNEL_STAT # define kst (*st) #else struct kernel_stat kst; @@ -46,7 +46,7 @@ __fxstatat (int vers, int fd, const char *file, struct stat *st, int flag) result = INTERNAL_SYSCALL_CALL (newfstatat, fd, file, &kst, flag); if (!__glibc_likely (INTERNAL_SYSCALL_ERROR_P (result))) { -#ifdef STAT_IS_KERNEL_STAT +#if STAT_IS_KERNEL_STAT return 0; #else return __xstat_conv (vers, &kst, st); diff --git a/sysdeps/unix/sysv/linux/hppa/kernel_stat.h b/sysdeps/unix/sysv/linux/hppa/kernel_stat.h index a3ac53a1ef..0cbd010fc3 100644 --- a/sysdeps/unix/sysv/linux/hppa/kernel_stat.h +++ b/sysdeps/unix/sysv/linux/hppa/kernel_stat.h @@ -30,5 +30,6 @@ struct kernel_stat { #define _HAVE_STAT_NSEC #define _HAVE_STAT64_NSEC +#define STAT_IS_KERNEL_STAT 0 #define XSTAT_IS_XSTAT64 0 #define STATFS_IS_STATFS64 0 diff --git a/sysdeps/unix/sysv/linux/kernel_stat.h b/sysdeps/unix/sysv/linux/kernel_stat.h index eecc962de3..ff54a4524c 100644 --- a/sysdeps/unix/sysv/linux/kernel_stat.h +++ b/sysdeps/unix/sysv/linux/kernel_stat.h @@ -34,5 +34,6 @@ struct kernel_stat #define _HAVE_STAT64___ST_INO #define _HAVE_STAT64_NSEC +#define STAT_IS_KERNEL_STAT 0 #define XSTAT_IS_XSTAT64 0 #define STATFS_IS_STATFS64 0 diff --git a/sysdeps/unix/sysv/linux/lxstat.c b/sysdeps/unix/sysv/linux/lxstat.c index e0cfc4f1fa..dcd685873d 100644 --- a/sysdeps/unix/sysv/linux/lxstat.c +++ b/sysdeps/unix/sysv/linux/lxstat.c @@ -37,7 +37,7 @@ __lxstat (int vers, const char *name, struct stat *buf) if (vers == _STAT_VER_KERNEL) return INLINE_SYSCALL (lstat, 2, name, buf); -#ifdef STAT_IS_KERNEL_STAT +#if STAT_IS_KERNEL_STAT return INLINE_SYSCALL_ERROR_RETURN_VALUE (EINVAL); #else struct kernel_stat kbuf; diff --git a/sysdeps/unix/sysv/linux/microblaze/kernel_stat.h b/sysdeps/unix/sysv/linux/microblaze/kernel_stat.h index 765e0dca67..4daaedc4b6 100644 --- a/sysdeps/unix/sysv/linux/microblaze/kernel_stat.h +++ b/sysdeps/unix/sysv/linux/microblaze/kernel_stat.h @@ -48,5 +48,6 @@ struct kernel_stat #define _HAVE_STAT64___UNUSED5 }; +#define STAT_IS_KERNEL_STAT 0 #define XSTAT_IS_XSTAT64 0 #define STATFS_IS_STATFS64 0 diff --git a/sysdeps/unix/sysv/linux/mips/kernel_stat.h b/sysdeps/unix/sysv/linux/mips/kernel_stat.h index 388df1bfff..e75f3e805b 100644 --- a/sysdeps/unix/sysv/linux/mips/kernel_stat.h +++ b/sysdeps/unix/sysv/linux/mips/kernel_stat.h @@ -56,5 +56,6 @@ struct kernel_stat }; #endif +#define STAT_IS_KERNEL_STAT 0 #define XSTAT_IS_XSTAT64 0 #define STATFS_IS_STATFS64 0 diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/kernel_stat.h b/sysdeps/unix/sysv/linux/powerpc/powerpc32/kernel_stat.h index c5948a4d3c..75610b8df3 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/kernel_stat.h +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/kernel_stat.h @@ -47,5 +47,6 @@ struct kernel_stat #define _HAVE_STAT64___PAD2 #define _HAVE_STAT64_NSEC +#define STAT_IS_KERNEL_STAT 0 #define XSTAT_IS_XSTAT64 0 #define STATFS_IS_STATFS64 0 diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/kernel_stat.h b/sysdeps/unix/sysv/linux/sparc/sparc32/kernel_stat.h index a4416009f1..5c8cacaf67 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc32/kernel_stat.h +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/kernel_stat.h @@ -31,5 +31,6 @@ struct kernel_stat #define _HAVE_STAT_NSEC #define _HAVE_STAT64_NSEC +#define STAT_IS_KERNEL_STAT 0 #define XSTAT_IS_XSTAT64 0 #define STATFS_IS_STATFS64 0 diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/kernel_stat.h b/sysdeps/unix/sysv/linux/sparc/sparc64/kernel_stat.h index 30afb553b9..d14b2487ac 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/kernel_stat.h +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/kernel_stat.h @@ -44,5 +44,6 @@ struct kernel_stat64 long int __glibc_reserved[3]; }; +#define STAT_IS_KERNEL_STAT 0 #define XSTAT_IS_XSTAT64 1 #define STATFS_IS_STATFS64 0 diff --git a/sysdeps/unix/sysv/linux/xstat.c b/sysdeps/unix/sysv/linux/xstat.c index a93d635611..76c90e20c7 100644 --- a/sysdeps/unix/sysv/linux/xstat.c +++ b/sysdeps/unix/sysv/linux/xstat.c @@ -37,7 +37,7 @@ __xstat (int vers, const char *name, struct stat *buf) if (vers == _STAT_VER_KERNEL) return INLINE_SYSCALL (stat, 2, name, buf); -#ifdef STAT_IS_KERNEL_STAT +#if STAT_IS_KERNEL_STAT return INLINE_SYSCALL_ERROR_RETURN_VALUE (EINVAL); #else struct kernel_stat kbuf; diff --git a/sysdeps/unix/sysv/linux/xstatconv.c b/sysdeps/unix/sysv/linux/xstatconv.c index c01fb00a3a..3622a82cd0 100644 --- a/sysdeps/unix/sysv/linux/xstatconv.c +++ b/sysdeps/unix/sysv/linux/xstatconv.c @@ -20,7 +20,7 @@ #include #include -#ifdef STAT_IS_KERNEL_STAT +#if STAT_IS_KERNEL_STAT /* Dummy. */ struct kernel_stat; diff --git a/sysdeps/unix/sysv/linux/xstatconv.h b/sysdeps/unix/sysv/linux/xstatconv.h index 39102c9469..5319236cae 100644 --- a/sysdeps/unix/sysv/linux/xstatconv.h +++ b/sysdeps/unix/sysv/linux/xstatconv.h @@ -16,7 +16,7 @@ License along with the GNU C Library; if not, see . */ -#ifndef STAT_IS_KERNEL_STAT +#if !STAT_IS_KERNEL_STAT extern int __xstat_conv (int vers, struct kernel_stat *kbuf, void *ubuf) attribute_hidden; extern int __xstat64_conv (int vers, struct kernel_stat *kbuf, void *ubuf)