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

Added support for aborted "chkbfs" runs (so that they won't do any harm).

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@2059 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2002-11-22 03:32:53 +00:00
parent f512ce4233
commit b5a0c65c19
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/add-ons/kernel/file_systems/bfs/BlockAllocator.cpp
View File

@ -643,6 +643,9 @@ BlockAllocator::Free(Transaction *transaction, block_run run)
status_t
BlockAllocator::StartChecking(check_control *control)
{
if (control == NULL)
return B_BAD_VALUE;
status_t status = fLock.Lock();
if (status < B_OK)
return status;
@ -673,6 +676,9 @@ BlockAllocator::StartChecking(check_control *control)
cookie->iterator = NULL;
control->cookie = cookie;
fCheckCookie = cookie;
// to be able to restore nicely if "chkbfs" exited abnormally
// ToDo: check reserved area in bitmap!
return B_OK;
@ -682,7 +688,14 @@ BlockAllocator::StartChecking(check_control *control)
status_t
BlockAllocator::StopChecking(check_control *control)
{
check_cookie *cookie = (check_cookie *)control->cookie;
check_cookie *cookie;
if (control == NULL)
cookie = fCheckCookie;
else
cookie = (check_cookie *)control->cookie;
if (cookie == NULL)
return B_ERROR;
if (cookie->iterator != NULL) {
delete cookie->iterator;
@ -694,7 +707,7 @@ BlockAllocator::StopChecking(check_control *control)
// if CheckNextNode() could completely work through, we can
// fix any damages of the bitmap
if (control->status == B_ENTRY_NOT_FOUND) {
if (control != NULL && control->status == B_ENTRY_NOT_FOUND) {
// calculate the number of used blocks in the check bitmap
size_t size = fVolume->BlockSize() * fNumGroups * fBlocksPerGroup;
off_t usedBlocks = 0LL;
@ -727,6 +740,7 @@ BlockAllocator::StopChecking(check_control *control)
free(fCheckBitmap);
fCheckBitmap = NULL;
fCheckCookie = NULL;
delete cookie;
fLock.Unlock();
@ -737,6 +751,9 @@ BlockAllocator::StopChecking(check_control *control)
status_t
BlockAllocator::CheckNextNode(check_control *control)
{
if (control == NULL)
return B_BAD_VALUE;
check_cookie *cookie = (check_cookie *)control->cookie;
while (true) {

2
src/add-ons/kernel/file_systems/bfs/BlockAllocator.h
View File

@ -17,6 +17,7 @@ class Inode;
struct disk_super_block;
struct block_run;
struct check_control;
struct check_cookie;
class BlockAllocator {
@ -53,6 +54,7 @@ class BlockAllocator {
AllocationGroup *fGroups;
int32 fNumGroups, fBlocksPerGroup;
uint32 *fCheckBitmap;
check_cookie *fCheckCookie;
};
#endif /* BLOCK_ALLOCATOR_H */