From acfb96832ad33b9e21e39c9a0e252e279f512dc5 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Sun, 9 Feb 2020 15:41:36 +0100 Subject: [PATCH] Linux: statx syscall number is always available Due to the built-in tables, __NR_statx is always defined. --- sysdeps/unix/sysv/linux/statx.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/sysdeps/unix/sysv/linux/statx.c b/sysdeps/unix/sysv/linux/statx.c index a119b7a29e9..9721fc12a55 100644 --- a/sysdeps/unix/sysv/linux/statx.c +++ b/sysdeps/unix/sysv/linux/statx.c @@ -25,17 +25,14 @@ int statx (int fd, const char *path, int flags, unsigned int mask, struct statx *buf) { -#ifdef __NR_statx int ret = INLINE_SYSCALL_CALL (statx, fd, path, flags, mask, buf); -# ifdef __ASSUME_STATX +#ifdef __ASSUME_STATX return ret; -# else +#else if (ret == 0 || errno != ENOSYS) /* Preserve non-error/non-ENOSYS return values. */ return ret; -# endif -#endif -#ifndef __ASSUME_STATX - return statx_generic (fd, path, flags, mask, buf); + else + return statx_generic (fd, path, flags, mask, buf); #endif } -- 2.47.2