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

An unused dirty block would put again into the unused list.

Browse Source 
* This could cause bug #8123. While this fixes the crash, one underlying
  problem is still there, as dirty blocks should never leave a transaction.
This commit is contained in:
Andreas Henriksson
2012-07-19 23:44:25 +02:00
committed by Axel Dörfler
parent 03aa456e2e
commit 8959a4e0c3
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/cache/block_cache.cpp
Vendored
+3 -1
View File
@@ -1268,7 +1268,7 @@ BlockWriter::_BlockDone(cached_block* block, hash_iterator* iterator)
fDeletedTransaction = true; fDeletedTransaction = true;
} }
} }
if (block->transaction == NULL && block->ref_count == 0) { if (block->transaction == NULL && block->ref_count == 0 && !block->unused) {
// the block is no longer used // the block is no longer used
block->unused = true; block->unused = true;
fCache->unused_blocks.Add(block); fCache->unused_blocks.Add(block);
@@ -1761,7 +1761,9 @@ put_cached_block(block_cache* cache, cached_block* block)
cache->RemoveBlock(block); cache->RemoveBlock(block);
} else { } else {
// put this block in the list of unused blocks // put this block in the list of unused blocks
ASSERT(!block->unused);
block->unused = true; block->unused = true;
ASSERT(block->original_data == NULL ASSERT(block->original_data == NULL
&& block->parent_data == NULL); && block->parent_data == NULL);
cache->unused_blocks.Add(block); cache->unused_blocks.Add(block);
src/tools/fs_shell/block_cache.cpp
+1 -1
View File
@@ -927,7 +927,7 @@ write_cached_block(block_cache* cache, cached_block* block,
} }
} }
} }
if (block->transaction == NULL && block->ref_count == 0) { if (block->transaction == NULL && block->ref_count == 0 && !block->unused) {
// the block is no longer used // the block is no longer used
block->unused = true; block->unused = true;
cache->unused_blocks.Add(block); cache->unused_blocks.Add(block);