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

* Build fix (bfs_inode::InitCheck() is now const), and cleanup.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35494 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2010-02-16 12:49:52 +00:00
parent 319a2dee90
commit e190cae151
1 changed files with 67 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/boot/loader/file_systems/bfs/Stream.cpp
+32 -20
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2003-2009, Axel Dörfler, [email protected]. * Copyright 2003-2010, Axel Dörfler, [email protected].
* This file may be used under the terms of the MIT License. * This file may be used under the terms of the MIT License.
*/ */
@@ -36,7 +36,8 @@ class CachedBlock {
uint8* Block() const { return fBlock; } uint8* Block() const { return fBlock; }
off_t BlockNumber() const { return fBlockNumber; } off_t BlockNumber() const { return fBlockNumber; }
uint32 BlockSize() const { return fVolume.BlockSize(); } uint32 BlockSize() const { return fVolume.BlockSize(); }
uint32 BlockShift() const { return fVolume.BlockShift(); } uint32 BlockShift() const
{ return fVolume.BlockShift(); }
private: private:
Volume& fVolume; Volume& fVolume;
@@ -89,7 +90,8 @@ CachedBlock::SetTo(off_t block)
} }
fBlockNumber = block; fBlockNumber = block;
if (read_pos(fVolume.Device(), block << BlockShift(), fBlock, BlockSize()) < (ssize_t)BlockSize()) if (read_pos(fVolume.Device(), block << BlockShift(), fBlock, BlockSize())
< (ssize_t)BlockSize())
return NULL; return NULL;
return fBlock; return fBlock;
@@ -110,7 +112,8 @@ Stream::Stream(Volume &volume, block_run run)
: :
fVolume(volume) fVolume(volume)
{ {
if (read_pos(volume.Device(), volume.ToOffset(run), this, sizeof(bfs_inode)) != sizeof(bfs_inode)) if (read_pos(volume.Device(), volume.ToOffset(run), this, sizeof(bfs_inode))
!= sizeof(bfs_inode))
return; return;
} }
@@ -119,7 +122,8 @@ Stream::Stream(Volume &volume, off_t id)
: :
fVolume(volume) fVolume(volume)
{ {
if (read_pos(volume.Device(), volume.ToOffset(id), this, sizeof(bfs_inode)) != sizeof(bfs_inode)) if (read_pos(volume.Device(), volume.ToOffset(id), this, sizeof(bfs_inode))
!= sizeof(bfs_inode))
return; return;
} }
@@ -197,7 +201,8 @@ Stream::FindBlockRun(off_t pos, block_run &run, off_t &offset)
// find matching block run // find matching block run
if (data.MaxDirectRange() > 0 && pos >= data.MaxDirectRange()) { if (data.MaxDirectRange() > 0 && pos >= data.MaxDirectRange()) {
if (data.MaxDoubleIndirectRange() > 0 && pos >= data.MaxIndirectRange()) { if (data.MaxDoubleIndirectRange() > 0
&& pos >= data.MaxIndirectRange()) {
// access to double indirect blocks // access to double indirect blocks
CachedBlock cached(fVolume); CachedBlock cached(fVolume);
@@ -221,13 +226,14 @@ Stream::FindBlockRun(off_t pos, block_run &run, off_t &offset)
int32 current = (start % indirectSize) / directSize; int32 current = (start % indirectSize) / directSize;
indirect = (block_run *)cached.SetTo( indirect = (block_run*)cached.SetTo(fVolume.ToBlock(indirect[
fVolume.ToBlock(indirect[index % runsPerBlock]) + current / runsPerBlock); index % runsPerBlock]) + current / runsPerBlock);
if (indirect == NULL) if (indirect == NULL)
return B_ERROR; return B_ERROR;
run = indirect[current % runsPerBlock]; run = indirect[current % runsPerBlock];
offset = data.MaxIndirectRange() + (index * indirectSize) + (current * directSize); offset = data.MaxIndirectRange() + (index * indirectSize)
+ (current * directSize);
//printf("\tfCurrent = %ld, fRunFileOffset = %Ld, fRunBlockEnd = %Ld, fRun = %ld,%d\n",fCurrent,fRunFileOffset,fRunBlockEnd,fRun.allocation_group,fRun.start); //printf("\tfCurrent = %ld, fRunFileOffset = %Ld, fRunBlockEnd = %Ld, fRun = %ld,%d\n",fCurrent,fRunFileOffset,fRunBlockEnd,fRun.allocation_group,fRun.start);
} else { } else {
// access to indirect blocks // access to indirect blocks
@@ -248,10 +254,12 @@ Stream::FindBlockRun(off_t pos, block_run &run, off_t &offset)
if (indirect[current].IsZero()) if (indirect[current].IsZero())
break; break;
runBlockEnd += indirect[current].Length() << cached.BlockShift(); runBlockEnd
+= indirect[current].Length() << cached.BlockShift();
if (runBlockEnd > pos) { if (runBlockEnd > pos) {
run = indirect[current]; run = indirect[current];
offset = runBlockEnd - (run.Length() << cached.BlockShift()); offset = runBlockEnd -
(run.Length() << cached.BlockShift());
//printf("reading from indirect block: %ld,%d\n",fRun.allocation_group,fRun.start); //printf("reading from indirect block: %ld,%d\n",fRun.allocation_group,fRun.start);
//printf("### indirect-run[%ld] = (%ld,%d,%d), offset = %Ld\n",fCurrent,fRun.allocation_group,fRun.start,fRun.length,fRunFileOffset); //printf("### indirect-run[%ld] = (%ld,%d,%d), offset = %Ld\n",fCurrent,fRun.allocation_group,fRun.start,fRun.length,fRunFileOffset);
return fVolume.ValidateBlockRun(run); return fVolume.ValidateBlockRun(run);
@@ -319,8 +327,10 @@ Stream::ReadAt(off_t pos, uint8 *buffer, size_t *_length)
// pos % block_size == (pos - offset) % block_size, offset % block_size == 0 // pos % block_size == (pos - offset) % block_size, offset % block_size == 0
if (pos % blockSize != 0) { if (pos % blockSize != 0) {
run.start = HOST_ENDIAN_TO_BFS_INT16(run.Start() + ((pos - offset) >> blockShift)); run.start = HOST_ENDIAN_TO_BFS_INT16(run.Start()
run.length = HOST_ENDIAN_TO_BFS_INT16(run.Length() - ((pos - offset) >> blockShift)); + ((pos - offset) >> blockShift));
run.length = HOST_ENDIAN_TO_BFS_INT16(run.Length()
- ((pos - offset) >> blockShift));
CachedBlock cached(fVolume, run); CachedBlock cached(fVolume, run);
if ((block = cached.Block()) == NULL) { if ((block = cached.Block()) == NULL) {
@@ -355,8 +365,10 @@ Stream::ReadAt(off_t pos, uint8 *buffer, size_t *_length)
while (length > 0) { while (length > 0) {
// offset is the offset to the current pos in the block_run // offset is the offset to the current pos in the block_run
run.start = HOST_ENDIAN_TO_BFS_INT16(run.Start() + ((pos - offset) >> blockShift)); run.start = HOST_ENDIAN_TO_BFS_INT16(run.Start()
run.length = HOST_ENDIAN_TO_BFS_INT16(run.Length() - ((pos - offset) >> blockShift)); + ((pos - offset) >> blockShift));
run.length = HOST_ENDIAN_TO_BFS_INT16(run.Length()
- ((pos - offset) >> blockShift));
if (uint32(run.Length() << blockShift) > length) { if (uint32(run.Length() << blockShift) > length) {
if (length < blockSize) { if (length < blockSize) {
@@ -373,7 +385,8 @@ Stream::ReadAt(off_t pos, uint8 *buffer, size_t *_length)
partial = true; partial = true;
} }
if (read_pos(fVolume.Device(), fVolume.ToOffset(run), buffer + bytesRead, run.Length() << fVolume.BlockShift()) < B_OK) { if (read_pos(fVolume.Device(), fVolume.ToOffset(run), buffer + bytesRead,
run.Length() << fVolume.BlockShift()) < B_OK) {
*_length = bytesRead; *_length = bytesRead;
return B_BAD_VALUE; return B_BAD_VALUE;
} }
@@ -424,9 +437,9 @@ Stream::NodeFactory(Volume &volume, off_t id)
status_t status_t
bfs_inode::InitCheck(Volume *volume) bfs_inode::InitCheck(Volume* volume) const
{ {
if (Flags() & INODE_NOT_READY) { if ((Flags() & INODE_NOT_READY) != 0) {
// the other fields may not yet contain valid values // the other fields may not yet contain valid values
return B_BUSY; return B_BUSY;
} }
@@ -447,9 +460,8 @@ bfs_inode::InitCheck(Volume *volume)
|| attributes.Start() > (1L << volume->AllocationGroupShift())) || attributes.Start() > (1L << volume->AllocationGroupShift()))
return B_BAD_DATA; return B_BAD_DATA;
// ToDo: Add some tests to check the integrity of the other stuff here, // TODO: Add some tests to check the integrity of the other stuff here,
// especially for the data_stream! // especially for the data_stream!
return B_OK; return B_OK;
} }