hrev51053 adds 1 changeset to branch 'master'
old head: c8a27537a747fdac8efe6cbcb5b7013ca56ab5b2
new head: 6bbb8b3022eb6691784e14aee705bd3fb4118989
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=6bbb8b3022eb+%5Ec8a27537a747
----------------------------------------------------------------------------
6bbb8b3022eb: Build fix.
[ Adrien Destugues <pulkomandy@xxxxxxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev51053
Commit: 6bbb8b3022eb6691784e14aee705bd3fb4118989
URL: http://cgit.haiku-os.org/haiku/commit/?id=6bbb8b3022eb
Author: Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>
Date: Thu Mar 30 16:40:34 2017 UTC
----------------------------------------------------------------------------
1 file changed, 1 insertion(+), 8 deletions(-)
src/add-ons/kernel/file_systems/ext2/Volume.cpp | 9 +--------
----------------------------------------------------------------------------
diff --git a/src/add-ons/kernel/file_systems/ext2/Volume.cpp
b/src/add-ons/kernel/file_systems/ext2/Volume.cpp
index 3b59251..1477ee0 100644
--- a/src/add-ons/kernel/file_systems/ext2/Volume.cpp
+++ b/src/add-ons/kernel/file_systems/ext2/Volume.cpp
@@ -207,15 +207,8 @@ ext2_super_block::IsValid()
|| BlocksPerGroup() != (1UL << BlockShift()) * 8
|| InodeSize() > (1UL << BlockShift())
|| RevisionLevel() > EXT2_MAX_REVISION
- || ReservedGDTBlocks() > (1UL << BlockShift()) / 4)
+ || ReservedGDTBlocks() > (1UL << BlockShift()) / 4) {
return false;
- if (Has64bitFeature()) {
- if (GroupDescriptorSize() > EXT2_BLOCK_GROUP_64BIT_SIZE ||
GroupDescriptorSize() < EXT2_BLOCK_GROUP_NORMAL_SIZE)
- return false;
- }
- else {
- if (GroupDescriptorSize() != EXT2_BLOCK_GROUP_NORMAL_SIZE)
- return false;
}
return true;
