i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make PrepareIndices() fail if there isn't anything left to do.

Browse Source
This commit is contained in:
Axel Dörfler
2012-03-31 15:14:09 +02:00
parent 97b80db250
commit 0f94d73aaa
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/file_systems/bfs/BlockAllocator.cpp
+11 -2
View File
@@ -1360,8 +1360,14 @@ BlockAllocator::CheckNextNode(check_control* control)
fCheckCookie->pass = BFS_CHECK_PASS_INDEX; fCheckCookie->pass = BFS_CHECK_PASS_INDEX;
fCheckCookie->control.pass = BFS_CHECK_PASS_INDEX; fCheckCookie->control.pass = BFS_CHECK_PASS_INDEX;
status_t status = _PrepareIndices();
if (status != B_OK) {
fCheckCookie->control.status = status;
return status;
}
fCheckCookie->stack.Push(fVolume->Root()); fCheckCookie->stack.Push(fVolume->Root());
_PrepareIndices();
continue; continue;
} }
@@ -2018,6 +2024,8 @@ BlockAllocator::_CheckInodeBlocks(Inode* inode, const char* name)
status_t status_t
BlockAllocator::_PrepareIndices() BlockAllocator::_PrepareIndices()
{ {
int32 count = 0;
for (int32 i = 0; i < fCheckCookie->indices.CountItems(); i++) { for (int32 i = 0; i < fCheckCookie->indices.CountItems(); i++) {
check_index* index = fCheckCookie->indices.Array()[i]; check_index* index = fCheckCookie->indices.Array()[i];
Vnode vnode(fVolume, index->run); Vnode vnode(fVolume, index->run);
@@ -2041,9 +2049,10 @@ BlockAllocator::_PrepareIndices()
index->inode = inode; index->inode = inode;
vnode.Keep(); vnode.Keep();
count++;
} }
return B_OK; return count == 0 ? B_ENTRY_NOT_FOUND : B_OK;
} }