blkid: recognize ext4(dev) without journal

ext4/ext4dev no longer require a journal.

w/o this blkid doesn't recognize after:

We still must have one ext3-incompat-feature to flag
as ext4(dev) so we shouldn't ever mis-recognize it.

[kzak@redhat.com: port from e2fsprogs to util-linux-ng tree]

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/libs/blkid/src/probers/ext.c b/libs/blkid/src/probers/ext.c
index ff0e51b136bed0f081e7dc340352f7f2c51556f2..ca90f31df42bc8e513ce6aff2d54a62ccf81540d 100644 (file)
--- a/libs/blkid/src/probers/ext.c
+++ b/libs/blkid/src/probers/ext.c
@@ -417,10 +417,6 @@ static int probe_ext4dev(blkid_probe pr, const struct blkid_idmag *mag)
        if (fi & EXT3_FEATURE_INCOMPAT_JOURNAL_DEV)
                return -BLKID_ERR_PARAM;
 
-       /* ext4dev requires a journal */
-       if (!(fc & 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,
@@ -454,10 +450,6 @@ static int probe_ext4(blkid_probe pr, const struct blkid_idmag *mag)
        if (fi & EXT3_FEATURE_INCOMPAT_JOURNAL_DEV)
                return -BLKID_ERR_PARAM;
 
-       /* ext4 requires journal */
-       if (!(fc & EXT3_FEATURE_COMPAT_HAS_JOURNAL))
-               return -BLKID_ERR_PARAM;
-
        /* Ext4 has at least one feature which ext3 doesn't understand */
        if (!(frc & EXT3_FEATURE_RO_COMPAT_UNSUPPORTED) &&
            !(fi  & EXT3_FEATURE_INCOMPAT_UNSUPPORTED))