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

Fixed a race condition in the block allocator initialization (the lock was held

Browse Source 
too late, and could theoretically already be acquired by someone else).


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@7402 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2004-05-04 00:07:38 +00:00
parent dd8f2aef56
commit c832ff1e1b
1 changed files with 8 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
+8 -2
View File
@@ -342,6 +342,9 @@ BlockAllocator::Initialize(bool full)
if (!full) if (!full)
return B_OK; return B_OK;
fLock.Lock();
// the lock will be released by the initialize() function
thread_id id = spawn_kernel_thread((thread_func)BlockAllocator::initialize, thread_id id = spawn_kernel_thread((thread_func)BlockAllocator::initialize,
"bfs block allocator", B_LOW_PRIORITY, (void *)this); "bfs block allocator", B_LOW_PRIORITY, (void *)this);
if (id < B_OK) if (id < B_OK)
@@ -401,7 +404,7 @@ BlockAllocator::InitializeAndClearBitmap(Transaction &transaction)
status_t status_t
BlockAllocator::initialize(BlockAllocator *allocator) BlockAllocator::initialize(BlockAllocator *allocator)
{ {
Locker lock(allocator->fLock); // 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;
@@ -409,8 +412,10 @@ BlockAllocator::initialize(BlockAllocator *allocator)
off_t freeBlocks = 0; off_t freeBlocks = 0;
uint32 *buffer = (uint32 *)malloc(numBits >> 3); uint32 *buffer = (uint32 *)malloc(numBits >> 3);
if (buffer == NULL) if (buffer == NULL) {
allocator->fLock.Unlock();
RETURN_ERROR(B_NO_MEMORY); RETURN_ERROR(B_NO_MEMORY);
}
AllocationGroup *groups = allocator->fGroups; AllocationGroup *groups = allocator->fGroups;
off_t offset = 1; off_t offset = 1;
@@ -470,6 +475,7 @@ BlockAllocator::initialize(BlockAllocator *allocator)
volume->SuperBlock().used_blocks = HOST_ENDIAN_TO_BFS_INT64(usedBlocks); volume->SuperBlock().used_blocks = HOST_ENDIAN_TO_BFS_INT64(usedBlocks);
} }
allocator->fLock.Unlock();
return B_OK; return B_OK;
} }