Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Single values are allowed in regular duplicate nodes

Browse Source 
Not in duplicate fragments, however. This oversight in hrev44359 made
checkfs incorrectly rebuild valid indices, causing #8762.

Signed-off-by: Axel Dörfler <axeld@pinc-software.de>
This commit is contained in:
ahenriksson 2012-07-24 12:37:53 +02:00 committed by Axel Dörfler
parent 4d99b24ded
commit 35dc734b48
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/add-ons/kernel/file_systems/bfs/BPlusTree.cpp
View File

@ -2350,18 +2350,21 @@ BPlusTree::_ValidateChildren(TreeCheck& check, uint32 level, off_t offset,
check.SetVisitedFragment(duplicateOffset); check.SetVisitedFragment(duplicateOffset);
duplicate_array* array; duplicate_array* array;
int32 minSize;
int32 maxSize; int32 maxSize;
if (isFragmentNode) { if (isFragmentNode) {
array = node->FragmentAt( array = node->FragmentAt(
bplustree_node::FragmentIndex(childOffset)); bplustree_node::FragmentIndex(childOffset));
minSize = 2;
maxSize = NUM_FRAGMENT_VALUES; maxSize = NUM_FRAGMENT_VALUES;
} else { } else {
array = node->DuplicateArray(); array = node->DuplicateArray();
minSize = 1;
maxSize = NUM_DUPLICATE_VALUES; maxSize = NUM_DUPLICATE_VALUES;
} }
int32 arrayCount = array->Count(); int32 arrayCount = array->Count();
if (arrayCount <= 1 || arrayCount > maxSize) { if (arrayCount < minSize || arrayCount > maxSize) {
dprintf("inode %" B_PRIdOFF ": duplicate at %" B_PRIdOFF dprintf("inode %" B_PRIdOFF ": duplicate at %" B_PRIdOFF
" has invalid array size %" B_PRId32 "!\n", " has invalid array size %" B_PRId32 "!\n",
fStream->ID(), duplicateOffset, arrayCount); fStream->ID(), duplicateOffset, arrayCount);