diff mbox series

[04/10] linux: Consolidate fstatfs implementations

Message ID 20210208214936.1502047-5-adhemerval.zanella@linaro.org
State New
Headers show
Series stat[fs,vfs] consolidation | expand

Commit Message

Adhemerval Zanella Feb. 8, 2021, 9:49 p.m. UTC
The __NR_fstatfs64 syscall is supported on all architectures but
aarch64, mips64, riscv64, and x86_64.  And newer ABIs also uses
the new fstatfs64 interface (where the struct size is used as
second argument).

So the default implementation now uses:

  1. __NR_fstatfs64 for non-LFS call and handle overflow directly
     There is no need to handle __NR_fstatfs since all architecture
     that only support is are LFS only.

  2. __NR_fstatfs if defined or __NR_fstatfs64 otherwise for LFS
     call.

Alpha the only outlier, since it is a 64-bit architecture which
provides non-LFS interface and only provides __NR_fstatfs64 on
newer kernels.

Checked on x86_64-linux-gnu.
---
 include/sys/statfs.h                          |  7 +-
 .../{generic/wordsize-32 => alpha}/fstatfs.c  | 13 ++--
 sysdeps/unix/sysv/linux/alpha/fstatfs64.c     | 52 +++++++++++++-
 sysdeps/unix/sysv/linux/alpha/syscalls.list   |  1 -
 sysdeps/unix/sysv/linux/fstatfs.c             | 62 +++++++++++++++++
 sysdeps/unix/sysv/linux/fstatfs64.c           | 67 +++----------------
 .../sysv/linux/mips/mips64/n64/fstatfs64.c    |  1 -
 .../sysv/linux/mips/mips64/n64/syscalls.list  |  1 -
 .../unix/sysv/linux/wordsize-64/fstatfs64.c   |  1 -
 .../unix/sysv/linux/wordsize-64/syscalls.list |  1 -
 10 files changed, 129 insertions(+), 77 deletions(-)
 rename sysdeps/unix/sysv/linux/{generic/wordsize-32 => alpha}/fstatfs.c (76%)
 create mode 100644 sysdeps/unix/sysv/linux/fstatfs.c
 delete mode 100644 sysdeps/unix/sysv/linux/mips/mips64/n64/fstatfs64.c
 delete mode 100644 sysdeps/unix/sysv/linux/wordsize-64/fstatfs64.c

Comments

Carlos O'Donell Feb. 11, 2021, 12:38 a.m. UTC | #1
On 2/8/21 4:49 PM, Adhemerval Zanella via Libc-alpha wrote:
> The __NR_fstatfs64 syscall is supported on all architectures but
> aarch64, mips64, riscv64, and x86_64.  And newer ABIs also uses
> the new fstatfs64 interface (where the struct size is used as
> second argument).
> 
> So the default implementation now uses:
> 
>   1. __NR_fstatfs64 for non-LFS call and handle overflow directly
>      There is no need to handle __NR_fstatfs since all architecture
>      that only support is are LFS only.

Agreed.

> 
>   2. __NR_fstatfs if defined or __NR_fstatfs64 otherwise for LFS
>      call.

OK.

> 
> Alpha the only outlier, since it is a 64-bit architecture which
> provides non-LFS interface and only provides __NR_fstatfs64 on
> newer kernels.

LGTM.

Reviewed-by: Carlos O'Donell <carlos@redhat.com>

