glibc: Conditionally #include <linux/fs.h> to resolve fsconfig_command/mount_attr...

Co-authored-by: Frantisek Sumsal <frantisek@sumsal.cz>

diff --git a/src/basic/linux/README b/src/basic/linux/README
index 1abc9450a6b3fbd1dca610aab9c0bb0a54798b50..790b4feb0ae2edc6f646cf2c0d5dbc1b80489942 100644 (file)
--- a/src/basic/linux/README
+++ b/src/basic/linux/README
@@ -5,3 +5,4 @@ modifications are applied:
 - btrfs.h: drop '__user' attributes
 - if.h: drop '#include <linux/compiler.h>' and '__user' attributes
 - stddef.h: drop '#include <linux/compiler_types.h>'
+- guard linux/fs.h include to avoid conflict with glibc 2.36

diff --git a/src/basic/linux/btrfs.h b/src/basic/linux/btrfs.h
index 0a53bdc38a81d506ec30568988a1c22b88a3c4ec..74ed9088bd28cb6adcd8068b4ab229962776404f 100644 (file)
--- a/src/basic/linux/btrfs.h
+++ b/src/basic/linux/btrfs.h
@@ -26,7 +26,9 @@ extern "C" {
 
 #include <linux/types.h>
 #include <linux/ioctl.h>
+#if WANT_LINUX_FS_H
 #include <linux/fs.h>
+#endif
 
 #define BTRFS_IOCTL_MAGIC 0x94
 #define BTRFS_VOL_NAME_MAX 255

diff --git a/src/basic/linux/update.sh b/src/basic/linux/update.sh
index 6aff039d3ef545d054ef7a03eed87d464101e225..6155766aaf87510bca12a2d8092afb29c2feb2d7 100755 (executable)
--- a/src/basic/linux/update.sh
+++ b/src/basic/linux/update.sh
@@ -7,4 +7,5 @@ for i in *.h */*.h; do
     curl --fail "https://raw.githubusercontent.com/torvalds/linux/master/include/uapi/linux/$i" -o "$i"
 
     sed -r -i -e 's/__user //g' -e '/^#include <linux\/compiler(_types)?.h>/ d' "$i"
+    sed -r -i 's/^(#include <linux\/fs\.h>)/#if WANT_LINUX_FS_H\n\1\n#endif/' "$i"
 done