]> git.ipfire.org Git - thirdparty/systemd.git/commit
basic: introduce our own sys/mount.h implementation
authorYu Watanabe <watanabe.yu+github@gmail.com>
Mon, 3 Mar 2025 14:26:38 +0000 (23:26 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Mon, 3 Mar 2025 17:24:49 +0000 (02:24 +0900)
commitec32732043550ec311dfb0e7be4e7f114366dd24
tree6fcdb9a56b08cee981c0658f45349e83e4afbe93
parentbc2bb59bddaaffa74c3cf88a6063975be0a16f9a
basic: introduce our own sys/mount.h implementation

To resolve conflict with sys/mount.h and linux/mount.h or linux/fs.h.

The conflict between sys/mount.h and linux/mount.h is resolved in
glibc-2.37 (774058d72942249f71d74e7f2b639f77184160a6), but our baseline
is still glibc-2.31. Also, even with the version or newer, still
sys/mount.h conflicts with linux/fs.h, which is included by
linux/btrfs.h.

This introduces our own implementation of sys/mount.h, that can be
simultaneously included with linux/mount.h and linux/fs.h. This also
imports linux/fs.h, linux/mount.h, and several other dependent headers.
The introduced sys/mount.h header itself may not be enough simple, but
by using the header, we can drop most of workarounds in other source files.
49 files changed:
meson.build
src/basic/chattr-util.c
src/basic/chattr-util.h
src/basic/efivars.c
src/basic/fd-util.c
src/basic/linux/btrfs.h
src/basic/linux/fs.h [new file with mode: 0644]
src/basic/linux/fscrypt.h [new file with mode: 0644]
src/basic/linux/limits.h [new file with mode: 0644]
src/basic/linux/mount.h [new file with mode: 0644]
src/basic/linux/update.sh
src/basic/missing_fs.h
src/basic/missing_mount.h [deleted file]
src/basic/missing_syscall.h
src/basic/mountpoint-util.c
src/basic/namespace-util.c
src/basic/sys/mount.h [new file with mode: 0644]
src/core/execute.c
src/core/load-fragment.c
src/core/namespace.c
src/coredump/coredump.c
src/growfs/growfs.c
src/home/homed-manager.c
src/home/homework-cifs.c
src/home/homework-fscrypt.c
src/home/homework-mount.c
src/home/homework.h
src/import/import-raw.c
src/import/import-tar.c
src/import/pull-raw.c
src/libsystemd/sd-journal/journal-file.c
src/mountfsd/mountwork.c
src/nspawn/nspawn.c
src/nsresourced/nsresourcework.c
src/nsresourced/test-userns-restrict.c
src/nsresourced/userns-restrict.c
src/repart/repart.c
src/shared/btrfs-util.c
src/shared/copy.c
src/shared/discover-image.c
src/shared/dissect-image.c
src/shared/hibernate-util.c
src/shared/loop-util.c
src/shared/mount-util.c
src/shared/resize-fs.c
src/test/test-mount-util.c
src/test/test-stat-util.c
src/tmpfiles/tmpfiles.c
src/udev/udev-builtin-btrfs.c