diff options
author | Eric Sandeen <sandeen@redhat.com> | 2009-02-24 23:17:54 -0600 |
---|---|---|
committer | Theodore Ts'o <tytso@mit.edu> | 2009-03-06 02:44:07 -0500 |
commit | a90f5391dda78f7bc4a8196a78355584ace0adf5 (patch) | |
tree | 1208e4d543c6e4a0dfc5c94747c3f78f77baba5d /lib | |
parent | eb630fd8708ae433e55e384079c08e0f0f040d22 (diff) | |
download | e2fsprogs-a90f5391dda78f7bc4a8196a78355584ace0adf5.tar.gz |
blkid: recognize ext4(dev) without journal
ext4/ext4dev no longer require a journal.
w/o this blkid doesn't recognize after:
# mkfs.ext4 /dev/blah
# tune2fs -O ^has_journal
# blkid /dev/blah
We still must have one ext3-incompat-feature to flag
as ext4(dev) so we shouldn't ever mis-recognize it.
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/blkid/probe.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/lib/blkid/probe.c b/lib/blkid/probe.c index 91a63131..ea575980 100644 --- a/lib/blkid/probe.c +++ b/lib/blkid/probe.c @@ -283,11 +283,6 @@ static int probe_ext4dev(struct blkid_probe *probe, EXT3_FEATURE_INCOMPAT_JOURNAL_DEV) return -BLKID_ERR_PARAM; - /* ext4dev requires a journal */ - if (!(blkid_le32(es->s_feature_compat) & - EXT3_FEATURE_COMPAT_HAS_JOURNAL)) - return -BLKID_ERR_PARAM; - /* * If the filesystem is marked as OK for use by in-development * filesystem code, but ext4dev is not supported, and ext4 is, @@ -319,11 +314,6 @@ static int probe_ext4(struct blkid_probe *probe, struct blkid_magic *id, EXT3_FEATURE_INCOMPAT_JOURNAL_DEV) return -BLKID_ERR_PARAM; - /* ext4 requires journal */ - if (!(blkid_le32(es->s_feature_compat) & - EXT3_FEATURE_COMPAT_HAS_JOURNAL)) - return -BLKID_ERR_PARAM; - /* Ext4 has at least one feature which ext3 doesn't understand */ if (!(blkid_le32(es->s_feature_ro_compat) & EXT3_FEATURE_RO_COMPAT_UNSUPPORTED) && |