> 
> Checked on x86_64-linux-gnu.
> ---
>  include/sys/statfs.h                          |  7 +-
>  .../{generic/wordsize-32 => alpha}/fstatfs.c  | 13 ++--
>  sysdeps/unix/sysv/linux/alpha/fstatfs64.c     | 52 +++++++++++++-
>  sysdeps/unix/sysv/linux/alpha/syscalls.list   |  1 -
>  sysdeps/unix/sysv/linux/fstatfs.c             | 62 +++++++++++++++++
>  sysdeps/unix/sysv/linux/fstatfs64.c           | 67 +++----------------
>  .../sysv/linux/mips/mips64/n64/fstatfs64.c    |  1 -
>  .../sysv/linux/mips/mips64/n64/syscalls.list  |  1 -
>  .../unix/sysv/linux/wordsize-64/fstatfs64.c   |  1 -
>  .../unix/sysv/linux/wordsize-64/syscalls.list |  1 -
>  10 files changed, 129 insertions(+), 77 deletions(-)
>  rename sysdeps/unix/sysv/linux/{generic/wordsize-32 => alpha}/fstatfs.c (76%)
>  create mode 100644 sysdeps/unix/sysv/linux/fstatfs.c
>  delete mode 100644 sysdeps/unix/sysv/linux/mips/mips64/n64/fstatfs64.c
>  delete mode 100644 sysdeps/unix/sysv/linux/wordsize-64/fstatfs64.c
> 
> diff --git a/include/sys/statfs.h b/include/sys/statfs.h
> index 8a9f5a7b3b..756930a247 100644
> --- a/include/sys/statfs.h
> +++ b/include/sys/statfs.h
> @@ -6,12 +6,11 @@
>  /* Now define the internal interfaces.  */
>  extern int __statfs (const char *__file, struct statfs *__buf);
>  libc_hidden_proto (__statfs)
> -extern int __fstatfs (int __fildes, struct statfs *__buf)
> -     attribute_hidden;
> +extern int __fstatfs (int __fildes, struct statfs *__buf);
> +libc_hidden_proto (__fstatfs)
>  extern int __statfs64 (const char *__file, struct statfs64 *__buf)
>       attribute_hidden;
> -extern int __fstatfs64 (int __fildes, struct statfs64 *__buf)
> -     attribute_hidden;
> +extern int __fstatfs64 (int __fildes, struct statfs64 *__buf);
>  
>  # endif /* !_ISOMAC */
>  #endif
> diff --git a/sysdeps/unix/sysv/linux/generic/wordsize-32/fstatfs.c b/sysdeps/unix/sysv/linux/alpha/fstatfs.c
> similarity index 76%
> rename from sysdeps/unix/sysv/linux/generic/wordsize-32/fstatfs.c
> rename to sysdeps/unix/sysv/linux/alpha/fstatfs.c
> index a611f33128..32c38d0db2 100644
> --- a/sysdeps/unix/sysv/linux/generic/wordsize-32/fstatfs.c
> +++ b/sysdeps/unix/sysv/linux/alpha/fstatfs.c
> @@ -1,6 +1,6 @@
> -/* Copyright (C) 2011-2021 Free Software Foundation, Inc.
> +/* Get filesystem statistics.  Linux/alpha.
> +   Copyright (C) 2011-2021 Free Software Foundation, Inc.
>     This file is part of the GNU C Library.
> -   Contributed by Chris Metcalf <cmetcalf@tilera.com>, 2011.
>  
>     The GNU C Library is free software; you can redistribute it and/or
>     modify it under the terms of the GNU Lesser General Public
> @@ -18,18 +18,13 @@
>  
>  #include <sys/statfs.h>
>  #include <kernel_stat.h>
> -#include <stddef.h>
>  #include <sysdep.h>
>  
> -#if !STATFS_IS_STATFS64
> -#include "overflow.h"
> -
>  /* Return information about the filesystem on which FD resides.  */
>  int
>  __fstatfs (int fd, struct statfs *buf)
>  {
> -  int rc = INLINE_SYSCALL (fstatfs64, 3, fd, sizeof (*buf), buf);
> -  return rc ?: statfs_overflow (buf);
> +  return INLINE_SYSCALL_CALL (fstatfs, fd, buf);
>  }
> +libc_hidden_def (__fstatfs)
>  weak_alias (__fstatfs, fstatfs)
> -#endif
> diff --git a/sysdeps/unix/sysv/linux/alpha/fstatfs64.c b/sysdeps/unix/sysv/linux/alpha/fstatfs64.c
> index 5639959adb..0391c08338 100644
> --- a/sysdeps/unix/sysv/linux/alpha/fstatfs64.c
> +++ b/sysdeps/unix/sysv/linux/alpha/fstatfs64.c
> @@ -1 +1,51 @@
> -#include <sysdeps/unix/sysv/linux/fstatfs64.c>
> +/* Get filesystem statistics.  Linux/alpha.
> +   Copyright (C) 1996-2021 Free Software Foundation, Inc.
> +   This file is part of the GNU C Library.
> +
> +   The GNU C Library is free software; you can redistribute it and/or
> +   modify it under the terms of the GNU Lesser General Public
> +   License as published by the Free Software Foundation; either
> +   version 2.1 of the License, or (at your option) any later version.
> +
> +   The GNU C Library is distributed in the hope that it will be useful,
> +   but WITHOUT ANY WARRANTY; without even the implied warranty of
> +   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> +   Lesser General Public License for more details.
> +
> +   You should have received a copy of the GNU Lesser General Public
> +   License along with the GNU C Library; if not, see
> +   <https://www.gnu.org/licenses/>.  */
> +
> +#include <sys/statfs.h>
> +#include <sysdep.h>
> +#include <kernel_stat.h>
> +
> +/* Return information about the filesystem on which FILE resides.  */
> +int
> +__fstatfs64 (int fd, struct statfs64 *buf)
> +{
> +  int r = INLINE_SYSCALL_CALL (fstatfs64, fd, sizeof (*buf), buf);
> +#if __ASSUME_STATFS64 == 0
> +  if (r == -1 && errno == ENOSYS)
> +    {
> +      struct statfs buf32;
> +      if (__fstatfs (fd, &buf32) < 0)
> +	return -1;
> +
> +      buf->f_type = buf32.f_type;
> +      buf->f_bsize = buf32.f_bsize;
> +      buf->f_blocks = buf32.f_blocks;
> +      buf->f_bfree = buf32.f_bfree;
> +      buf->f_bavail = buf32.f_bavail;
> +      buf->f_files = buf32.f_files;
> +      buf->f_ffree = buf32.f_ffree;
> +      buf->f_fsid = buf32.f_fsid;
> +      buf->f_namelen = buf32.f_namelen;
> +      buf->f_frsize = buf32.f_frsize;
> +      buf->f_flags = buf32.f_flags;
> +      memcpy (buf->f_spare, buf32.f_spare, sizeof (buf32.f_spare));
> +    }
> +#endif
> +  return r;
> +}
> +weak_alias (__fstatfs64, fstatfs64)
> diff --git a/sysdeps/unix/sysv/linux/alpha/syscalls.list b/sysdeps/unix/sysv/linux/alpha/syscalls.list
> index c7cbe886ea..8cb588cb2c 100644
> --- a/sysdeps/unix/sysv/linux/alpha/syscalls.list
> +++ b/sysdeps/unix/sysv/linux/alpha/syscalls.list
> @@ -29,5 +29,4 @@ utimes		-	utimes		i:sp	__utimes	utimes@@GLIBC_2.1
>  getrusage	-	getrusage	i:ip	__getrusage	getrusage@@GLIBC_2.1
>  
>  # avoid 64-bit aliases on 32-bit statfs syscalls
> -fstatfs		-	fstatfs		i:ip	__fstatfs	fstatfs
>  statfs		-	statfs		i:sp	__statfs	statfs
> diff --git a/sysdeps/unix/sysv/linux/fstatfs.c b/sysdeps/unix/sysv/linux/fstatfs.c
> new file mode 100644
> index 0000000000..38d621967e
> --- /dev/null
> +++ b/sysdeps/unix/sysv/linux/fstatfs.c
> @@ -0,0 +1,62 @@
> +/* Get filesystem statistics.  Linux version.
> +   Copyright (C) 2021 Free Software Foundation, Inc.
> +   This file is part of the GNU C Library.
> +
> +   The GNU C Library is free software; you can redistribute it and/or
> +   modify it under the terms of the GNU Lesser General Public
> +   License as published by the Free Software Foundation; either
> +   version 2.1 of the License, or (at your option) any later version.
> +
> +   The GNU C Library is distributed in the hope that it will be useful,
> +   but WITHOUT ANY WARRANTY; without even the implied warranty of
> +   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> +   Lesser General Public License for more details.
> +
> +   You should have received a copy of the GNU Lesser General Public
> +   License along with the GNU C Library.  If not, see
> +   <https://www.gnu.org/licenses/>.  */
> +
> +#include <sys/statfs.h>
> +#include <time.h>
> +#include <sysdep.h>
> +#include <kernel_stat.h>
> +
> +#if !STATFS_IS_STATFS64
> +
> +/* Return information about the filesystem on which FILE resides.  */
> +int
> +__fstatfs (int fd, struct statfs *buf)
> +{
> +  struct statfs64 buf64;
> +  int rc = INLINE_SYSCALL_CALL (fstatfs64, fd, sizeof (buf64), &buf64);
> +  if (rc != 0)
> +    return rc;
> +
> +  buf->f_type = buf64.f_type;
> +  buf->f_bsize = buf64.f_bsize;
> +  buf->f_blocks = buf64.f_blocks;
> +  buf->f_bfree = buf64.f_bfree;
> +  buf->f_bavail = buf64.f_bavail;
> +  buf->f_files = buf64.f_files;
> +  buf->f_ffree = buf64.f_ffree;
> +  buf->f_fsid = buf64.f_fsid;
> +  buf->f_namelen = buf64.f_namelen;
> +  buf->f_frsize = buf64.f_frsize;
> +  buf->f_flags = buf64.f_flags;
> +  memcpy (buf->f_spare, buf64.f_spare, sizeof (buf64.f_spare));
> +
> +  if ((fsblkcnt_t) buf64.f_blocks != buf64.f_blocks
> +      || (fsblkcnt_t) buf64.f_bfree != buf64.f_bfree
> +      || (fsblkcnt_t) buf64.f_bavail != buf64.f_bavail
> +      || (fsblkcnt_t) buf64.f_files != buf64.f_files
> +      || (fsblkcnt_t) buf64.f_ffree != buf64.f_ffree)
> +   {
> +     __set_errno (EOVERFLOW);
> +     return -1;
> +   }
> +
> +  return 0;
> +}
> +libc_hidden_def (__fstatfs)
> +weak_alias (__fstatfs, fstatfs)
> +#endif
> diff --git a/sysdeps/unix/sysv/linux/fstatfs64.c b/sysdeps/unix/sysv/linux/fstatfs64.c
> index b5ff74d66c..e6aa643477 100644
> --- a/sysdeps/unix/sysv/linux/fstatfs64.c
> +++ b/sysdeps/unix/sysv/linux/fstatfs64.c
> @@ -16,77 +16,28 @@
>     License along with the GNU C Library; if not, see
>     <https://www.gnu.org/licenses/>.  */
>  
> -#include <errno.h>
> -#include <string.h>
> -#include <stddef.h>
> +#define __fstatfs __fstatfs_disable
> +#define fstatfs fstatfs_disable
> +#include <sys/statfs.h>
>  #include <sysdep.h>
>  #include <kernel_stat.h>
> -
> -/* Hide the prototypes for __fstatfs and fstatfs so that GCC will not
> -   complain about the different function signatures if they are aliased
> -   to  __fstat64.  If STATFS_IS_STATFS64 is not zero then the statfs and
> -   statfs64 structures have an identical layout but different type names.  */
> -
> -#if STATFS_IS_STATFS64
> -# define __fstatfs __fstatfs_disable
> -# define fstatfs fstatfs_disable
> -#endif
> -#include <sys/statfs.h>
> -
> -#include <kernel-features.h>
> -
> -/* Defined in statfs64.c.  */
> -extern int __no_statfs64 attribute_hidden;
> +#undef __fstatfs
> +#undef fstatfs
>  
>  /* Return information about the filesystem on which FD resides.  */
>  int
>  __fstatfs64 (int fd, struct statfs64 *buf)
>  {
>  #ifdef __NR_fstatfs64
> -# if __ASSUME_STATFS64 == 0
> -  if (! __no_statfs64)
> -# endif
> -    {
> -      int result = INLINE_SYSCALL (fstatfs64, 3, fd, sizeof (*buf), buf);
> -
> -# if __ASSUME_STATFS64 == 0
> -      if (result == 0 || errno != ENOSYS)
> -# endif
> -	return result;
> -
> -# if __ASSUME_STATFS64 == 0
> -      __no_statfs64 = 1;
> -# endif
> -    }
> -#endif
> -
> -#if __ASSUME_STATFS64 == 0
> -  struct statfs buf32;
> -
> -  if (__fstatfs (fd, &buf32) < 0)
> -    return -1;
> -
> -  buf->f_type = buf32.f_type;
> -  buf->f_bsize = buf32.f_bsize;
> -  buf->f_blocks = buf32.f_blocks;
> -  buf->f_bfree = buf32.f_bfree;
> -  buf->f_bavail = buf32.f_bavail;
> -  buf->f_files = buf32.f_files;
> -  buf->f_ffree = buf32.f_ffree;
> -  buf->f_fsid = buf32.f_fsid;
> -  buf->f_namelen = buf32.f_namelen;
> -  buf->f_frsize = buf32.f_frsize;
> -  memcpy (buf->f_spare, buf32.f_spare, sizeof (buf32.f_spare));
> -
> -  return 0;
> +  return INLINE_SYSCALL_CALL (fstatfs64, fd, sizeof (*buf), buf);
> +#else
> +  return INLINE_SYSCALL_CALL (fstatfs, fd, buf);
>  #endif
>  }
>  weak_alias (__fstatfs64, fstatfs64)
>  
> -#undef __fstatfs
> -#undef fstatfs
> -
>  #if STATFS_IS_STATFS64
>  weak_alias (__fstatfs64, __fstatfs)
>  weak_alias (__fstatfs64, fstatfs)
> +libc_hidden_ver (__fstatfs64, __fstatfs)
>  #endif
> diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/fstatfs64.c b/sysdeps/unix/sysv/linux/mips/mips64/n64/fstatfs64.c
> deleted file mode 100644
> index 6e25b021ab..0000000000
> --- a/sysdeps/unix/sysv/linux/mips/mips64/n64/fstatfs64.c
> +++ /dev/null
> @@ -1 +0,0 @@
> -/* Empty.  */
> diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/syscalls.list b/sysdeps/unix/sysv/linux/mips/mips64/n64/syscalls.list
> index 8e7d516a2a..b6a0c92829 100644
> --- a/sysdeps/unix/sysv/linux/mips/mips64/n64/syscalls.list
> +++ b/sysdeps/unix/sysv/linux/mips/mips64/n64/syscalls.list
> @@ -4,7 +4,6 @@ prlimit		EXTRA	prlimit64	i:iipp	prlimit		prlimit64
>  
>  fanotify_mark	EXTRA	fanotify_mark	i:iiiis	fanotify_mark
>  
> -fstatfs		-	fstatfs		i:ip	__fstatfs	fstatfs fstatfs64 __fstatfs64
>  statfs		-	statfs		i:sp	__statfs	statfs statfs64 __statfs64
>  
>  sendfile	-	sendfile	i:iipi	sendfile	sendfile64
> diff --git a/sysdeps/unix/sysv/linux/wordsize-64/fstatfs64.c b/sysdeps/unix/sysv/linux/wordsize-64/fstatfs64.c
> deleted file mode 100644
> index 2be4e59ba4..0000000000
> --- a/sysdeps/unix/sysv/linux/wordsize-64/fstatfs64.c
> +++ /dev/null
> @@ -1 +0,0 @@
> -/* fstatfs64 is the same as fstatfs. */
> diff --git a/sysdeps/unix/sysv/linux/wordsize-64/syscalls.list b/sysdeps/unix/sysv/linux/wordsize-64/syscalls.list
> index 5de6ec823a..5a0c910847 100644
> --- a/sysdeps/unix/sysv/linux/wordsize-64/syscalls.list
> +++ b/sysdeps/unix/sysv/linux/wordsize-64/syscalls.list
> @@ -1,6 +1,5 @@
>  # File name	Caller	Syscall name	# args	Strong name	Weak names
>  
> -fstatfs		-	fstatfs		i:ip	__fstatfs	fstatfs fstatfs64 __fstatfs64
>  statfs		-	statfs		i:sp	__statfs	statfs statfs64
>  sendfile	-	sendfile	i:iipi	sendfile	sendfile64
>  prlimit		EXTRA	prlimit64	i:iipp	prlimit		prlimit64
>
diff mbox series

