From db4ba2aeb6ceedacc04fa5c50438d0b41714ed81 Mon Sep 17 00:00:00 2001 From: Eric Sandeen Date: Mon, 8 Dec 2008 15:37:18 +0100 Subject: [PATCH] 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 Signed-off-by: Theodore Ts'o Signed-off-by: Karel Zak --- libs/blkid/src/probers/ext.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libs/blkid/src/probers/ext.c b/libs/blkid/src/probers/ext.c index 27f41419..01ae7cc6 100644 --- 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; -- 2.39.5