From: Florian Weimer <fweimer@redhat.com>
To: Adhemerval Zanella via Libc-alpha <libc-alpha@sourceware.org>
Subject: Re: [PATCH v2 5/5] linux: Fix sys/mount.h usage with kernel headers
Date: Thu, 11 Aug 2022 23:57:52 +0200 [thread overview]
Message-ID: <874jyisasf.fsf@oldenburg.str.redhat.com> (raw)
In-Reply-To: <20220810172447.1502169-6-adhemerval.zanella@linaro.org> (Adhemerval Zanella via Libc-alpha's message of "Wed, 10 Aug 2022 14:24:47 -0300")
* Adhemerval Zanella via Libc-alpha:
> Now that kernel exports linux/mount.h and includes it on linux/fs.h,
> its definitions might clash with glibc exports sys/mount.h. To avoid
> the need to rearrange the Linux header to be always after glibc one,
> the glibc sys/mount.h is changed to:
>
> 1. Undefine the macros also used as enum constants. This covers prior
> inclusion of <linux/mount.h> (for instance MS_RDONLY).
>
> 2. Include <linux/mount.h> based on the usual __has_include check
> (needs to use __has_include ("linux/mount.h") to paper over GCC
> bugs.
>
> 3. Define enum fsconfig_command only if FSOPEN_CLOEXEC is not defined.
> (FSOPEN_CLOEXEC should be a very close proxy.)
>
> 4. Define struct mount_attr if MOUNT_ATTR_SIZE_VER0 is not defined.
> (Added in the same commit on the Linux side.)
>
> This patch also adds some tests to check if including linux/fs.h and
> linux/mount.h after and before sys/mount.h does work.
>
> Checked on x86_64-linux-gnu.
Also built with build-many-glibcs.py. This version looks good.
There is a gap with old compilers only (those that don't have
__has_include), and if <linux/mount.h> is included after <sys/mount.h>,
but I think that's an acceptable trade-off.
Reviewed-by: Florian Weimer <fweimer@redhat.com>
Thanks,
Florian
next prev parent reply other threads:[~2022-08-11 21:57 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-10 17:24 [PATCH v2 0/5] Fix sys/mount.h and kernel header tests Adhemerval Zanella
2022-08-10 17:24 ` [PATCH v2 1/5] glibcextract.py: Add compile_c_snippet Adhemerval Zanella
2022-08-10 17:35 ` Florian Weimer
2022-08-10 19:00 ` Adhemerval Zanella Netto
2022-08-10 17:38 ` Florian Weimer
2022-08-10 17:24 ` [PATCH v2 2/5] linux: Use compile_c_snippet to check linux/pidfd.h availability Adhemerval Zanella
2022-08-10 17:38 ` Florian Weimer
2022-08-10 17:24 ` [PATCH v2 3/5] linux: Mimic kernel defition for BLOCK_SIZE Adhemerval Zanella
2022-08-10 17:36 ` Florian Weimer
2022-08-10 17:24 ` [PATCH v2 4/5] linux: Use compile_c_snippet to check linux/mount.h availability Adhemerval Zanella
2022-08-10 17:36 ` Florian Weimer
2022-08-10 17:24 ` [PATCH v2 5/5] linux: Fix sys/mount.h usage with kernel headers Adhemerval Zanella
2022-08-11 21:57 ` Florian Weimer [this message]
2022-08-12 12:45 ` Adhemerval Zanella Netto
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=874jyisasf.fsf@oldenburg.str.redhat.com \
--to=fweimer@redhat.com \
--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).