aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Watson <cjwatson@ubuntu.com>2009-10-04 23:03:57 +0100
committermaximilian attems <max@stro.at>2010-03-23 15:36:59 +0100
commit6baedbeb8ee474040a32a2a859534abfeeb68f1a (patch)
treebf0673456a393038c1effef4cbd61d14ec121fc7
parent5f54d9da56b8e29d4fde34189df471ab08a1024e (diff)
downloadklibc-6baedbeb8ee474040a32a2a859534abfeeb68f1a.tar.gz
[klibc] fstype: recognise ext4 without journal
ext4 no longer requires a journal, fix shipped by Ubuntu for some time. Compare: http://git.kernel.org/?p=fs/ext2/e2fsprogs.git;a=commitdiff;h=a90f5391dda78f7bc4a8196a78355584ace0adf5 Signed-off-by: Colin Watson <cjwatson@ubuntu.com> Acked-by: "Theodore Ts'o" <tytso@mit.edu> Signed-off-by: maximilian attems <max@stro.at>
-rw-r--r--usr/kinit/fstype/fstype.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/usr/kinit/fstype/fstype.c b/usr/kinit/fstype/fstype.c
index 69e0e30b6082b..bf63b1b509998 100644
--- a/usr/kinit/fstype/fstype.c
+++ b/usr/kinit/fstype/fstype.c
@@ -196,14 +196,6 @@ static int base_ext4_image(const void *buf, unsigned long long *bytes,
if (sb->s_magic != __cpu_to_le16(EXT2_SUPER_MAGIC))
return 0;
- /*
- * For now, ext4 requires a journal -- but this may change
- * soon if we get that patch from Google. :-)
- */
- if ((sb->s_feature_compat
- & __cpu_to_le32(EXT3_FEATURE_COMPAT_HAS_JOURNAL)) == 0)
- return 0;
-
/* There is at least one feature not supported by ext3 */
if ((sb->s_feature_incompat
& __cpu_to_le32(EXT3_FEATURE_INCOMPAT_UNSUPPORTED)) ||