Debug output.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37655 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold 2010-07-21 15:23:46 +00:00
parent 4701667eb2
commit 1e7497da42

View File

@ -13,6 +13,7 @@
#include <AutoDeleter.h> #include <AutoDeleter.h>
#include "BlockAllocator.h" #include "BlockAllocator.h"
#include "DebugSupport.h"
#include "Volume.h" #include "Volume.h"
@ -299,7 +300,7 @@ Transaction::RegisterBlock(uint64 blockIndex)
// nope, create a new one // nope, create a new one
info = new(std::nothrow) BlockInfo; info = new(std::nothrow) BlockInfo;
if (info == NULL) if (info == NULL)
return B_NO_MEMORY; RETURN_ERROR(B_NO_MEMORY);
ObjectDeleter<BlockInfo> infoDeleter(info); ObjectDeleter<BlockInfo> infoDeleter(info);
info->indexAndCheckSum.blockIndex = blockIndex; info->indexAndCheckSum.blockIndex = blockIndex;
@ -309,14 +310,14 @@ Transaction::RegisterBlock(uint64 blockIndex)
// get the old check sum // get the old check sum
if (ioctl(fVolume->FD(), CHECKSUM_DEVICE_IOCTL_GET_CHECK_SUM, if (ioctl(fVolume->FD(), CHECKSUM_DEVICE_IOCTL_GET_CHECK_SUM,
&info->indexAndCheckSum, sizeof(info->indexAndCheckSum)) < 0) { &info->indexAndCheckSum, sizeof(info->indexAndCheckSum)) < 0) {
return errno; RETURN_ERROR(errno);
} }
// get the data (we're fine with read-only) // get the data (we're fine with read-only)
info->data = block_cache_get(fVolume->BlockCache(), blockIndex); info->data = block_cache_get(fVolume->BlockCache(), blockIndex);
if (info->data == NULL) { if (info->data == NULL) {
delete info; delete info;
return B_ERROR; RETURN_ERROR(B_ERROR);
} }
fBlockInfos.Insert(infoDeleter.Detach()); fBlockInfos.Insert(infoDeleter.Detach());