1 From caf5768154301697430f0a3718838967d0f55f95 Mon Sep 17 00:00:00 2001
2 From: Denys Vlasenko <vda.linux@googlemail.com>
3 Date: Thu, 12 Apr 2012 14:01:10 +0200
4 Subject: [PATCH 01/33] work around linux/ext2_fs.h breakage
6 See https://bugzilla.kernel.org/show_bug.cgi?id=42986
8 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
10 e2fsprogs/tune2fs.c | 6 ++++++
11 util-linux/mkfs_ext2.c | 6 ++++++
12 2 files changed, 12 insertions(+)
14 diff --git a/e2fsprogs/tune2fs.c b/e2fsprogs/tune2fs.c
15 index 020bdaa..8da7432 100644
16 --- a/e2fsprogs/tune2fs.c
17 +++ b/e2fsprogs/tune2fs.c
23 + * Work around linux/ext2_fs.h breakage.
24 + * See https://bugzilla.kernel.org/show_bug.cgi?id=42986.
26 +typedef mode_t bb__umode_t;
27 +#define umode_t bb__umode_t
28 #include <linux/ext2_fs.h>
31 diff --git a/util-linux/mkfs_ext2.c b/util-linux/mkfs_ext2.c
32 index 6cbbe0e..759bb0a 100644
33 --- a/util-linux/mkfs_ext2.c
34 +++ b/util-linux/mkfs_ext2.c
40 + * Work around linux/ext2_fs.h breakage.
41 + * See https://bugzilla.kernel.org/show_bug.cgi?id=42986.
43 +typedef mode_t bb__umode_t;
44 +#define umode_t bb__umode_t
45 #include <linux/ext2_fs.h>
47 #define ENABLE_FEATURE_MKFS_EXT2_RESERVED_GDT 0