summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2012-04-12 12:01:10 (GMT)
committer Denys Vlasenko <vda.linux@googlemail.com>2012-04-12 12:01:10 (GMT)
commitcaf5768154301697430f0a3718838967d0f55f95 (patch)
tree2929d1bf68097137a32c6deb4410f15816080813
parent14850308e902594785e6789a4f28677103ca2096 (diff)
downloadbusybox-caf5768154301697430f0a3718838967d0f55f95.tar.gz
busybox-caf5768154301697430f0a3718838967d0f55f95.tar.bz2
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>
-rw-r--r--e2fsprogs/tune2fs.c6
-rw-r--r--util-linux/mkfs_ext2.c6
2 files changed, 12 insertions, 0 deletions
diff --git a/e2fsprogs/tune2fs.c b/e2fsprogs/tune2fs.c
index 020bdaa..8da7432 100644
--- 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 6cbbe0e..759bb0a 100644
--- 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