From 7255ccbec997312033c9fe48e0971a2e7cb19fbf Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Tue, 3 Mar 2020 12:12:11 +0100 Subject: [PATCH] Linux: statx syscall number is always available Due to the built-in tables, __NR_statx is always defined. Reviewed-by: Adhemerval Zanella --- 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 a119b7a29e..9721fc12a5 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 }