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

* Changed to use Volume::InodeSize() over sizeof(ext2_inode) as described

Browse Source 
in ticket #2707. Thanks Adrian!


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@28536 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2008-11-06 15:21:16 +00:00
parent a418aa5f4f
commit 5d8428e023
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/file_systems/ext2/Inode.cpp
+5 -3
View File
@@ -32,10 +32,12 @@ Inode::Inode(Volume* volume, ino_t id)
uint32 block; uint32 block;
if (volume->GetInodeBlock(id, block) == B_OK) { if (volume->GetInodeBlock(id, block) == B_OK) {
TRACE("inode %Ld at block %lu\n", ID(), block); TRACE("inode %Ld at block %lu\n", ID(), block);
ext2_inode* inodes = (ext2_inode*)block_cache_get(volume->BlockCache(), uint8* inodeBlock = (uint8*)block_cache_get(volume->BlockCache(),
block); block);
if (inodes != NULL) if (inodeBlock != NULL) {
fNode = inodes + volume->InodeBlockIndex(id); fNode = (ext2_inode*)(inodeBlock + volume->InodeBlockIndex(id)
* volume->InodeSize());
}
} }
if (fNode != NULL) { if (fNode != NULL) {
src/add-ons/kernel/file_systems/ext2/Volume.cpp
+1 -1
View File
@@ -297,7 +297,7 @@ Volume::Mount(const char* deviceName, uint32 flags)
return B_NO_MEMORY; return B_NO_MEMORY;
memset(fGroupBlocks, 0, blockCount * sizeof(void*)); memset(fGroupBlocks, 0, blockCount * sizeof(void*));
fInodesPerBlock = fBlockSize / sizeof(ext2_inode); fInodesPerBlock = fBlockSize / InodeSize();
// check if the device size is large enough to hold the file system // check if the device size is large enough to hold the file system
off_t diskSize; off_t diskSize;