Patch

diff --git a/include/sys/statfs.h b/include/sys/statfs.h
index 8a9f5a7b3b..756930a247 100644
--- a/include/sys/statfs.h
+++ b/include/sys/statfs.h
@@ -6,12 +6,11 @@ 
 /* Now define the internal interfaces.  */
 extern int __statfs (const char *__file, struct statfs *__buf);
 libc_hidden_proto (__statfs)
-extern int __fstatfs (int __fildes, struct statfs *__buf)
-     attribute_hidden;
+extern int __fstatfs (int __fildes, struct statfs *__buf);
+libc_hidden_proto (__fstatfs)
 extern int __statfs64 (const char *__file, struct statfs64 *__buf)
      attribute_hidden;
-extern int __fstatfs64 (int __fildes, struct statfs64 *__buf)
-     attribute_hidden;
+extern int __fstatfs64 (int __fildes, struct statfs64 *__buf);
 
 # endif /* !_ISOMAC */
 #endif
diff --git a/sysdeps/unix/sysv/linux/generic/wordsize-32/fstatfs.c b/sysdeps/unix/sysv/linux/alpha/fstatfs.c
similarity index 76%
rename from sysdeps/unix/sysv/linux/generic/wordsize-32/fstatfs.c
rename to sysdeps/unix/sysv/linux/alpha/fstatfs.c
index a611f33128..32c38d0db2 100644
--- a/sysdeps/unix/sysv/linux/generic/wordsize-32/fstatfs.c
+++ b/sysdeps/unix/sysv/linux/alpha/fstatfs.c
@@ -1,6 +1,6 @@ 
-/* Copyright (C) 2011-2021 Free Software Foundation, Inc.
+/* Get filesystem statistics.  Linux/alpha.
+   Copyright (C) 2011-2021 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
-   Contributed by Chris Metcalf <cmetcalf@tilera.com>, 2011.
 
    The GNU C Library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
@@ -18,18 +18,13 @@ 
 
 #include <sys/statfs.h>
 #include <kernel_stat.h>
-#include <stddef.h>
 #include <sysdep.h>
 
-#if !STATFS_IS_STATFS64
-#include "overflow.h"
-
 /* Return information about the filesystem on which FD resides.  */
 int
 __fstatfs (int fd, struct statfs *buf)
 {
-  int rc = INLINE_SYSCALL (fstatfs64, 3, fd, sizeof (*buf), buf);
-  return rc ?: statfs_overflow (buf);
+  return INLINE_SYSCALL_CALL (fstatfs, fd, buf);
 }
