[PATCH] Remove STATFS_IS_STATFS64 conditional as it is zero in all ports

Wed Sep 9 14:36:37 EDT 2020

On 08/09/2020 23:48, Vineet Gupta via Libc-alpha wrote:
> From: Vineet Gupta <Vineet.Gupta1 at synopsys.com>
> 
> This seems to be dead code, so remove it.

It could be useful for a possible statfs/statfs64 consolidation, but indeed
it is dead code now.

LGTM, thanks.

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

> ---
>  sysdeps/unix/sysv/linux/alpha/kernel_stat.h       |  1 -
>  sysdeps/unix/sysv/linux/fstatfs64.c               | 14 --------------
>  sysdeps/unix/sysv/linux/generic/kernel_stat.h     |  2 --
>  .../unix/sysv/linux/generic/wordsize-32/fstatfs.c |  2 --
>  .../unix/sysv/linux/generic/wordsize-32/statfs.c  |  2 --
>  sysdeps/unix/sysv/linux/hppa/kernel_stat.h        |  1 -
>  sysdeps/unix/sysv/linux/ia64/kernel_stat.h        |  1 -
>  sysdeps/unix/sysv/linux/kernel_stat.h             |  1 -
>  sysdeps/unix/sysv/linux/microblaze/kernel_stat.h  |  1 -
>  sysdeps/unix/sysv/linux/mips/kernel_stat.h        |  1 -
>  .../sysv/linux/powerpc/powerpc32/kernel_stat.h    |  1 -
>  .../sysv/linux/powerpc/powerpc64/kernel_stat.h    |  1 -
>  .../unix/sysv/linux/s390/s390-64/kernel_stat.h    |  1 -
>  .../unix/sysv/linux/sparc/sparc32/kernel_stat.h   |  1 -
>  .../unix/sysv/linux/sparc/sparc64/kernel_stat.h   |  1 -
>  sysdeps/unix/sysv/linux/statfs64.c                | 15 ---------------
>  sysdeps/unix/sysv/linux/x86_64/kernel_stat.h      |  1 -
>  17 files changed, 47 deletions(-)
> 
> diff --git a/sysdeps/unix/sysv/linux/alpha/kernel_stat.h b/sysdeps/unix/sysv/linux/alpha/kernel_stat.h
> index d637e099cfe4..670841140765 100644
> --- a/sysdeps/unix/sysv/linux/alpha/kernel_stat.h
> +++ b/sysdeps/unix/sysv/linux/alpha/kernel_stat.h
> @@ -86,4 +86,3 @@ struct glibc21_stat
>    };
>  
>  #define XSTAT_IS_XSTAT64 1
> -#define STATFS_IS_STATFS64 0
> diff --git a/sysdeps/unix/sysv/linux/fstatfs64.c b/sysdeps/unix/sysv/linux/fstatfs64.c
> index 9d22fa228fa5..4a339b548aa7 100644
> --- a/sysdeps/unix/sysv/linux/fstatfs64.c
> +++ b/sysdeps/unix/sysv/linux/fstatfs64.c
> @@ -22,15 +22,6 @@
>  #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>
> @@ -85,8 +76,3 @@ weak_alias (__fstatfs64, fstatfs64)
>  
>  #undef __fstatfs
>  #undef fstatfs
> -
> -#if STATFS_IS_STATFS64
> -weak_alias (__fstatfs64, __fstatfs)
> -weak_alias (__fstatfs64, fstatfs)
> -#endif
> diff --git a/sysdeps/unix/sysv/linux/generic/kernel_stat.h b/sysdeps/unix/sysv/linux/generic/kernel_stat.h
> index 2eed3596c0ed..5a600f188320 100644
> --- a/sysdeps/unix/sysv/linux/generic/kernel_stat.h
> +++ b/sysdeps/unix/sysv/linux/generic/kernel_stat.h
> @@ -26,5 +26,3 @@
>  #else
>  # define XSTAT_IS_XSTAT64 0
>  #endif
> -
> -#define STATFS_IS_STATFS64 0
> diff --git a/sysdeps/unix/sysv/linux/generic/wordsize-32/fstatfs.c b/sysdeps/unix/sysv/linux/generic/wordsize-32/fstatfs.c
> index 93d9d94a0a61..bacc1543013a 100644
> --- a/sysdeps/unix/sysv/linux/generic/wordsize-32/fstatfs.c
> +++ b/sysdeps/unix/sysv/linux/generic/wordsize-32/fstatfs.c
> @@ -21,7 +21,6 @@
>  #include <kernel_stat.h>
>  #include <stddef.h>
>  
> -#if !STATFS_IS_STATFS64
>  #include "overflow.h"
>  
>  /* Return information about the filesystem on which FD resides.  */
> @@ -32,4 +31,3 @@ __fstatfs (int fd, struct statfs *buf)
>    return rc ?: statfs_overflow (buf);
>  }
>  weak_alias (__fstatfs, fstatfs)
> -#endif
> diff --git a/sysdeps/unix/sysv/linux/generic/wordsize-32/statfs.c b/sysdeps/unix/sysv/linux/generic/wordsize-32/statfs.c
> index 7421501b4a40..a678e96058ce 100644
> --- a/sysdeps/unix/sysv/linux/generic/wordsize-32/statfs.c
> +++ b/sysdeps/unix/sysv/linux/generic/wordsize-32/statfs.c
> @@ -21,7 +21,6 @@
>  #include <kernel_stat.h>
>  #include <stddef.h>
>  
> -#if !STATFS_IS_STATFS64
>  #include "overflow.h"
>  
>  /* Return information about the filesystem on which FILE resides.  */
> @@ -33,4 +32,3 @@ __statfs (const char *file, struct statfs *buf)
>  }
>  libc_hidden_def (__statfs)
>  weak_alias (__statfs, statfs)
> -#endif
> diff --git a/sysdeps/unix/sysv/linux/hppa/kernel_stat.h b/sysdeps/unix/sysv/linux/hppa/kernel_stat.h
> index a3ac53a1ef2f..9ffa3ba638ea 100644
> --- a/sysdeps/unix/sysv/linux/hppa/kernel_stat.h
> +++ b/sysdeps/unix/sysv/linux/hppa/kernel_stat.h
> @@ -31,4 +31,3 @@ struct kernel_stat {
>  #define _HAVE_STAT64_NSEC
>  
>  #define XSTAT_IS_XSTAT64 0
> -#define STATFS_IS_STATFS64 0
> diff --git a/sysdeps/unix/sysv/linux/ia64/kernel_stat.h b/sysdeps/unix/sysv/linux/ia64/kernel_stat.h
> index b38bf741d37b..da8e2a91eff7 100644
> --- a/sysdeps/unix/sysv/linux/ia64/kernel_stat.h
> +++ b/sysdeps/unix/sysv/linux/ia64/kernel_stat.h
> @@ -18,4 +18,3 @@
>  
>  #define STAT_IS_KERNEL_STAT 1
>  #define XSTAT_IS_XSTAT64 1
> -#define STATFS_IS_STATFS64 0
> diff --git a/sysdeps/unix/sysv/linux/kernel_stat.h b/sysdeps/unix/sysv/linux/kernel_stat.h
> index eecc962de390..4354d14f76e9 100644
> --- a/sysdeps/unix/sysv/linux/kernel_stat.h
> +++ b/sysdeps/unix/sysv/linux/kernel_stat.h
> @@ -35,4 +35,3 @@ struct kernel_stat
>  #define _HAVE_STAT64_NSEC
>  
>  #define XSTAT_IS_XSTAT64 0
> -#define STATFS_IS_STATFS64 0
> diff --git a/sysdeps/unix/sysv/linux/microblaze/kernel_stat.h b/sysdeps/unix/sysv/linux/microblaze/kernel_stat.h
> index 765e0dca6763..159870d9d5a7 100644
> --- a/sysdeps/unix/sysv/linux/microblaze/kernel_stat.h
> +++ b/sysdeps/unix/sysv/linux/microblaze/kernel_stat.h
> @@ -49,4 +49,3 @@ struct kernel_stat
>  };
>  
>  #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 388df1bfffec..a41d15f95cfa 100644
> --- a/sysdeps/unix/sysv/linux/mips/kernel_stat.h
> +++ b/sysdeps/unix/sysv/linux/mips/kernel_stat.h
> @@ -57,4 +57,3 @@ struct kernel_stat
>  #endif
>  
>  #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 c5948a4d3c1c..c28ad2dbc165 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/kernel_stat.h
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/kernel_stat.h
> @@ -48,4 +48,3 @@ struct kernel_stat
>  #define _HAVE_STAT64_NSEC
>  
>  #define XSTAT_IS_XSTAT64 0
> -#define STATFS_IS_STATFS64 0
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/kernel_stat.h b/sysdeps/unix/sysv/linux/powerpc/powerpc64/kernel_stat.h
> index 5c10da3356f2..b764efe1a625 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/kernel_stat.h
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/kernel_stat.h
> @@ -18,4 +18,3 @@
>  
>  #define STAT_IS_KERNEL_STAT 1
>  #define XSTAT_IS_XSTAT64 1
> -#define STATFS_IS_STATFS64 0
> diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/kernel_stat.h b/sysdeps/unix/sysv/linux/s390/s390-64/kernel_stat.h
> index b38bf741d37b..da8e2a91eff7 100644
> --- a/sysdeps/unix/sysv/linux/s390/s390-64/kernel_stat.h
> +++ b/sysdeps/unix/sysv/linux/s390/s390-64/kernel_stat.h
> @@ -18,4 +18,3 @@
>  
>  #define STAT_IS_KERNEL_STAT 1
>  #define XSTAT_IS_XSTAT64 1
> -#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 a4416009f1bc..eb6023692955 100644
> --- a/sysdeps/unix/sysv/linux/sparc/sparc32/kernel_stat.h
> +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/kernel_stat.h
> @@ -32,4 +32,3 @@ struct kernel_stat
>  #define _HAVE_STAT64_NSEC
>  
>  #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 30afb553b9b8..2a26a78d9c19 100644
> --- a/sysdeps/unix/sysv/linux/sparc/sparc64/kernel_stat.h
> +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/kernel_stat.h
> @@ -45,4 +45,3 @@ struct kernel_stat64
>    };
>  
>  #define XSTAT_IS_XSTAT64 1
> -#define STATFS_IS_STATFS64 0
> diff --git a/sysdeps/unix/sysv/linux/statfs64.c b/sysdeps/unix/sysv/linux/statfs64.c
> index c9411286375b..153654ac318f 100644
> --- a/sysdeps/unix/sysv/linux/statfs64.c
> +++ b/sysdeps/unix/sysv/linux/statfs64.c
> @@ -22,15 +22,6 @@
>  #include <sysdep.h>
>  #include <kernel_stat.h>
>  
> -/* Hide the prototypes for __statfs and statfs so that GCC will not
> -   complain about the different function signatures if they are aliased
> -   to  __stat64.  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 __statfs __statfs_disable
> -# define statfs statfs_disable
> -#endif
>  #include <sys/statfs.h>
>  
>  #include <kernel-features.h>
> @@ -87,9 +78,3 @@ weak_alias (__statfs64, statfs64)
>  
>  #undef __statfs
>  #undef statfs
> -
> -#if STATFS_IS_STATFS64
> -weak_alias (__statfs64, __statfs)
> -weak_alias (__statfs64, statfs)
> -libc_hidden_ver (__statfs64, __statfs)
> -#endif
> diff --git a/sysdeps/unix/sysv/linux/x86_64/kernel_stat.h b/sysdeps/unix/sysv/linux/x86_64/kernel_stat.h
> index b38bf741d37b..da8e2a91eff7 100644
> --- a/sysdeps/unix/sysv/linux/x86_64/kernel_stat.h
> +++ b/sysdeps/unix/sysv/linux/x86_64/kernel_stat.h
> @@ -18,4 +18,3 @@
>  
>  #define STAT_IS_KERNEL_STAT 1
>  #define XSTAT_IS_XSTAT64 1
> -#define STATFS_IS_STATFS64 0
> 