From: Florian Weimer <fweimer@redhat.com>
Date: Tue, 3 Mar 2020 11:12:11 +0000 (+0100)
Subject: Linux: statx syscall number is always available
X-Git-Tag: glibc-2.32~560
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7255ccbec997312033c9fe48e0971a2e7cb19fbf;p=thirdparty%2Fglibc.git

Linux: statx syscall number is always available

Due to the built-in tables, __NR_statx is always defined.

Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
---

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
 }