+libc_hidden_def (__fstatfs)
 weak_alias (__fstatfs, fstatfs)
-#endif
diff --git a/sysdeps/unix/sysv/linux/alpha/fstatfs64.c b/sysdeps/unix/sysv/linux/alpha/fstatfs64.c
index 5639959adb..0391c08338 100644
--- a/sysdeps/unix/sysv/linux/alpha/fstatfs64.c
+++ b/sysdeps/unix/sysv/linux/alpha/fstatfs64.c
@@ -1 +1,51 @@ 
-#include <sysdeps/unix/sysv/linux/fstatfs64.c>
+/* Get filesystem statistics.  Linux/alpha.
+   Copyright (C) 1996-2021 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <https://www.gnu.org/licenses/>.  */
+
+#include <sys/statfs.h>
+#include <sysdep.h>
+#include <kernel_stat.h>
+
+/* Return information about the filesystem on which FILE resides.  */
+int
+__fstatfs64 (int fd, struct statfs64 *buf)
+{
+  int r = INLINE_SYSCALL_CALL (fstatfs64, fd, sizeof (*buf), buf);
+#if __ASSUME_STATFS64 == 0
+  if (r == -1 && errno == ENOSYS)
+    {
+      struct statfs buf32;
+      if (__fstatfs (fd, &buf32) < 0)
+	return -1;
+
+      buf->f_type = buf32.f_type;
+      buf->f_bsize = buf32.f_bsize;
+      buf->f_blocks = buf32.f_blocks;
+      buf->f_bfree = buf32.f_bfree;
+      buf->f_bavail = buf32.f_bavail;
+      buf->f_files = buf32.f_files;
+      buf->f_ffree = buf32.f_ffree;
+      buf->f_fsid = buf32.f_fsid;
+      buf->f_namelen = buf32.f_namelen;
+      buf->f_frsize = buf32.f_frsize;
+      buf->f_flags = buf32.f_flags;
+      memcpy (buf->f_spare, buf32.f_spare, sizeof (buf32.f_spare));
+    }
+#endif
+  return r;
+}
+weak_alias (__fstatfs64, fstatfs64)
diff --git a/sysdeps/unix/sysv/linux/alpha/syscalls.list b/sysdeps/unix/sysv/linux/alpha/syscalls.list
index c7cbe886ea..8cb588cb2c 100644
--- a/sysdeps/unix/sysv/linux/alpha/syscalls.list
+++ b/sysdeps/unix/sysv/linux/alpha/syscalls.list
@@ -29,5 +29,4 @@  utimes		-	utimes		i:sp	__utimes	utimes@@GLIBC_2.1
 getrusage	-	getrusage	i:ip	__getrusage	getrusage@@GLIBC_2.1
 
 # avoid 64-bit aliases on 32-bit statfs syscalls
