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

BlockAllocator::CheckBlockRun() can now also check for non-allocated ranges.

Browse Source 
Fixed a possible endian problem in CheckBlockRun(), too.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@7405 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2004-05-04 01:42:53 +00:00
parent b1e752314f
commit 34cf473d12
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/file_systems/bfs/BlockAllocator.cpp
+11 -9
View File
@@ -404,7 +404,7 @@ BlockAllocator::InitializeAndClearBitmap(Transaction &transaction)
status_t status_t
BlockAllocator::initialize(BlockAllocator *allocator) BlockAllocator::initialize(BlockAllocator *allocator)
{ {
// The lock must already be held at this point! // The lock must already be held at this point
Volume *volume = allocator->fVolume; Volume *volume = allocator->fVolume;
uint32 blocks = allocator->fBlocksPerGroup; uint32 blocks = allocator->fBlocksPerGroup;
@@ -695,8 +695,8 @@ BlockAllocator::Free(Transaction *transaction, block_run run)
if (fGroups[group].Free(transaction, start, length) < B_OK) if (fGroups[group].Free(transaction, start, length) < B_OK)
RETURN_ERROR(B_IO_ERROR); RETURN_ERROR(B_IO_ERROR);
#ifdef DEBUG #ifdef DEBUG
if (CheckBlockRun(run) == B_OK) if (CheckBlockRun(run, NULL, NULL, false) < B_OK)
DEBUGGER(("CheckBlockRun() reports allocated blocks (which were just freed)\n")); DEBUGGER(("CheckBlockRun() reports allocated blocks (which were just freed)\n"));
#endif #endif
@@ -1042,10 +1042,10 @@ BlockAllocator::SetCheckBitmapAt(off_t block)
status_t status_t
BlockAllocator::CheckBlockRun(block_run run, const char *type, check_control *control) BlockAllocator::CheckBlockRun(block_run run, const char *type, check_control *control, bool allocated)
{ {
if (run.AllocationGroup() < 0 || run.AllocationGroup() >= fNumGroups if (run.AllocationGroup() < 0 || run.AllocationGroup() >= fNumGroups
|| run.Start() > fGroups[run.allocation_group].fNumBits || run.Start() > fGroups[run.AllocationGroup()].fNumBits
|| uint32(run.Start() + run.Length()) > fGroups[run.AllocationGroup()].fNumBits || uint32(run.Start() + run.Length()) > fGroups[run.AllocationGroup()].fNumBits
|| run.length == 0) { || run.length == 0) {
PRINT(("%s: block_run(%ld, %u, %u) is invalid!\n", type, run.AllocationGroup(), run.Start(), run.Length())); PRINT(("%s: block_run(%ld, %u, %u) is invalid!\n", type, run.AllocationGroup(), run.Start(), run.Length()));
@@ -1075,9 +1075,10 @@ BlockAllocator::CheckBlockRun(block_run run, const char *type, check_control *co
} }
while (length < run.Length() && pos < cached.NumBlockBits()) { while (length < run.Length() && pos < cached.NumBlockBits()) {
if (!cached.IsUsed(pos)) { if (cached.IsUsed(pos) != allocated) {
if (control == NULL) { if (control == NULL) {
PRINT(("%s: block_run(%ld, %u, %u) is only partially allocated!\n", type, run.AllocationGroup(), run.Start(), run.Length())); PRINT(("%s: block_run(%ld, %u, %u) is only partially allocated (pos = %ld, length = %ld)!\n",
type, run.AllocationGroup(), run.Start(), run.Length(), pos, length));
return B_BAD_DATA; return B_BAD_DATA;
} }
if (firstMissing == -1) { if (firstMissing == -1) {
@@ -1086,8 +1087,9 @@ BlockAllocator::CheckBlockRun(block_run run, const char *type, check_control *co
} }
control->stats.missing++; control->stats.missing++;
} else if (firstMissing != -1) { } else if (firstMissing != -1) {
PRINT(("%s: block_run(%ld, %u, %u): blocks %Ld - %Ld are not allocated!\n", PRINT(("%s: block_run(%ld, %u, %u): blocks %Ld - %Ld are %sallocated!\n",
type, run.allocation_group, run.start, run.length, firstMissing, firstGroupBlock + pos + block * bitsPerBlock - 1)); type, run.allocation_group, run.start, run.length, firstMissing,
firstGroupBlock + pos + block * bitsPerBlock - 1, allocated ? "not " : ""));
firstMissing = -1; firstMissing = -1;
} }
src/add-ons/kernel/file_systems/bfs/BlockAllocator.h
+1 -1
View File
@@ -41,7 +41,7 @@ class BlockAllocator {
status_t StopChecking(check_control *control); status_t StopChecking(check_control *control);
status_t CheckNextNode(check_control *control); status_t CheckNextNode(check_control *control);
status_t CheckBlockRun(block_run run, const char *type = NULL, check_control *control = NULL); status_t CheckBlockRun(block_run run, const char *type = NULL, check_control *control = NULL, bool allocated = true);
status_t CheckInode(Inode *inode, check_control *control = NULL); status_t CheckInode(Inode *inode, check_control *control = NULL);
size_t BitmapSize() const; size_t BitmapSize() const;