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

Some small cleanups.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@1059 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2002-09-16 15:13:54 +00:00
parent fb34ad79d7
commit 850b731e4d
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/file_systems/bfs/Journal.h
+11 -13
View File
@@ -44,14 +44,14 @@ class Journal {
status_t InitCheck(); status_t InitCheck();
status_t Lock(Transaction *owner); status_t Lock(Transaction *owner);
void Unlock(Transaction *owner,bool success); void Unlock(Transaction *owner, bool success);
status_t CheckLogEntry(int32 count, off_t *array); status_t CheckLogEntry(int32 count, off_t *array);
status_t ReplayLogEntry(int32 *start); status_t ReplayLogEntry(int32 *start);
status_t ReplayLog(); status_t ReplayLog();
status_t WriteLogEntry(); status_t WriteLogEntry();
status_t LogBlocks(off_t blockNumber,const uint8 *buffer, size_t numBlocks); status_t LogBlocks(off_t blockNumber, const uint8 *buffer, size_t numBlocks);
thread_id CurrentThread() const { return fOwningThread; } thread_id CurrentThread() const { return fOwningThread; }
Transaction *CurrentTransaction() const { return fOwner; } Transaction *CurrentTransaction() const { return fOwner; }
@@ -98,18 +98,18 @@ Journal::FreeLogBlocks() const
class Transaction { class Transaction {
public: public:
Transaction(Volume *volume,off_t refBlock) Transaction(Volume *volume, off_t refBlock)
: :
fJournal(NULL) fJournal(NULL)
{ {
Start(volume,refBlock); Start(volume, refBlock);
} }
Transaction(Volume *volume,block_run refRun) Transaction(Volume *volume, block_run refRun)
: :
fJournal(NULL) fJournal(NULL)
{ {
Start(volume,volume->ToBlock(refRun)); Start(volume, volume->ToBlock(refRun));
} }
Transaction() Transaction()
@@ -121,26 +121,24 @@ class Transaction {
~Transaction() ~Transaction()
{ {
if (fJournal) if (fJournal)
fJournal->Unlock(this,false); fJournal->Unlock(this, false);
} }
status_t Start(Volume *volume,off_t refBlock); status_t Start(Volume *volume, off_t refBlock);
void Done() void Done()
{ {
if (fJournal != NULL) if (fJournal != NULL)
fJournal->Unlock(this,true); fJournal->Unlock(this, true);
fJournal = NULL; fJournal = NULL;
} }
status_t WriteBlocks(off_t blockNumber,const uint8 *buffer,size_t numBlocks = 1) status_t WriteBlocks(off_t blockNumber, const uint8 *buffer, size_t numBlocks = 1)
{ {
if (fJournal == NULL) if (fJournal == NULL)
return B_NO_INIT; return B_NO_INIT;
return fJournal->LogBlocks(blockNumber,buffer,numBlocks); return fJournal->LogBlocks(blockNumber, buffer, numBlocks);
//status_t status = cached_write/*_locked*/(fVolume->Device(),blockNumber,buffer,numBlocks,fVolume->BlockSize());
//return status;
} }
Volume *GetVolume() { return fJournal != NULL ? fJournal->GetVolume() : NULL; } Volume *GetVolume() { return fJournal != NULL ? fJournal->GetVolume() : NULL; }