-fstatfs		-	fstatfs		i:ip	__fstatfs	fstatfs
 statfs		-	statfs		i:sp	__statfs	statfs
diff --git a/sysdeps/unix/sysv/linux/fstatfs.c b/sysdeps/unix/sysv/linux/fstatfs.c
new file mode 100644
index 0000000000..38d621967e
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/fstatfs.c
@@ -0,0 +1,62 @@ 
+/* Get filesystem statistics.  Linux version.
+   Copyright (C) 2021 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library.  If not, see
+   <https://www.gnu.org/licenses/>.  */
+
+#include <sys/statfs.h>
+#include <time.h>
+#include <sysdep.h>
+#include <kernel_stat.h>
+
+#if !STATFS_IS_STATFS64
+
+/* Return information about the filesystem on which FILE resides.  */
+int
+__fstatfs (int fd, struct statfs *buf)
+{
+  struct statfs64 buf64;
+  int rc = INLINE_SYSCALL_CALL (fstatfs64, fd, sizeof (buf64), &buf64);
+  if (rc != 0)
+    return rc;
+
+  buf->f_type = buf64.f_type;
+  buf->f_bsize = buf64.f_bsize;
+  buf->f_blocks = buf64.f_blocks;
+  buf->f_bfree = buf64.f_bfree;
+  buf->f_bavail = buf64.f_bavail;
+  buf->f_files = buf64.f_files;
+  buf->f_ffree = buf64.f_ffree;
+  buf->f_fsid = buf64.f_fsid;
+  buf->f_namelen = buf64.f_namelen;
+  buf->f_frsize = buf64.f_frsize;
+  buf->f_flags = buf64.f_flags;
+  memcpy (buf->f_spare, buf64.f_spare, sizeof (buf64.f_spare));
+
+  if ((fsblkcnt_t) buf64.f_blocks != buf64.f_blocks
+      || (fsblkcnt_t) buf64.f_bfree != buf64.f_bfree
+      || (fsblkcnt_t) buf64.f_bavail != buf64.f_bavail
+      || (fsblkcnt_t) buf64.f_files != buf64.f_files
+      || (fsblkcnt_t) buf64.f_ffree != buf64.f_ffree)
+   {
+     __set_errno (EOVERFLOW);
+     return -1;
+   }
+
+  return 0;
+}
+libc_hidden_def (__fstatfs)
+weak_alias (__fstatfs, fstatfs)
+#endif
diff --git a/sysdeps/unix/sysv/linux/fstatfs64.c b/sysdeps/unix/sysv/linux/fstatfs64.c
index b5ff74d66c..e6aa643477 100644
--- a/sysdeps/unix/sysv/linux/fstatfs64.c
+++ b/sysdeps/unix/sysv/linux/fstatfs64.c
@@ -16,77 +16,28 @@ 
    License along with the GNU C Library; if not, see
    <https://www.gnu.org/licenses/>.  */
 
