[06/10] linux: Consolidate fstatvfs implementations
Commit Message
There is no need to handle ENOSYS on fstatfs64 call, required only
for alpha (where is already fallbacks to fstatfs). The wordsize
internal_statvfs64.c is removed, since how the LFS support is
provided by fstatvfs64.c (used on 64-bit architectures as well).
Checked on x86_64-linux-gnu.
---
sysdeps/unix/sysv/linux/alpha/fstatvfs.c | 1 -
sysdeps/unix/sysv/linux/alpha/fstatvfs64.c | 1 -
sysdeps/unix/sysv/linux/fstatvfs.c | 9 ++--
sysdeps/unix/sysv/linux/fstatvfs64.c | 53 +++++++------------
.../unix/sysv/linux/wordsize-64/fstatvfs.c | 5 --
.../unix/sysv/linux/wordsize-64/fstatvfs64.c | 1 -
.../linux/wordsize-64/internal_statvfs64.c | 1 -
7 files changed, 25 insertions(+), 46 deletions(-)
delete mode 100644 sysdeps/unix/sysv/linux/alpha/fstatvfs.c
delete mode 100644 sysdeps/unix/sysv/linux/alpha/fstatvfs64.c
delete mode 100644 sysdeps/unix/sysv/linux/wordsize-64/fstatvfs.c
delete mode 100644 sysdeps/unix/sysv/linux/wordsize-64/fstatvfs64.c
delete mode 100644 sysdeps/unix/sysv/linux/wordsize-64/internal_statvfs64.c
Comments
On 2/8/21 4:49 PM, Adhemerval Zanella via Libc-alpha wrote:
> There is no need to handle ENOSYS on fstatfs64 call, required only
> for alpha (where is already fallbacks to fstatfs). The wordsize
> internal_statvfs64.c is removed, since how the LFS support is
> provided by fstatvfs64.c (used on 64-bit architectures as well).
LGTM.
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
> Checked on x86_64-linux-gnu.
> ---
> sysdeps/unix/sysv/linux/alpha/fstatvfs.c | 1 -
> sysdeps/unix/sysv/linux/alpha/fstatvfs64.c | 1 -
> sysdeps/unix/sysv/linux/fstatvfs.c | 9 ++--
> sysdeps/unix/sysv/linux/fstatvfs64.c | 53 +++++++------------
> .../unix/sysv/linux/wordsize-64/fstatvfs.c | 5 --
> .../unix/sysv/linux/wordsize-64/fstatvfs64.c | 1 -
> .../linux/wordsize-64/internal_statvfs64.c | 1 -
> 7 files changed, 25 insertions(+), 46 deletions(-)
> delete mode 100644 sysdeps/unix/sysv/linux/alpha/fstatvfs.c
> delete mode 100644 sysdeps/unix/sysv/linux/alpha/fstatvfs64.c
> delete mode 100644 sysdeps/unix/sysv/linux/wordsize-64/fstatvfs.c
> delete mode 100644 sysdeps/unix/sysv/linux/wordsize-64/fstatvfs64.c
> delete mode 100644 sysdeps/unix/sysv/linux/wordsize-64/internal_statvfs64.c
>
> diff --git a/sysdeps/unix/sysv/linux/alpha/fstatvfs.c b/sysdeps/unix/sysv/linux/alpha/fstatvfs.c
> deleted file mode 100644
> index 92e772347b..0000000000
> --- a/sysdeps/unix/sysv/linux/alpha/fstatvfs.c
> +++ /dev/null
> @@ -1 +0,0 @@
> -#include <sysdeps/unix/sysv/linux/fstatvfs.c>
> diff --git a/sysdeps/unix/sysv/linux/alpha/fstatvfs64.c b/sysdeps/unix/sysv/linux/alpha/fstatvfs64.c
> deleted file mode 100644
> index 0f1e71027a..0000000000
> --- a/sysdeps/unix/sysv/linux/alpha/fstatvfs64.c
> +++ /dev/null
> @@ -1 +0,0 @@
> -#include <sysdeps/unix/sysv/linux/fstatvfs64.c>
> diff --git a/sysdeps/unix/sysv/linux/fstatvfs.c b/sysdeps/unix/sysv/linux/fstatvfs.c
> index 8b67951ab6..0f56a13ca9 100644
> --- a/sysdeps/unix/sysv/linux/fstatvfs.c
> +++ b/sysdeps/unix/sysv/linux/fstatvfs.c
> @@ -16,11 +16,13 @@
> License along with the GNU C Library; if not, see
> <https://www.gnu.org/licenses/>. */
>
> -#include <stddef.h>
> -#include <sys/stat.h>
> +#include <sys/statvfs.h>
> #include <sys/statfs.h>
> -#include "internal_statvfs.h"
> +#include <internal_statvfs.h>
> +#include <time.h>
> +#include <kernel_stat.h>
>
> +#if !STATFS_IS_STATFS64
> int
> __fstatvfs (int fd, struct statvfs *buf)
> {
> @@ -38,3 +40,4 @@ __fstatvfs (int fd, struct statvfs *buf)
> }
> weak_alias (__fstatvfs, fstatvfs)
> libc_hidden_weak (fstatvfs)
> +#endif
> diff --git a/sysdeps/unix/sysv/linux/fstatvfs64.c b/sysdeps/unix/sysv/linux/fstatvfs64.c
> index 6d2dbc5285..b95745e8b8 100644
> --- a/sysdeps/unix/sysv/linux/fstatvfs64.c
> +++ b/sysdeps/unix/sysv/linux/fstatvfs64.c
> @@ -16,48 +16,33 @@
> License along with the GNU C Library; if not, see
> <https://www.gnu.org/licenses/>. */
>
> -#include <errno.h>
> -#include <string.h>
> -#include <sys/stat.h>
> +#define __fstatvfs __fstatvfs_disable
> +#define fstatvfs fstatvfs_disable
> +#include <sys/statvfs.h>
> #include <sys/statfs.h>
> -#include "internal_statvfs.h"
> -#include <kernel-features.h>
> +#include <internal_statvfs.h>
> +#include <time.h>
> +#include <kernel_stat.h>
>
> /* Return information about the filesystem on which FD resides. */
> int
> __fstatvfs64 (int fd, struct statvfs64 *buf)
> {
> struct statfs64 fsbuf;
> - int res = __fstatfs64 (fd, &fsbuf);
> -
> -#ifndef __ASSUME_STATFS64
> - if (res < 0 && errno == ENOSYS)
> - {
> - struct statvfs buf32;
> -
> - res = fstatvfs (fd, &buf32);
> - if (res == 0)
> - {
> - buf->f_bsize = buf32.f_bsize;
> - buf->f_frsize = buf32.f_frsize;
> - 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_favail = buf32.f_favail;
> - buf->f_fsid = buf32.f_fsid;
> - buf->f_flag = buf32.f_flag;
> - buf->f_namemax = buf32.f_namemax;
> - memcpy (buf->__f_spare, buf32.__f_spare, sizeof (buf32.__f_spare));
> - }
> - }
> -#endif
> + if (__fstatfs64 (fd, &fsbuf) < 0)
> + return -1;
>
> - if (res == 0)
> - /* Convert the result. */
> - __internal_statvfs64 (NULL, buf, &fsbuf, fd);
> + /* Convert the result. */
> + __internal_statvfs64 (NULL, buf, &fsbuf, fd);
>
> - return res;
> + return 0;
> }
> weak_alias (__fstatvfs64, fstatvfs64)
> +
> +#undef __fstatvfs
> +#undef fstatvfs
> +
> +#if STATFS_IS_STATFS64
> +weak_alias (__fstatvfs64, __fstatvfs)
> +weak_alias (__fstatvfs64, fstatvfs)
> +#endif
> diff --git a/sysdeps/unix/sysv/linux/wordsize-64/fstatvfs.c b/sysdeps/unix/sysv/linux/wordsize-64/fstatvfs.c
> deleted file mode 100644
> index 5803b6f882..0000000000
> --- a/sysdeps/unix/sysv/linux/wordsize-64/fstatvfs.c
> +++ /dev/null
> @@ -1,5 +0,0 @@
> -#define __fstatvfs64(file, buf) __no_fstatvfs64(file, buf)
> -#define fstatvfs64(file, buf) no_fstatvfs64(file, buf)
> -#include "../fstatvfs.c"
> -strong_alias (__fstatvfs, __fstatvfs64)
> -weak_alias (__fstatvfs, fstatvfs64)
> diff --git a/sysdeps/unix/sysv/linux/wordsize-64/fstatvfs64.c b/sysdeps/unix/sysv/linux/wordsize-64/fstatvfs64.c
> deleted file mode 100644
> index 60f3dfec61..0000000000
> --- a/sysdeps/unix/sysv/linux/wordsize-64/fstatvfs64.c
> +++ /dev/null
> @@ -1 +0,0 @@
> -/* fstatvfs64 is the same as fstatvfs. */
> diff --git a/sysdeps/unix/sysv/linux/wordsize-64/internal_statvfs64.c b/sysdeps/unix/sysv/linux/wordsize-64/internal_statvfs64.c
> deleted file mode 100644
> index d2a3509c6d..0000000000
> --- a/sysdeps/unix/sysv/linux/wordsize-64/internal_statvfs64.c
> +++ /dev/null
> @@ -1 +0,0 @@
> -/* Nothing. */
>
deleted file mode 100644
@@ -1 +0,0 @@
-#include <sysdeps/unix/sysv/linux/fstatvfs.c>
deleted file mode 100644
@@ -1 +0,0 @@
-#include <sysdeps/unix/sysv/linux/fstatvfs64.c>
@@ -16,11 +16,13 @@
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
-#include <stddef.h>
-#include <sys/stat.h>
+#include <sys/statvfs.h>
#include <sys/statfs.h>
-#include "internal_statvfs.h"
+#include <internal_statvfs.h>
+#include <time.h>
+#include <kernel_stat.h>
+#if !STATFS_IS_STATFS64
int
__fstatvfs (int fd, struct statvfs *buf)
{
@@ -38,3 +40,4 @@ __fstatvfs (int fd, struct statvfs *buf)
}
weak_alias (__fstatvfs, fstatvfs)
libc_hidden_weak (fstatvfs)
+#endif
@@ -16,48 +16,33 @@
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
-#include <errno.h>
-#include <string.h>
-#include <sys/stat.h>
+#define __fstatvfs __fstatvfs_disable
+#define fstatvfs fstatvfs_disable
+#include <sys/statvfs.h>
#include <sys/statfs.h>
-#include "internal_statvfs.h"
-#include <kernel-features.h>
+#include <internal_statvfs.h>
+#include <time.h>
+#include <kernel_stat.h>
/* Return information about the filesystem on which FD resides. */
int
__fstatvfs64 (int fd, struct statvfs64 *buf)
{
struct statfs64 fsbuf;
- int res = __fstatfs64 (fd, &fsbuf);
-
-#ifndef __ASSUME_STATFS64
- if (res < 0 && errno == ENOSYS)
- {
- struct statvfs buf32;
-
- res = fstatvfs (fd, &buf32);
- if (res == 0)
- {
- buf->f_bsize = buf32.f_bsize;
- buf->f_frsize = buf32.f_frsize;
- 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_favail = buf32.f_favail;
- buf->f_fsid = buf32.f_fsid;
- buf->f_flag = buf32.f_flag;
- buf->f_namemax = buf32.f_namemax;
- memcpy (buf->__f_spare, buf32.__f_spare, sizeof (buf32.__f_spare));
- }
- }
-#endif
+ if (__fstatfs64 (fd, &fsbuf) < 0)
+ return -1;
- if (res == 0)
- /* Convert the result. */
- __internal_statvfs64 (NULL, buf, &fsbuf, fd);
+ /* Convert the result. */
+ __internal_statvfs64 (NULL, buf, &fsbuf, fd);
- return res;
+ return 0;
}
weak_alias (__fstatvfs64, fstatvfs64)
+
+#undef __fstatvfs
+#undef fstatvfs
+
+#if STATFS_IS_STATFS64
+weak_alias (__fstatvfs64, __fstatvfs)
+weak_alias (__fstatvfs64, fstatvfs)
+#endif
deleted file mode 100644
@@ -1,5 +0,0 @@
-#define __fstatvfs64(file, buf) __no_fstatvfs64(file, buf)
-#define fstatvfs64(file, buf) no_fstatvfs64(file, buf)
-#include "../fstatvfs.c"
-strong_alias (__fstatvfs, __fstatvfs64)
-weak_alias (__fstatvfs, fstatvfs64)
deleted file mode 100644
@@ -1 +0,0 @@
-/* fstatvfs64 is the same as fstatvfs. */
deleted file mode 100644
@@ -1 +0,0 @@
-/* Nothing. */