From: Carlos O'Donell <carlos@redhat.com>
To: Adhemerval Zanella <adhemerval.zanella@linaro.org>,
libc-alpha@sourceware.org
Subject: Re: [PATCH 01/10] linux: Fix STATFS_IS_STATFS64 definition
Date: Wed, 10 Feb 2021 19:37:21 -0500 [thread overview]
Message-ID: <65a09341-4c30-c019-3184-4f5788593f54@redhat.com> (raw)
In-Reply-To: <20210208214936.1502047-2-adhemerval.zanella@linaro.org>
On 2/8/21 4:49 PM, Adhemerval Zanella via Libc-alpha wrote:
> aarch64, arc, ia64, mips64, powerpc64, riscv32, riscv64, s390x, sparc64,
> and x86_64 defines STATFS_IS_STATFS64 to 0, but all of them alias
> both statfs to statfs64 and struct statfs has the same and layout of
> struct statfs64.
>
> The correct definition will be used on the {f}statfs{64} consolidation.
>
> This patch does not change code generation since the symbols are
> implemented using the auto-generation syscall for all the aforementioned
> abis.
This is sane. LGTM.
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
> ---
> sysdeps/unix/sysv/linux/aarch64/kernel_stat.h | 21 +++++++++++++++++++
> sysdeps/unix/sysv/linux/ia64/kernel_stat.h | 2 +-
> sysdeps/unix/sysv/linux/mips/kernel_stat.h | 6 +++++-
> .../linux/powerpc/powerpc64/kernel_stat.h | 2 +-
> sysdeps/unix/sysv/linux/riscv/kernel_stat.h | 2 +-
> .../sysv/linux/s390/s390-64/kernel_stat.h | 2 +-
> .../sysv/linux/sparc/sparc64/kernel_stat.h | 7 +++++--
> sysdeps/unix/sysv/linux/x86_64/kernel_stat.h | 2 +-
> 8 files changed, 36 insertions(+), 8 deletions(-)
> create mode 100644 sysdeps/unix/sysv/linux/aarch64/kernel_stat.h
>
> diff --git a/sysdeps/unix/sysv/linux/aarch64/kernel_stat.h b/sysdeps/unix/sysv/linux/aarch64/kernel_stat.h
> new file mode 100644
> index 0000000000..33ad1b622b
> --- /dev/null
> +++ b/sysdeps/unix/sysv/linux/aarch64/kernel_stat.h
> @@ -0,0 +1,21 @@
> +/* Internal definitions for stat functions. Linux/AARch64 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/>. */
> +
> +#define STAT_IS_KERNEL_STAT 1
> +#define XSTAT_IS_XSTAT64 1
> +#define STATFS_IS_STATFS64 1
> diff --git a/sysdeps/unix/sysv/linux/ia64/kernel_stat.h b/sysdeps/unix/sysv/linux/ia64/kernel_stat.h
> index e1eac69850..ee05a15590 100644
> --- a/sysdeps/unix/sysv/linux/ia64/kernel_stat.h
> +++ b/sysdeps/unix/sysv/linux/ia64/kernel_stat.h
> @@ -19,4 +19,4 @@
> #define STAT_IS_KERNEL_STAT 1
> #define STAT64_IS_KERNEL_STAT64 1
> #define XSTAT_IS_XSTAT64 1
> -#define STATFS_IS_STATFS64 0
> +#define STATFS_IS_STATFS64 1
> diff --git a/sysdeps/unix/sysv/linux/mips/kernel_stat.h b/sysdeps/unix/sysv/linux/mips/kernel_stat.h
> index 21dba2de73..e4b0f211ca 100644
> --- a/sysdeps/unix/sysv/linux/mips/kernel_stat.h
> +++ b/sysdeps/unix/sysv/linux/mips/kernel_stat.h
> @@ -62,6 +62,10 @@ 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
> +#if _MIPS_SIM == _ABI64
> +# define STATFS_IS_STATFS64 1
> +#else
> +# define STATFS_IS_STATFS64 0
> +#endif
>
> #endif
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/kernel_stat.h b/sysdeps/unix/sysv/linux/powerpc/powerpc64/kernel_stat.h
> index a1f66bcece..bc7390c9ff 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/kernel_stat.h
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/kernel_stat.h
> @@ -19,4 +19,4 @@
> #define STAT_IS_KERNEL_STAT 1
> #define STAT64_IS_KERNEL_STAT64 1
> #define XSTAT_IS_XSTAT64 1
> -#define STATFS_IS_STATFS64 0
> +#define STATFS_IS_STATFS64 1
> diff --git a/sysdeps/unix/sysv/linux/riscv/kernel_stat.h b/sysdeps/unix/sysv/linux/riscv/kernel_stat.h
> index ee8b37a9eb..4ad7913762 100644
> --- a/sysdeps/unix/sysv/linux/riscv/kernel_stat.h
> +++ b/sysdeps/unix/sysv/linux/riscv/kernel_stat.h
> @@ -20,4 +20,4 @@
> #define STAT_IS_KERNEL_STAT 1
>
> #define XSTAT_IS_XSTAT64 1
> -#define STATFS_IS_STATFS64 0
> +#define STATFS_IS_STATFS64 1
> 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..ee05a15590 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,4 @@
> #define STAT_IS_KERNEL_STAT 1
> #define STAT64_IS_KERNEL_STAT64 1
> #define XSTAT_IS_XSTAT64 1
> -#define STATFS_IS_STATFS64 0
> +#define STATFS_IS_STATFS64 1
> diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/kernel_stat.h b/sysdeps/unix/sysv/linux/sparc/sparc64/kernel_stat.h
> index 0f3d405239..29d18908da 100644
> --- a/sysdeps/unix/sysv/linux/sparc/sparc64/kernel_stat.h
> +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/kernel_stat.h
> @@ -50,6 +50,9 @@ 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
> -
> +#ifdef __arch64__
> +# define STATFS_IS_STATFS64 1
> +#else
> +# define STATFS_IS_STATFS64 0
> +#endif
> #endif /* _KERNEL_STAT_H */
> diff --git a/sysdeps/unix/sysv/linux/x86_64/kernel_stat.h b/sysdeps/unix/sysv/linux/x86_64/kernel_stat.h
> index e1eac69850..ee05a15590 100644
> --- a/sysdeps/unix/sysv/linux/x86_64/kernel_stat.h
> +++ b/sysdeps/unix/sysv/linux/x86_64/kernel_stat.h
> @@ -19,4 +19,4 @@
> #define STAT_IS_KERNEL_STAT 1
> #define STAT64_IS_KERNEL_STAT64 1
> #define XSTAT_IS_XSTAT64 1
> -#define STATFS_IS_STATFS64 0
> +#define STATFS_IS_STATFS64 1
>
--
Cheers,
Carlos.
next prev parent reply other threads:[~2021-02-11 0:37 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-08 21:49 [PATCH 00/10] [f]stat[fs,vfs] consolidation Adhemerval Zanella
2021-02-08 21:49 ` [PATCH 01/10] linux: Fix STATFS_IS_STATFS64 definition Adhemerval Zanella
2021-02-11 0:37 ` Carlos O'Donell [this message]
2021-02-08 21:49 ` [PATCH 02/10] linux: Set default kernel_stat.h to LFS Adhemerval Zanella
2021-02-11 0:37 ` Carlos O'Donell
2021-02-08 21:49 ` [PATCH 03/10] linux: Set LFS statfs as default Adhemerval Zanella
2021-02-11 0:37 ` Carlos O'Donell
2021-02-08 21:49 ` [PATCH 04/10] linux: Consolidate fstatfs implementations Adhemerval Zanella
2021-02-11 0:38 ` Carlos O'Donell
2021-02-08 21:49 ` [PATCH 05/10] linux: Consolidate statfs implementations Adhemerval Zanella
2021-02-11 0:38 ` Carlos O'Donell
2021-02-08 21:49 ` [PATCH 06/10] linux: Consolidate fstatvfs implementations Adhemerval Zanella
2021-02-11 0:38 ` Carlos O'Donell
2021-02-08 21:49 ` [PATCH 07/10] linux: Consolidate statvfs implementations Adhemerval Zanella
2021-02-11 0:38 ` Carlos O'Donell
2021-02-08 21:49 ` [PATCH 08/10] linux: Consolidate internal_statvfs Adhemerval Zanella
2021-02-11 0:38 ` Carlos O'Donell
2021-02-08 21:49 ` [PATCH 09/10] linux: Remove overflow.h Adhemerval Zanella
2021-02-11 0:38 ` Carlos O'Donell
2021-02-08 21:49 ` [PATCH 10/10] linux: Remove stat-check.c Adhemerval Zanella
2021-02-11 0:38 ` Carlos O'Donell
2021-02-11 0:37 ` [PATCH 00/10] [f]stat[fs,vfs] consolidation Carlos O'Donell
2021-02-11 20:08 ` Joseph Myers
2021-02-11 20:13 ` Carlos O'Donell
2021-02-11 20:17 ` Adhemerval Zanella
2021-02-11 20:30 ` Carlos O'Donell
2021-02-11 20:32 ` DJ Delorie
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=65a09341-4c30-c019-3184-4f5788593f54@redhat.com \
--to=carlos@redhat.com \
--cc=adhemerval.zanella@linaro.org \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).