-#include <errno.h>
-#include <string.h>
-#include <stddef.h>
+#define __fstatfs __fstatfs_disable
+#define fstatfs fstatfs_disable
+#include <sys/statfs.h>
 #include <sysdep.h>
 #include <kernel_stat.h>
-
-/* Hide the prototypes for __fstatfs and fstatfs so that GCC will not
-   complain about the different function signatures if they are aliased
-   to  __fstat64.  If STATFS_IS_STATFS64 is not zero then the statfs and
-   statfs64 structures have an identical layout but different type names.  */
-
-#if STATFS_IS_STATFS64
-# define __fstatfs __fstatfs_disable
-# define fstatfs fstatfs_disable
-#endif
-#include <sys/statfs.h>
-
-#include <kernel-features.h>
-
-/* Defined in statfs64.c.  */
-extern int __no_statfs64 attribute_hidden;
+#undef __fstatfs
+#undef fstatfs
 
 /* Return information about the filesystem on which FD resides.  */
 int
 __fstatfs64 (int fd, struct statfs64 *buf)
 {
 #ifdef __NR_fstatfs64
-# if __ASSUME_STATFS64 == 0
-  if (! __no_statfs64)
-# endif
-    {
-      int result = INLINE_SYSCALL (fstatfs64, 3, fd, sizeof (*buf), buf);
-
-# if __ASSUME_STATFS64 == 0
-      if (result == 0 || errno != ENOSYS)
-# endif
-	return result;
-
-# if __ASSUME_STATFS64 == 0
-      __no_statfs64 = 1;
-# endif
-    }
-#endif
-
-#if __ASSUME_STATFS64 == 0
-  struct statfs buf32;
-
-  if (__fstatfs (fd, &buf32) < 0)
-    return -1;
-
-  buf->f_type = buf32.f_type;
-  buf->f_bsize = buf32.f_bsize;
-  buf->f_blocks = buf32.f_blocks;
-  buf->f_bfree = buf32.f_bfree;
-  buf->f_bavail = buf32.f_bavail;
-  buf->f_files = buf32.f_files;
-  buf->f_ffree = buf32.f_ffree;
-  buf->f_fsid = buf32.f_fsid;
-  buf->f_namelen = buf32.f_namelen;
-  buf->f_frsize = buf32.f_frsize;
-  memcpy (buf->f_spare, buf32.f_spare, sizeof (buf32.f_spare));
-
-  return 0;
+  return INLINE_SYSCALL_CALL (fstatfs64, fd, sizeof (*buf), buf);
+#else
+  return INLINE_SYSCALL_CALL (fstatfs, fd, buf);
 #endif
 }
 weak_alias (__fstatfs64, fstatfs64)
 
