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

Pass an existing or created transaction to CreateVolumeID(). Hopefully it's correct this time. Axel?

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@43056 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
François Revol
2011-11-01 09:49:05 +00:00
parent 95f7cdcccb
commit c87c47960c
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/file_systems/bfs/Volume.cpp
+8 -7
View File
@@ -425,8 +425,12 @@ Volume::Mount(const char* deviceName, uint32 flags)
if (!(fFlags & VOLUME_READ_ONLY)) { if (!(fFlags & VOLUME_READ_ONLY)) {
Attribute attr(fRootNode); Attribute attr(fRootNode);
if (attr.Get("be:volume_id") == B_ENTRY_NOT_FOUND) if (attr.Get("be:volume_id") == B_ENTRY_NOT_FOUND) {
CreateVolumeID(); Transaction transaction(this, fRootNode->BlockNumber());
fRootNode->WriteLockInTransaction(transaction);
CreateVolumeID(transaction);
transaction.Done();
}
} }
// all went fine // all went fine
@@ -509,7 +513,7 @@ Volume::CreateIndicesRoot(Transaction& transaction)
status_t status_t
Volume::CreateVolumeID() Volume::CreateVolumeID(Transaction& transaction)
{ {
Attribute attr(fRootNode); Attribute attr(fRootNode);
status_t status; status_t status;
@@ -525,10 +529,7 @@ Volume::CreateVolumeID()
uint64_t id; uint64_t id;
size_t length = sizeof(id); size_t length = sizeof(id);
id = ((uint64_t)rand() << 32) | rand(); id = ((uint64_t)rand() << 32) | rand();
Transaction transaction(this, fRootNode->BlockNumber());
fRootNode->WriteLockInTransaction(transaction);
attr.Write(transaction, cookie, 0, (uint8_t *)&id, &length, NULL); attr.Write(transaction, cookie, 0, (uint8_t *)&id, &length, NULL);
transaction.Done();
} }
return status; return status;
} }
@@ -766,7 +767,7 @@ Volume::Initialize(int fd, const char* name, uint32 blockSize,
return status; return status;
} }
CreateVolumeID(); CreateVolumeID(transaction);
WriteSuperBlock(); WriteSuperBlock();
transaction.Done(); transaction.Done();
src/add-ons/kernel/file_systems/bfs/Volume.h
+1 -1
View File
@@ -92,7 +92,7 @@ public:
status_t CreateIndicesRoot(Transaction& transaction); status_t CreateIndicesRoot(Transaction& transaction);
status_t CreateVolumeID(); status_t CreateVolumeID(Transaction& transaction);
InodeList& RemovedInodes() { return fRemovedInodes; } InodeList& RemovedInodes() { return fRemovedInodes; }
// This list is guarded by the transaction lock // This list is guarded by the transaction lock