From: Eric Sandeen Date: Tue, 14 Oct 2008 17:27:15 +0000 (-0500) Subject: blkid: recognize ext3 with test_fs set as ext3 X-Git-Tag: v1.41.4~47 X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=9e7da0bdc1f426f553b72721c769a8ffe3c536da;p=tools%2Fe2fsprogs.git 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. Signed-off-by: Eric Sandeen Signed-off-by: Theodore Ts'o --- diff --git a/lib/blkid/probe.c b/lib/blkid/probe.c index a55bceb..1ed7d46 100644 --- a/lib/blkid/probe.c +++ b/lib/blkid/probe.c @@ -353,10 +353,6 @@ static int probe_ext3(struct blkid_probe *probe, struct blkid_magic *id, struct ext2_super_block *es; es = (struct ext2_super_block *)buf; - /* Distinguish from ext4dev */ - if (blkid_le32(es->s_flags) & EXT2_FLAGS_TEST_FILESYS) - return -BLKID_ERR_PARAM; - /* ext3 requires journal */ if (!(blkid_le32(es->s_feature_compat) & EXT3_FEATURE_COMPAT_HAS_JOURNAL))