-#undef __fstatfs
-#undef fstatfs
-
 #if STATFS_IS_STATFS64
 weak_alias (__fstatfs64, __fstatfs)
 weak_alias (__fstatfs64, fstatfs)
+libc_hidden_ver (__fstatfs64, __fstatfs)
 #endif
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/fstatfs64.c b/sysdeps/unix/sysv/linux/mips/mips64/n64/fstatfs64.c
deleted file mode 100644
index 6e25b021ab..0000000000
--- a/sysdeps/unix/sysv/linux/mips/mips64/n64/fstatfs64.c
+++ /dev/null
@@ -1 +0,0 @@ 
-/* Empty.  */
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/syscalls.list b/sysdeps/unix/sysv/linux/mips/mips64/n64/syscalls.list
index 8e7d516a2a..b6a0c92829 100644
--- a/sysdeps/unix/sysv/linux/mips/mips64/n64/syscalls.list
+++ b/sysdeps/unix/sysv/linux/mips/mips64/n64/syscalls.list
@@ -4,7 +4,6 @@  prlimit		EXTRA	prlimit64	i:iipp	prlimit		prlimit64
 
 fanotify_mark	EXTRA	fanotify_mark	i:iiiis	fanotify_mark
 
-fstatfs		-	fstatfs		i:ip	__fstatfs	fstatfs fstatfs64 __fstatfs64
 statfs		-	statfs		i:sp	__statfs	statfs statfs64 __statfs64
 
 sendfile	-	sendfile	i:iipi	sendfile	sendfile64
