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

Fixed broken block list introduced in hrev44357. 

* cache_abort_sub_transaction() was setting the transaction_next pointer to
  NULL in order to remove a block from a transaction -- however, it forgot to
  actually remove it from the transaction's block list.
* Minor restructuring.
This commit is contained in:
Axel Dörfler 2012-08-27 12:42:48 +02:00
parent 153d895337
commit dd9d610500
1 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/system/kernel/cache/block_cache.cpp vendored
View File

@ -3035,6 +3035,7 @@ cache_abort_sub_transaction(void* _cache, int32 id)
// revert all changes back to the version of the parent
cached_block* block = transaction->first_block;
cached_block* last = NULL;
cached_block* next;
for (; block != NULL; block = next) {
next = block->transaction_next;
@ -3046,21 +3047,32 @@ cache_abort_sub_transaction(void* _cache, int32 id)
ASSERT(block->original_data != NULL);
memcpy(block->current_data, block->original_data,
cache->block_size);
if (last != NULL)
last->transaction_next = next;
else
transaction->first_block = next;
block->transaction_next = NULL;
block->transaction = NULL;
if (block->previous_transaction == NULL)
block->is_dirty = false;
} else if (block->parent_data != block->current_data) {
// The block has been changed and must be restored - the block
// is still dirty and part of the transaction
TRACE(("cache_abort_sub_transaction(id = %ld): restored contents "
"of block %Ld\n", transaction->id, block->block_number));
memcpy(block->current_data, block->parent_data, cache->block_size);
cache->Free(block->parent_data);
// The block stays dirty
} else {
if (block->parent_data != block->current_data) {
// The block has been changed and must be restored - the block
// is still dirty and part of the transaction
TRACE(("cache_abort_sub_transaction(id = %ld): restored "
"contents of block %Ld\n", transaction->id,
block->block_number));
memcpy(block->current_data, block->parent_data,
cache->block_size);
cache->Free(block->parent_data);
// The block stays dirty
}
block->parent_data = NULL;
last = block;
}
block->parent_data = NULL;
block->discard = false;
}