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

Patch from Janito Ferreira Filho (bug #5706): limit the Inode ID to the maximum number of Inodes. Thanks!

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36358 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jérôme Duval
2010-04-19 19:04:40 +00:00
parent 71609f7e46
commit 17aad616d2
3 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/file_systems/ext2/Volume.cpp
+1
View File
@@ -278,6 +278,7 @@ Volume::Mount(const char* deviceName, uint32 flags)
fBlockSize = 1UL << fSuperBlock.BlockShift(); fBlockSize = 1UL << fSuperBlock.BlockShift();
fFirstDataBlock = fSuperBlock.FirstDataBlock(); fFirstDataBlock = fSuperBlock.FirstDataBlock();
fNumInodes = fSuperBlock.NumInodes();
fNumGroups = (fSuperBlock.NumBlocks() - fFirstDataBlock - 1) fNumGroups = (fSuperBlock.NumBlocks() - fFirstDataBlock - 1)
/ fSuperBlock.BlocksPerGroup() + 1; / fSuperBlock.BlocksPerGroup() + 1;
fGroupsPerBlock = fBlockSize / sizeof(ext2_block_group); fGroupsPerBlock = fBlockSize / sizeof(ext2_block_group);
src/add-ons/kernel/file_systems/ext2/Volume.h
+3
View File
@@ -38,6 +38,8 @@ public:
fs_volume* FSVolume() const { return fFSVolume; } fs_volume* FSVolume() const { return fFSVolume; }
const char* Name() const; const char* Name() const;
uint32 NumInodes() const
{ return fNumInodes; }
off_t NumBlocks() const off_t NumBlocks() const
{ return fSuperBlock.NumBlocks(); } { return fSuperBlock.NumBlocks(); }
off_t FreeBlocks() const off_t FreeBlocks() const
@@ -74,6 +76,7 @@ private:
uint32 fBlockSize; uint32 fBlockSize;
uint32 fBlockShift; uint32 fBlockShift;
uint32 fFirstDataBlock; uint32 fFirstDataBlock;
uint32 fNumInodes;
uint32 fNumGroups; uint32 fNumGroups;
uint32 fGroupsPerBlock; uint32 fGroupsPerBlock;
ext2_block_group** fGroupBlocks; ext2_block_group** fGroupBlocks;
src/add-ons/kernel/file_systems/ext2/kernel_interface.cpp
+1 -1
View File
@@ -167,7 +167,7 @@ ext2_get_vnode(fs_volume* _volume, ino_t id, fs_vnode* _node, int* _type,
{ {
Volume* volume = (Volume*)_volume->private_volume; Volume* volume = (Volume*)_volume->private_volume;
if (id < 2 || id > volume->NumBlocks()) { if (id < 2 || id > volume->NumInodes()) {
dprintf("ext2: inode at %Ld requested!\n", id); dprintf("ext2: inode at %Ld requested!\n", id);
return B_ERROR; return B_ERROR;
} }