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

write_cached_block() would write the wrong block in case there was

Browse Source 
a previous and unfinished transaction. It should now work correctly.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@11553 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2005-03-03 01:10:16 +00:00
parent d2df6f5a20
commit 1f6dcd134f
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kernel/core/cache/block_cache.cpp
Vendored
+11 -4
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2004, Axel Dörfler, [email protected]. All rights reserved. * Copyright 2004-2005, Axel Dörfler, [email protected]. All rights reserved.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
*/ */
@@ -444,22 +444,29 @@ write_cached_block(block_cache *cache, cached_block *block, bool deleteTransacti
cache_transaction *previous = block->previous_transaction; cache_transaction *previous = block->previous_transaction;
int32 blockSize = cache->block_size; int32 blockSize = cache->block_size;
void *data = previous && block->original ? block->original : block->data;
// we first need to write back changes from previous transactions
TRACE(("write_cached_block(block %Ld)\n", block->block_number)); TRACE(("write_cached_block(block %Ld)\n", block->block_number));
ssize_t written = write_pos(cache->fd, block->block_number * blockSize, block->data, blockSize); ssize_t written = write_pos(cache->fd, block->block_number * blockSize, data, blockSize);
if (written < blockSize) { if (written < blockSize) {
dprintf("could not write back block %Ld (errno = %d (%s))\n", block->block_number, errno, strerror(errno)); dprintf("could not write back block %Ld (%s)\n", block->block_number, strerror(errno));
return B_IO_ERROR; return B_IO_ERROR;
} }
block->is_dirty = false; if (data == block->data)
block->is_dirty = false;
if (previous != NULL) { if (previous != NULL) {
previous->blocks.Remove(block); previous->blocks.Remove(block);
block->previous_transaction = NULL; block->previous_transaction = NULL;
// Has the previous transation been finished with that write?
if (--previous->num_blocks == 0) { if (--previous->num_blocks == 0) {
TRACE(("cache transaction %ld finished!\n", previous->id));
if (previous->notification_hook != NULL) if (previous->notification_hook != NULL)
previous->notification_hook(previous->id, previous->notification_data); previous->notification_hook(previous->id, previous->notification_data);