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

cache_abort_[sub_]transaction() did not work correctly.

Browse Source 
* cache_abort_transaction() left the block dirty which was causing bug
  #8123 as well.
* cache_abort_sub_transaction() did, in addition to not clearing the dirty
  flag, not reset the block's transaction member either if the block was
  not part of the parent transaction.
This commit is contained in:
Axel Dörfler
2012-07-20 00:03:38 +02:00
parent 0579a69564
commit 752f5c972f
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/cache/block_cache.cpp
Vendored
+12 -3
View File
@@ -2877,6 +2877,8 @@ cache_abort_transaction(void* _cache, int32 id)
block->transaction_next = NULL; block->transaction_next = NULL;
block->transaction = NULL; block->transaction = NULL;
block->discard = false; block->discard = false;
if (block->previous_transaction == NULL)
block->is_dirty = false;
} }
hash_remove(cache->transaction_hash, transaction); hash_remove(cache->transaction_hash, transaction);
@@ -3028,17 +3030,24 @@ cache_abort_sub_transaction(void* _cache, int32 id)
next = block->transaction_next; next = block->transaction_next;
if (block->parent_data == NULL) { if (block->parent_data == NULL) {
// the parent transaction didn't change the block, but the sub // The parent transaction didn't change the block, but the sub
// transaction did - we need to revert from the original data // transaction did - we need to revert to the original data.
// The block is no longer part of the transaction
ASSERT(block->original_data != NULL); ASSERT(block->original_data != NULL);
memcpy(block->current_data, block->original_data, memcpy(block->current_data, block->original_data,
cache->block_size); cache->block_size);
block->transaction_next = NULL;
block->transaction = NULL;
if (block->previous_transaction == NULL)
block->is_dirty = false;
} else if (block->parent_data != block->current_data) { } else if (block->parent_data != block->current_data) {
// the block has been changed and must be restored // 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 " TRACE(("cache_abort_sub_transaction(id = %ld): restored contents "
"of block %Ld\n", transaction->id, block->block_number)); "of block %Ld\n", transaction->id, block->block_number));
memcpy(block->current_data, block->parent_data, cache->block_size); memcpy(block->current_data, block->parent_data, cache->block_size);
cache->Free(block->parent_data); cache->Free(block->parent_data);
// The block stays dirty
} }
block->parent_data = NULL; block->parent_data = NULL;