diff --git a/sysdeps/unix/sysv/linux/wordsize-64/fstatfs64.c b/sysdeps/unix/sysv/linux/wordsize-64/fstatfs64.c
deleted file mode 100644
index 2be4e59ba4..0000000000
--- a/sysdeps/unix/sysv/linux/wordsize-64/fstatfs64.c
+++ /dev/null
@@ -1 +0,0 @@ 
-/* fstatfs64 is the same as fstatfs. */
diff --git a/sysdeps/unix/sysv/linux/wordsize-64/syscalls.list b/sysdeps/unix/sysv/linux/wordsize-64/syscalls.list
index 5de6ec823a..5a0c910847 100644
--- a/sysdeps/unix/sysv/linux/wordsize-64/syscalls.list
+++ b/sysdeps/unix/sysv/linux/wordsize-64/syscalls.list
@@ -1,6 +1,5 @@ 
 # File name	Caller	Syscall name	# args	Strong name	Weak names
 
-fstatfs		-	fstatfs		i:ip	__fstatfs	fstatfs fstatfs64 __fstatfs64
 statfs		-	statfs		i:sp	__statfs	statfs statfs64
 sendfile	-	sendfile	i:iipi	sendfile	sendfile64
 prlimit		EXTRA	prlimit64	i:iipp	prlimit		prlimit64