blkid: recognize ext3 with test_fs set as ext3

It seems that if we have the test_filesystem flag set on an ext3
filesystem(!) on a system which provides ext4, blkid gets confused.

According to the current logic:

* It's not an ext4dev filesystem, because the system provides ext4.
* It's not an ext4 filesystem, because it has no ext4 features.
* It's not an ext3 filesystem, because the test flag is set.

In the end, it's nothing.

blkid should return *something* that is mountable... I'm inclined to
think that ext3 should be the right answer, if no ext4-specific features
are set.

This would mean just dropping the EXT2_FLAGS_TEST_FILESYS test in
probe_ext3(), because ext4 & ext4dev probes have come first already.

[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 27f414192103bed2027be424ea57cf0cc510c583..01ae7cc60a329558aaecc309dd89904fdfbee6ae 100644 (file)
--- a/libs/blkid/src/probers/ext.c
+++ b/libs/blkid/src/probers/ext.c
@@ -275,10 +275,6 @@ static int probe_ext3(blkid_probe pr, const struct blkid_idmag *mag)
        if (!es)
                return -BLKID_ERR_PARAM;
 
-       /* Distinguish from ext4dev */
-       if (le32_to_cpu(es->s_flags) & EXT2_FLAGS_TEST_FILESYS)
-               return -BLKID_ERR_PARAM;
-
        /* ext3 requires journal */
        if (!(fc & EXT3_FEATURE_COMPAT_HAS_JOURNAL))
                return -BLKID_ERR_PARAM;