work around linux/ext2_fs.h breakage

See https://bugzilla.kernel.org/show_bug.cgi?id=42986

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

diff --git a/e2fsprogs/tune2fs.c b/e2fsprogs/tune2fs.c
index 020bdaa336b3c668e0818fbcb2dac7a942058777..8da7432d9425d17da707e1a2e8e0c24e70fe0b50 100644 (file)
--- a/e2fsprogs/tune2fs.c
+++ b/e2fsprogs/tune2fs.c
@@ -8,6 +8,12 @@
  */
 #include "libbb.h"
 #include <linux/fs.h>
+/*
+ * Work around linux/ext2_fs.h breakage.
+ * See https://bugzilla.kernel.org/show_bug.cgi?id=42986.
+ */
+typedef mode_t bb__umode_t;
+#define umode_t bb__umode_t
 #include <linux/ext2_fs.h>
 
 // storage helpers

diff --git a/util-linux/mkfs_ext2.c b/util-linux/mkfs_ext2.c
index 6cbbe0e075fc053b29077bc250b18aea4c452e84..759bb0a7a1b64c7839f171da5741ee53425f53d6 100644 (file)
--- a/util-linux/mkfs_ext2.c
+++ b/util-linux/mkfs_ext2.c
@@ -48,6 +48,12 @@
 
 #include "libbb.h"
 #include <linux/fs.h>
+/*
+ * Work around linux/ext2_fs.h breakage.
+ * See https://bugzilla.kernel.org/show_bug.cgi?id=42986.
+ */
+typedef mode_t bb__umode_t;
+#define umode_t bb__umode_t
 #include <linux/ext2_fs.h>
 
 #define ENABLE_FEATURE_MKFS_EXT2_RESERVED_GDT 0