From: Adhemerval Zanella Netto <adhemerval.zanella@linaro.org>
To: наб <nabijaczleweli@nabijaczleweli.xyz>
Cc: Florian Weimer <fweimer@redhat.com>, libc-alpha@sourceware.org
Subject: Re: [PATCH v3 2/3] linux: statvfs: allocate spare for f_type
Date: Fri, 21 Jul 2023 10:03:05 -0300 [thread overview]
Message-ID: <4f0ff835-ef3d-5739-6d6d-1a360d97fd68@linaro.org> (raw)
In-Reply-To: <662dabdece8e902a1234b84cdc46ffefb107397d.1688396342.git.nabijaczleweli@nabijaczleweli.xyz>
On 03/07/23 11:59, наб via Libc-alpha wrote:
> This is the only missing part in struct statvfs.
> The LSB calls [f]statfs() deprecated, and its weird types are definitely
> off-putting. However, its use is required to get f_type.
>
> Instead, allocate one of the six spares to f_type,
> copied directly from struct .
> This then becomes a small glibc extension to the standard interface
> on Linux and the Hurd, instead of two different interfaces, one of which
> is quite odd due to being an ABI type, and there no longer is any reason
> to use statfs().
>
> The underlying kernel type is a mess, but all architectures agree on u32
> (or more) for the ABI, and all filesystem magicks are 32-bit integers.
>
> Link: https://lore.kernel.org/linux-man/f54kudgblgk643u32tb6at4cd3kkzha6hslahv24szs4raroaz@ogivjbfdaqtb/t/#u
> Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
> ---
> sysdeps/unix/sysv/linux/bits/statvfs.h | 6 ++++--
> sysdeps/unix/sysv/linux/internal_statvfs.c | 2 ++
> 2 files changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/sysdeps/unix/sysv/linux/bits/statvfs.h b/sysdeps/unix/sysv/linux/bits/statvfs.h
> index 8dfb5ce761..cf98460e00 100644
> --- a/sysdeps/unix/sysv/linux/bits/statvfs.h
> +++ b/sysdeps/unix/sysv/linux/bits/statvfs.h
> @@ -51,7 +51,8 @@ struct statvfs
> #endif
> unsigned long int f_flag;
> unsigned long int f_namemax;
> - int __f_spare[6];
> + unsigned int f_type;
> + int __f_spare[5];
> };
>
> #ifdef __USE_LARGEFILE64
> @@ -71,7 +72,8 @@ struct statvfs64
> #endif
> unsigned long int f_flag;
> unsigned long int f_namemax;
> - int __f_spare[6];
> + unsigned int f_type;
> + int __f_spare[5];
> };
> #endif
>
All ABIs define fstatfs/statfs64 as signed, as the constants in include/uapi/linux/magic.h.
Should we do the same here?
> diff --git a/sysdeps/unix/sysv/linux/internal_statvfs.c b/sysdeps/unix/sysv/linux/internal_statvfs.c
> index 6a1b7b755f..112d3c241a 100644
> --- a/sysdeps/unix/sysv/linux/internal_statvfs.c
> +++ b/sysdeps/unix/sysv/linux/internal_statvfs.c
> @@ -57,6 +57,7 @@ __internal_statvfs (struct statvfs *buf, const struct statfs *fsbuf)
> buf->__f_unused = 0;
> #endif
> buf->f_namemax = fsbuf->f_namelen;
> + buf->f_type = fsbuf->f_type;
> memset (buf->__f_spare, '\0', sizeof (buf->__f_spare));
>
> /* What remains to do is to fill the fields f_favail and f_flag. */
> @@ -99,6 +100,7 @@ __internal_statvfs64 (struct statvfs64 *buf, const struct statfs64 *fsbuf)
> buf->__f_unused = 0;
> #endif
> buf->f_namemax = fsbuf->f_namelen;
> + buf->f_type = fsbuf->f_type;
> memset (buf->__f_spare, '\0', sizeof (buf->__f_spare));
>
> /* What remains to do is to fill the fields f_favail and f_flag. */
next prev parent reply other threads:[~2023-07-21 13:03 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-03 14:59 [PATCH v3 1/3] hurd: statvfs: __f_type -> f_type наб
2023-07-03 14:59 ` [PATCH v3 2/3] linux: statvfs: allocate spare for f_type наб
2023-07-21 13:03 ` Adhemerval Zanella Netto [this message]
2023-07-21 15:34 ` наб
2023-07-23 19:10 ` Adhemerval Zanella Netto
2023-07-03 14:59 ` [PATCH v3 3/3] statvfs: f_type: NEWS & test наб
2023-07-21 13:04 ` Adhemerval Zanella Netto
2023-08-15 9:15 ` Florian Weimer
2023-08-15 11:54 ` Adhemerval Zanella Netto
2023-08-15 12:41 ` Florian Weimer
2023-08-15 12:48 ` Adhemerval Zanella Netto
2023-08-15 13:07 ` наб
2023-08-15 14:23 ` Florian Weimer
2023-08-15 14:37 ` наб
2023-08-15 15:09 ` Florian Weimer
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=4f0ff835-ef3d-5739-6d6d-1a360d97fd68@linaro.org \
--to=adhemerval.zanella@linaro.org \
--cc=fweimer@redhat.com \
--cc=libc-alpha@sourceware.org \
--cc=nabijaczleweli@nabijaczleweli.xyz \
/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).