public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
* [glibc] linux: Always define STAT_IS_KERNEL_STAT
@ 2020-09-11 17:36 Adhemerval Zanella
0 siblings, 0 replies; only message in thread
From: Adhemerval Zanella @ 2020-09-11 17:36 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=90e1600f4f9e3a3dcbf0a91e23098b052c975a9d
commit 90e1600f4f9e3a3dcbf0a91e23098b052c975a9d
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
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.
Reviewed-by: Lukasz Majewski <lukma@denx.de>
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 <sys/stat.h>
#include <kernel_stat.h>
-#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
<https://www.gnu.org/licenses/>. */
-#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)
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2020-09-11 17:36 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-11 17:36 [glibc] linux: Always define STAT_IS_KERNEL_STAT Adhemerval Zanella
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).