diff options
| author | Eric Sandeen <sandeen@redhat.com> | 2008-10-14 12:27:15 -0500 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2008-10-18 17:19:56 -0400 |
| commit | 9e7da0bdc1f426f553b72721c769a8ffe3c536da (patch) | |
| tree | 3d4f38e95887627267ae406c2fffffdadb0d8c9f /lib/blkid | |
| parent | cb293cfc8b53971f196a5a55d7450fc7fb258a8b (diff) | |
| download | android_external_e2fsprogs-9e7da0bdc1f426f553b72721c769a8ffe3c536da.tar.gz android_external_e2fsprogs-9e7da0bdc1f426f553b72721c769a8ffe3c536da.tar.bz2 android_external_e2fsprogs-9e7da0bdc1f426f553b72721c769a8ffe3c536da.zip | |
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 <sandeen@redhat.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'lib/blkid')
| -rw-r--r-- | lib/blkid/probe.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/lib/blkid/probe.c b/lib/blkid/probe.c index a55bceb0..1ed7d46f 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)) |