Turned off debug output again - also temporarily removed the file cache warning
about our block_io module not honouring the total length in read_pages(). Removed drops into the debugger when there is a block without an "original" data buffer - that's completely normal and happens when someone asks for a cleared block that is not yet in the cache. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@14437 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
+1
-13
@@ -30,7 +30,7 @@
|
||||
// 3) dirty blocks are only written back if asked for
|
||||
// 4) blocks are never removed yet
|
||||
|
||||
#define TRACE_BLOCK_CACHE
|
||||
//#define TRACE_BLOCK_CACHE
|
||||
#ifdef TRACE_BLOCK_CACHE
|
||||
# define TRACE(x) dprintf x
|
||||
#else
|
||||
@@ -793,12 +793,6 @@ cache_abort_sub_transaction(void *_cache, int32 id)
|
||||
for (; block != NULL; block = next) {
|
||||
next = block->transaction_next;
|
||||
|
||||
if (block->original == NULL) {
|
||||
// an unchanged block in the transaction?
|
||||
panic("unchanged block in transaction!");
|
||||
continue;
|
||||
}
|
||||
|
||||
if (block->parent_data != block->data) {
|
||||
// the block has been changed and must be restored
|
||||
TRACE(("cache_abort_sub_transaction(id = %ld): restored contents of block %Ld\n",
|
||||
@@ -836,12 +830,6 @@ cache_start_sub_transaction(void *_cache, int32 id)
|
||||
for (; block != NULL; block = next) {
|
||||
next = block->transaction_next;
|
||||
|
||||
if (block->original == NULL) {
|
||||
// an unchanged block in the transaction?
|
||||
panic("unchanged block in transaction!");
|
||||
continue;
|
||||
}
|
||||
|
||||
if (transaction->has_sub_transaction && block->parent_data != block->data) {
|
||||
// there already is an older sub transaction - we acknowledge
|
||||
// its changes and move its blocks up to the parent
|
||||
|
||||
Reference in New Issue
Block a user