Remove STATFS_IS_STATFS64 conditional as it is zero in all ports
PATCH 1/1 Remove STATFS_IS_STATFS64 conditional as it is zero in all ports
From: Vineet Gupta <[email protected]>
This seems to be dead code, so remove it.
--- 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(-)
sysdeps/unix/sysv/linux/alpha/kernel_stat.h +0 -1
@@ -86,4 +86,3 @@ struct glibc21_stat };#define XSTAT_IS_XSTAT64 1 -#define STATFS_IS_STATFS64 0
sysdeps/unix/sysv/linux/fstatfs64.c +0 -14
@@ -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
sysdeps/unix/sysv/linux/generic/kernel_stat.h +0 -2
@@ -26,5 +26,3 @@#else # define XSTAT_IS_XSTAT64 0#endif - -#define STATFS_IS_STATFS64 0
sysdeps/unix/sysv/linux/generic/wordsize-32/fstatfs.c +0 -2
@@ -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
sysdeps/unix/sysv/linux/generic/wordsize-32/statfs.c +0 -2
@@ -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
sysdeps/unix/sysv/linux/hppa/kernel_stat.h +0 -1
@@ -31,4 +31,3 @@ struct kernel_stat {#define _HAVE_STAT64_NSEC#define XSTAT_IS_XSTAT64 0 -#define STATFS_IS_STATFS64 0
sysdeps/unix/sysv/linux/ia64/kernel_stat.h +0 -1
@@ -18,4 +18,3 @@#define STAT_IS_KERNEL_STAT 1#define XSTAT_IS_XSTAT64 1 -#define STATFS_IS_STATFS64 0
sysdeps/unix/sysv/linux/kernel_stat.h +0 -1
@@ -35,4 +35,3 @@ struct kernel_stat#define _HAVE_STAT64_NSEC#define XSTAT_IS_XSTAT64 0 -#define STATFS_IS_STATFS64 0
sysdeps/unix/sysv/linux/microblaze/kernel_stat.h +0 -1
@@ -49,4 +49,3 @@ struct kernel_stat };#define XSTAT_IS_XSTAT64 0 -#define STATFS_IS_STATFS64 0
sysdeps/unix/sysv/linux/mips/kernel_stat.h +0 -1
@@ -57,4 +57,3 @@ struct kernel_stat#endif #define XSTAT_IS_XSTAT64 0 -#define STATFS_IS_STATFS64 0
sysdeps/unix/sysv/linux/powerpc/powerpc32/kernel_stat.h +0 -1
@@ -48,4 +48,3 @@ struct kernel_stat#define _HAVE_STAT64_NSEC#define XSTAT_IS_XSTAT64 0 -#define STATFS_IS_STATFS64 0
sysdeps/unix/sysv/linux/powerpc/powerpc64/kernel_stat.h +0 -1
@@ -18,4 +18,3 @@#define STAT_IS_KERNEL_STAT 1#define XSTAT_IS_XSTAT64 1 -#define STATFS_IS_STATFS64 0
sysdeps/unix/sysv/linux/s390/s390-64/kernel_stat.h +0 -1
@@ -18,4 +18,3 @@#define STAT_IS_KERNEL_STAT 1#define XSTAT_IS_XSTAT64 1 -#define STATFS_IS_STATFS64 0
sysdeps/unix/sysv/linux/sparc/sparc32/kernel_stat.h +0 -1
@@ -32,4 +32,3 @@ struct kernel_stat#define _HAVE_STAT64_NSEC#define XSTAT_IS_XSTAT64 0 -#define STATFS_IS_STATFS64 0
sysdeps/unix/sysv/linux/sparc/sparc64/kernel_stat.h +0 -1
@@ -45,4 +45,3 @@ struct kernel_stat64 };#define XSTAT_IS_XSTAT64 1 -#define STATFS_IS_STATFS64 0
sysdeps/unix/sysv/linux/statfs64.c +0 -15
@@ -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
sysdeps/unix/sysv/linux/x86_64/kernel_stat.h +0 -1
@@ -18,4 +18,3 @@#define STAT_IS_KERNEL_STAT 1#define XSTAT_IS_XSTAT64 1 -#define STATFS_IS_STATFS64 0
Signature · 7 lines
2.25.1 _______________________________________________ linux-snps-arc mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-snps-arc
Quoted 3 lines · Vineet Gupta via Libc-alpha
From: Vineet Gupta <[email protected]>
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.
Quoted 228 lines
--- 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(-)sysdeps/unix/sysv/linux/alpha/kernel_stat.h +0
-1@@ -86,4 +86,3 @@ struct glibc21_stat };#define XSTAT_IS_XSTAT64 1 -#define STATFS_IS_STATFS64 0sysdeps/unix/sysv/linux/fstatfs64.c +0
-14@@ -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 sysdeps/unix/sysv/linux/generic/kernel_stat.h +0
-2@@ -26,5 +26,3 @@#else # define XSTAT_IS_XSTAT64 0#endif - -#define STATFS_IS_STATFS64 0sysdeps/unix/sysv/linux/generic/wordsize-32/fstatfs.c +0
-2@@ -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 sysdeps/unix/sysv/linux/generic/wordsize-32/statfs.c +0
-2@@ -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 sysdeps/unix/sysv/linux/hppa/kernel_stat.h +0
-1@@ -31,4 +31,3 @@ struct kernel_stat {#define _HAVE_STAT64_NSEC#define XSTAT_IS_XSTAT64 0 -#define STATFS_IS_STATFS64 0sysdeps/unix/sysv/linux/ia64/kernel_stat.h +0
-1@@ -18,4 +18,3 @@#define STAT_IS_KERNEL_STAT 1#define XSTAT_IS_XSTAT64 1 -#define STATFS_IS_STATFS64 0sysdeps/unix/sysv/linux/kernel_stat.h +0
-1@@ -35,4 +35,3 @@ struct kernel_stat#define _HAVE_STAT64_NSEC#define XSTAT_IS_XSTAT64 0 -#define STATFS_IS_STATFS64 0sysdeps/unix/sysv/linux/microblaze/kernel_stat.h +0
-1@@ -49,4 +49,3 @@ struct kernel_stat };#define XSTAT_IS_XSTAT64 0 -#define STATFS_IS_STATFS64 0sysdeps/unix/sysv/linux/mips/kernel_stat.h +0
-1@@ -57,4 +57,3 @@ struct kernel_stat#endif #define XSTAT_IS_XSTAT64 0 -#define STATFS_IS_STATFS64 0sysdeps/unix/sysv/linux/powerpc/powerpc32/kernel_stat.h +0
-1@@ -48,4 +48,3 @@ struct kernel_stat#define _HAVE_STAT64_NSEC#define XSTAT_IS_XSTAT64 0 -#define STATFS_IS_STATFS64 0sysdeps/unix/sysv/linux/powerpc/powerpc64/kernel_stat.h +0
-1@@ -18,4 +18,3 @@#define STAT_IS_KERNEL_STAT 1#define XSTAT_IS_XSTAT64 1 -#define STATFS_IS_STATFS64 0sysdeps/unix/sysv/linux/s390/s390-64/kernel_stat.h +0
-1@@ -18,4 +18,3 @@#define STAT_IS_KERNEL_STAT 1#define XSTAT_IS_XSTAT64 1 -#define STATFS_IS_STATFS64 0sysdeps/unix/sysv/linux/sparc/sparc32/kernel_stat.h +0
-1@@ -32,4 +32,3 @@ struct kernel_stat#define _HAVE_STAT64_NSEC#define XSTAT_IS_XSTAT64 0 -#define STATFS_IS_STATFS64 0sysdeps/unix/sysv/linux/sparc/sparc64/kernel_stat.h +0
-1@@ -45,4 +45,3 @@ struct kernel_stat64 };#define XSTAT_IS_XSTAT64 1 -#define STATFS_IS_STATFS64 0sysdeps/unix/sysv/linux/statfs64.c +0
-15@@ -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 sysdeps/unix/sysv/linux/x86_64/kernel_stat.h +0
-0
sysdeps/unix/sysv/linux/x86_64/kernel_stat.h line 21
Quoted 4 lines
sysdeps/unix/sysv/linux/x86_64/kernel_stat.h +0
-1@@ -18,4 +18,3 @@#define STAT_IS_KERNEL_STAT 1#define XSTAT_IS_XSTAT64 1 -#define STATFS_IS_STATFS64 0
_______________________________________________
linux-snps-arc mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-snps-arc
Quoted 5 lines · Adhemerval Zanella via Libc-alpha
Quoted 2 lines · Vineet Gupta via Libc-alpha
From: Vineet Gupta <[email protected]>
Quoted 8 lines
Quoted 1 line
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 <[email protected]>
Thx. But it seems this could collide with your series. I'll wait it out and rebase after your changes have settled in.
-Vineet
Quoted 228 lines
Quoted 228 lines
--- 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(-)sysdeps/unix/sysv/linux/alpha/kernel_stat.h +0
-1@@ -86,4 +86,3 @@ struct glibc21_stat };#define XSTAT_IS_XSTAT64 1 -#define STATFS_IS_STATFS64 0sysdeps/unix/sysv/linux/fstatfs64.c +0
-14@@ -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 sysdeps/unix/sysv/linux/generic/kernel_stat.h +0
-2@@ -26,5 +26,3 @@#else # define XSTAT_IS_XSTAT64 0#endif - -#define STATFS_IS_STATFS64 0sysdeps/unix/sysv/linux/generic/wordsize-32/fstatfs.c +0
-2@@ -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 sysdeps/unix/sysv/linux/generic/wordsize-32/statfs.c +0
-2@@ -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 sysdeps/unix/sysv/linux/hppa/kernel_stat.h +0
-1@@ -31,4 +31,3 @@ struct kernel_stat {#define _HAVE_STAT64_NSEC#define XSTAT_IS_XSTAT64 0 -#define STATFS_IS_STATFS64 0sysdeps/unix/sysv/linux/ia64/kernel_stat.h +0
-1@@ -18,4 +18,3 @@#define STAT_IS_KERNEL_STAT 1#define XSTAT_IS_XSTAT64 1 -#define STATFS_IS_STATFS64 0sysdeps/unix/sysv/linux/kernel_stat.h +0
-1@@ -35,4 +35,3 @@ struct kernel_stat#define _HAVE_STAT64_NSEC#define XSTAT_IS_XSTAT64 0 -#define STATFS_IS_STATFS64 0sysdeps/unix/sysv/linux/microblaze/kernel_stat.h +0
-1@@ -49,4 +49,3 @@ struct kernel_stat };#define XSTAT_IS_XSTAT64 0 -#define STATFS_IS_STATFS64 0sysdeps/unix/sysv/linux/mips/kernel_stat.h +0
-1@@ -57,4 +57,3 @@ struct kernel_stat#endif #define XSTAT_IS_XSTAT64 0 -#define STATFS_IS_STATFS64 0sysdeps/unix/sysv/linux/powerpc/powerpc32/kernel_stat.h +0
-1@@ -48,4 +48,3 @@ struct kernel_stat#define _HAVE_STAT64_NSEC#define XSTAT_IS_XSTAT64 0 -#define STATFS_IS_STATFS64 0sysdeps/unix/sysv/linux/powerpc/powerpc64/kernel_stat.h +0
-1@@ -18,4 +18,3 @@#define STAT_IS_KERNEL_STAT 1#define XSTAT_IS_XSTAT64 1 -#define STATFS_IS_STATFS64 0sysdeps/unix/sysv/linux/s390/s390-64/kernel_stat.h +0
-1@@ -18,4 +18,3 @@#define STAT_IS_KERNEL_STAT 1#define XSTAT_IS_XSTAT64 1 -#define STATFS_IS_STATFS64 0sysdeps/unix/sysv/linux/sparc/sparc32/kernel_stat.h +0
-1@@ -32,4 +32,3 @@ struct kernel_stat#define _HAVE_STAT64_NSEC#define XSTAT_IS_XSTAT64 0 -#define STATFS_IS_STATFS64 0sysdeps/unix/sysv/linux/sparc/sparc64/kernel_stat.h +0
-1@@ -45,4 +45,3 @@ struct kernel_stat64 };#define XSTAT_IS_XSTAT64 1 -#define STATFS_IS_STATFS64 0sysdeps/unix/sysv/linux/statfs64.c +0
-15@@ -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 sysdeps/unix/sysv/linux/x86_64/kernel_stat.h +0
-0@@ -18,4 +18,3 @@
Quoted 5 lines
sysdeps/unix/sysv/linux/x86_64/kernel_stat.h line 21
Quoted 4 lines
sysdeps/unix/sysv/linux/x86_64/kernel_stat.h +0
-1#define STAT_IS_KERNEL_STAT 1#define XSTAT_IS_XSTAT64 1 -#define STATFS_IS_STATFS64 0
_______________________________________________
linux-snps-arc mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-snps-arc