public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
* [glibc/vineet/statfs-cleanup] Remove STATFS_IS_STATFS64 conditional as it is zero in all ports
@ 2020-11-06 4:38 Vineet Gupta
0 siblings, 0 replies; 2+ messages in thread
From: Vineet Gupta @ 2020-11-06 4:38 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=244574e146d89301f7fe6a22b4f91e61cb6ac1c6
commit 244574e146d89301f7fe6a22b4f91e61cb6ac1c6
Author: Vineet Gupta <Vineet.Gupta1@synopsys.com>
Date: Tue Feb 18 17:29:21 2020 -0800
Remove STATFS_IS_STATFS64 conditional as it is zero in all ports
This seems to be dead code, so remove it.
Diff:
---
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 --
sysdeps/unix/sysv/linux/generic/wordsize-32/fstatfs.c | 2 --
sysdeps/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 -
sysdeps/unix/sysv/linux/powerpc/powerpc32/kernel_stat.h | 1 -
sysdeps/unix/sysv/linux/powerpc/powerpc64/kernel_stat.h | 1 -
sysdeps/unix/sysv/linux/s390/s390-64/kernel_stat.h | 1 -
sysdeps/unix/sysv/linux/sparc/sparc32/kernel_stat.h | 1 -
sysdeps/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 ff69045f8f..2f902272e0 100644
--- a/sysdeps/unix/sysv/linux/alpha/kernel_stat.h
+++ b/sysdeps/unix/sysv/linux/alpha/kernel_stat.h
@@ -88,4 +88,3 @@ struct glibc21_stat
#define STAT_IS_KERNEL_STAT 0
#define STAT64_IS_KERNEL_STAT64 1
#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 9d22fa228f..4a339b548a 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 2eed3596c0..5a600f1883 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 93d9d94a0a..bacc154301 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 7421501b4a..a678e96058 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 e8ad135e70..f121cfb664 100644
--- a/sysdeps/unix/sysv/linux/hppa/kernel_stat.h
+++ b/sysdeps/unix/sysv/linux/hppa/kernel_stat.h
@@ -33,4 +33,3 @@ struct kernel_stat {
#define STAT_IS_KERNEL_STAT 0
#define STAT64_IS_KERNEL_STAT64 1
#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 c96a0589dc..1ff0143bad 100644
--- a/sysdeps/unix/sysv/linux/ia64/kernel_stat.h
+++ b/sysdeps/unix/sysv/linux/ia64/kernel_stat.h
@@ -19,4 +19,3 @@
#define STAT_IS_KERNEL_STAT 1
#define STAT64_IS_KERNEL_STAT64 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 b1bc1459f0..1f6068116d 100644
--- a/sysdeps/unix/sysv/linux/kernel_stat.h
+++ b/sysdeps/unix/sysv/linux/kernel_stat.h
@@ -37,4 +37,3 @@ struct kernel_stat
#define STAT_IS_KERNEL_STAT 0
#define STAT64_IS_KERNEL_STAT64 1
#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 9ab1e50115..52a0a166a3 100644
--- a/sysdeps/unix/sysv/linux/microblaze/kernel_stat.h
+++ b/sysdeps/unix/sysv/linux/microblaze/kernel_stat.h
@@ -51,4 +51,3 @@ struct kernel_stat
#define STAT_IS_KERNEL_STAT 0
#define STAT64_IS_KERNEL_STAT64 1
#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 21dba2de73..029b48d7cb 100644
--- a/sysdeps/unix/sysv/linux/mips/kernel_stat.h
+++ b/sysdeps/unix/sysv/linux/mips/kernel_stat.h
@@ -62,6 +62,5 @@ struct kernel_stat
#define STAT_IS_KERNEL_STAT 0
#define STAT64_IS_KERNEL_STAT64 0
#define XSTAT_IS_XSTAT64 0
-#define STATFS_IS_STATFS64 0
#endif
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/kernel_stat.h b/sysdeps/unix/sysv/linux/powerpc/powerpc32/kernel_stat.h
index 5757e65f8e..5c130a8b0c 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/kernel_stat.h
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/kernel_stat.h
@@ -50,4 +50,3 @@ struct kernel_stat
#define STAT_IS_KERNEL_STAT 0
#define STAT64_IS_KERNEL_STAT64 1
#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 9f11b69e4f..952882cb36 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/kernel_stat.h
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/kernel_stat.h
@@ -19,4 +19,3 @@
#define STAT_IS_KERNEL_STAT 1
#define STAT64_IS_KERNEL_STAT64 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 c96a0589dc..1ff0143bad 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/kernel_stat.h
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/kernel_stat.h
@@ -19,4 +19,3 @@
#define STAT_IS_KERNEL_STAT 1
#define STAT64_IS_KERNEL_STAT64 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 4a2df42d37..d33fc103b7 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc32/kernel_stat.h
+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/kernel_stat.h
@@ -34,4 +34,3 @@ struct kernel_stat
#define STAT_IS_KERNEL_STAT 0
#define STAT64_IS_KERNEL_STAT64 1
#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 0f3d405239..f5b85c0dba 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/kernel_stat.h
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/kernel_stat.h
@@ -50,6 +50,5 @@ struct kernel_stat64
#define STAT_IS_KERNEL_STAT 0
#define STAT64_IS_KERNEL_STAT64 0
#define XSTAT_IS_XSTAT64 1
-#define STATFS_IS_STATFS64 0
#endif /* _KERNEL_STAT_H */
diff --git a/sysdeps/unix/sysv/linux/statfs64.c b/sysdeps/unix/sysv/linux/statfs64.c
index 2c293badc8..3c3fb67ef6 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>
@@ -88,9 +79,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 c96a0589dc..1ff0143bad 100644
--- a/sysdeps/unix/sysv/linux/x86_64/kernel_stat.h
+++ b/sysdeps/unix/sysv/linux/x86_64/kernel_stat.h
@@ -19,4 +19,3 @@
#define STAT_IS_KERNEL_STAT 1
#define STAT64_IS_KERNEL_STAT64 1
#define XSTAT_IS_XSTAT64 1
-#define STATFS_IS_STATFS64 0
^ permalink raw reply [flat|nested] 2+ messages in thread
* [glibc/vineet/statfs-cleanup] Remove STATFS_IS_STATFS64 conditional as it is zero in all ports
@ 2021-02-08 23:45 Vineet Gupta
0 siblings, 0 replies; 2+ messages in thread
From: Vineet Gupta @ 2021-02-08 23:45 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=7cd34c96fd97b215788176554e2ece76b31dec56
commit 7cd34c96fd97b215788176554e2ece76b31dec56
Author: Vineet Gupta <Vineet.Gupta1@synopsys.com>
Date: Tue Feb 18 17:29:21 2020 -0800
Remove STATFS_IS_STATFS64 conditional as it is zero in all ports
This seems to be dead code, so remove it.
Diff:
---
sysdeps/unix/sysv/linux/alpha/kernel_stat.h | 1 -
sysdeps/unix/sysv/linux/arc/kernel_stat.h | 2 --
sysdeps/unix/sysv/linux/fstatfs64.c | 14 --------------
sysdeps/unix/sysv/linux/generic/kernel_stat.h | 2 --
sysdeps/unix/sysv/linux/generic/wordsize-32/fstatfs.c | 2 --
sysdeps/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 -
sysdeps/unix/sysv/linux/powerpc/powerpc32/kernel_stat.h | 1 -
sysdeps/unix/sysv/linux/powerpc/powerpc64/kernel_stat.h | 1 -
sysdeps/unix/sysv/linux/riscv/kernel_stat.h | 1 -
sysdeps/unix/sysv/linux/s390/s390-64/kernel_stat.h | 1 -
sysdeps/unix/sysv/linux/sparc/sparc32/kernel_stat.h | 1 -
sysdeps/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 -
19 files changed, 50 deletions(-)
diff --git a/sysdeps/unix/sysv/linux/alpha/kernel_stat.h b/sysdeps/unix/sysv/linux/alpha/kernel_stat.h
index a292920969..ef46ec8a3c 100644
--- a/sysdeps/unix/sysv/linux/alpha/kernel_stat.h
+++ b/sysdeps/unix/sysv/linux/alpha/kernel_stat.h
@@ -88,4 +88,3 @@ struct glibc21_stat
#define STAT_IS_KERNEL_STAT 0
#define STAT64_IS_KERNEL_STAT64 1
#define XSTAT_IS_XSTAT64 1
-#define STATFS_IS_STATFS64 0
diff --git a/sysdeps/unix/sysv/linux/arc/kernel_stat.h b/sysdeps/unix/sysv/linux/arc/kernel_stat.h
index edd96b1b94..6dd7191a26 100644
--- a/sysdeps/unix/sysv/linux/arc/kernel_stat.h
+++ b/sysdeps/unix/sysv/linux/arc/kernel_stat.h
@@ -23,5 +23,3 @@
/* Nice side-effect of 64-bit time_t switch is these are same. */
#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 b5ff74d66c..28fd12acaf 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 350f0cc1bb..548113d1b3 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 a611f33128..b19e2064ad 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 <stddef.h>
#include <sysdep.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 2c51fbf1b0..31c6dcd90d 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 <sysdep.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 e8ad135e70..f121cfb664 100644
--- a/sysdeps/unix/sysv/linux/hppa/kernel_stat.h
+++ b/sysdeps/unix/sysv/linux/hppa/kernel_stat.h
@@ -33,4 +33,3 @@ struct kernel_stat {
#define STAT_IS_KERNEL_STAT 0
#define STAT64_IS_KERNEL_STAT64 1
#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 e1eac69850..70604e227a 100644
--- a/sysdeps/unix/sysv/linux/ia64/kernel_stat.h
+++ b/sysdeps/unix/sysv/linux/ia64/kernel_stat.h
@@ -19,4 +19,3 @@
#define STAT_IS_KERNEL_STAT 1
#define STAT64_IS_KERNEL_STAT64 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 b1bc1459f0..1f6068116d 100644
--- a/sysdeps/unix/sysv/linux/kernel_stat.h
+++ b/sysdeps/unix/sysv/linux/kernel_stat.h
@@ -37,4 +37,3 @@ struct kernel_stat
#define STAT_IS_KERNEL_STAT 0
#define STAT64_IS_KERNEL_STAT64 1
#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 af12ac60c3..7dc994d149 100644
--- a/sysdeps/unix/sysv/linux/microblaze/kernel_stat.h
+++ b/sysdeps/unix/sysv/linux/microblaze/kernel_stat.h
@@ -51,4 +51,3 @@ struct kernel_stat
#define STAT_IS_KERNEL_STAT 0
#define STAT64_IS_KERNEL_STAT64 1
#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 21dba2de73..029b48d7cb 100644
--- a/sysdeps/unix/sysv/linux/mips/kernel_stat.h
+++ b/sysdeps/unix/sysv/linux/mips/kernel_stat.h
@@ -62,6 +62,5 @@ struct kernel_stat
#define STAT_IS_KERNEL_STAT 0
#define STAT64_IS_KERNEL_STAT64 0
#define XSTAT_IS_XSTAT64 0
-#define STATFS_IS_STATFS64 0
#endif
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/kernel_stat.h b/sysdeps/unix/sysv/linux/powerpc/powerpc32/kernel_stat.h
index e89ee5fdc8..eed906fc42 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/kernel_stat.h
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/kernel_stat.h
@@ -50,4 +50,3 @@ struct kernel_stat
#define STAT_IS_KERNEL_STAT 0
#define STAT64_IS_KERNEL_STAT64 1
#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 a1f66bcece..b5822cdb86 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/kernel_stat.h
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/kernel_stat.h
@@ -19,4 +19,3 @@
#define STAT_IS_KERNEL_STAT 1
#define STAT64_IS_KERNEL_STAT64 1
#define XSTAT_IS_XSTAT64 1
-#define STATFS_IS_STATFS64 0
diff --git a/sysdeps/unix/sysv/linux/riscv/kernel_stat.h b/sysdeps/unix/sysv/linux/riscv/kernel_stat.h
index ee8b37a9eb..9cfc891bdd 100644
--- a/sysdeps/unix/sysv/linux/riscv/kernel_stat.h
+++ b/sysdeps/unix/sysv/linux/riscv/kernel_stat.h
@@ -20,4 +20,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 e1eac69850..70604e227a 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/kernel_stat.h
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/kernel_stat.h
@@ -19,4 +19,3 @@
#define STAT_IS_KERNEL_STAT 1
#define STAT64_IS_KERNEL_STAT64 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 4a2df42d37..d33fc103b7 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc32/kernel_stat.h
+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/kernel_stat.h
@@ -34,4 +34,3 @@ struct kernel_stat
#define STAT_IS_KERNEL_STAT 0
#define STAT64_IS_KERNEL_STAT64 1
#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 0f3d405239..f5b85c0dba 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/kernel_stat.h
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/kernel_stat.h
@@ -50,6 +50,5 @@ struct kernel_stat64
#define STAT_IS_KERNEL_STAT 0
#define STAT64_IS_KERNEL_STAT64 0
#define XSTAT_IS_XSTAT64 1
-#define STATFS_IS_STATFS64 0
#endif /* _KERNEL_STAT_H */
diff --git a/sysdeps/unix/sysv/linux/statfs64.c b/sysdeps/unix/sysv/linux/statfs64.c
index c52b3d8ae6..4d03154598 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>
@@ -88,9 +79,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 e1eac69850..70604e227a 100644
--- a/sysdeps/unix/sysv/linux/x86_64/kernel_stat.h
+++ b/sysdeps/unix/sysv/linux/x86_64/kernel_stat.h
@@ -19,4 +19,3 @@
#define STAT_IS_KERNEL_STAT 1
#define STAT64_IS_KERNEL_STAT64 1
#define XSTAT_IS_XSTAT64 1
-#define STATFS_IS_STATFS64 0
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-02-08 23:45 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-06 4:38 [glibc/vineet/statfs-cleanup] Remove STATFS_IS_STATFS64 conditional as it is zero in all ports Vineet Gupta
2021-02-08 23:45 Vineet Gupta
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).