diff --git a/src/add-ons/kernel/file_systems/bfs/Journal.cpp b/src/add-ons/kernel/file_systems/bfs/Journal.cpp index a37785f8f5..48658e9702 100644 --- a/src/add-ons/kernel/file_systems/bfs/Journal.cpp +++ b/src/add-ons/kernel/file_systems/bfs/Journal.cpp @@ -380,7 +380,7 @@ Journal::_ReplayRunArray(int32 *_start) CachedBlock cached(fVolume); for (int32 index = 0; index < array->CountRuns(); index++) { const block_run &run = array->RunAt(index); - PRINT(("replay block run %lu:%u:%u in log at %Ld!\n", + INFORM(("replay block run %lu:%u:%u in log at %Ld!\n", run.AllocationGroup(), run.Start(), run.Length(), blockNumber)); off_t offset = fVolume->ToOffset(run); diff --git a/src/add-ons/kernel/file_systems/bfs/kernel_interface.cpp b/src/add-ons/kernel/file_systems/bfs/kernel_interface.cpp index 7059003ecb..9c87b6662e 100644 --- a/src/add-ons/kernel/file_systems/bfs/kernel_interface.cpp +++ b/src/add-ons/kernel/file_systems/bfs/kernel_interface.cpp @@ -1277,9 +1277,9 @@ bfs_free_cookie(void *_ns, void *_node, void *_cookie) } WriteLocked locker(inode->Lock()); - status_t status = B_ERROR; + status_t status = transaction.IsStarted() ? B_OK : B_ERROR; - if (transaction.IsStarted()) { + if (status == B_OK) { // trim the preallocated blocks and update the size, // and last_modified indices if needed bool changedSize = false, changedTime = false; diff --git a/src/system/kernel/cache/block_cache.cpp b/src/system/kernel/cache/block_cache.cpp index adf4fce740..4c58b6101d 100644 --- a/src/system/kernel/cache/block_cache.cpp +++ b/src/system/kernel/cache/block_cache.cpp @@ -40,6 +40,7 @@ #endif #define DEBUG_BLOCK_CACHE +//#define DEBUG_CHANGED // This macro is used for fatal situations that are acceptable in a running // system, like out of memory situations - should only panic for debugging.