Sinipelto
/
banan-os
forked from Bananymous/banan-os
1
0
Fork 0
Code Pull Requests Activity

Kernel: Correct inode links count

This commit is contained in:
Bananymous 2023-09-05 14:46:56 +03:00
parent 4363118d9d
commit 5a623adaa6
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
kernel/kernel/FS/Ext2/FileSystem.cpp
View File

@ -2,6 +2,7 @@
#include <kernel/FS/Ext2/FileSystem.h> #include <kernel/FS/Ext2/FileSystem.h>
#define EXT2_DEBUG_PRINT 1 #define EXT2_DEBUG_PRINT 1
#define EXT2_VERIFY_INODE 0
namespace Kernel namespace Kernel
{ {
@ -129,13 +130,6 @@ namespace Kernel
BAN::ErrorOr<void> Ext2FS::initialize_root_inode() BAN::ErrorOr<void> Ext2FS::initialize_root_inode()
{ {
m_root_inode = TRY(Ext2Inode::create(*this, Ext2::Enum::ROOT_INO)); m_root_inode = TRY(Ext2Inode::create(*this, Ext2::Enum::ROOT_INO));
#if EXT2_DEBUG_PRINT
dprintln("root inode:");
dprintln(" created {}", root_inode()->ctime().tv_sec);
dprintln(" modified {}", root_inode()->mtime().tv_sec);
dprintln(" accessed {}", root_inode()->atime().tv_sec);
#endif
return {}; return {};
} }
@ -336,7 +330,7 @@ namespace Kernel
BAN::ErrorOr<Ext2FS::BlockLocation> Ext2FS::locate_inode(uint32_t ino) BAN::ErrorOr<Ext2FS::BlockLocation> Ext2FS::locate_inode(uint32_t ino)
{ {
ASSERT(ino < superblock().inodes_count); ASSERT(ino <= superblock().inodes_count);
const uint32_t block_size = this->block_size(); const uint32_t block_size = this->block_size();
@ -359,7 +353,7 @@ namespace Kernel
.offset = inode_byte_offset % block_size .offset = inode_byte_offset % block_size
}; };
#if VERIFY_INODE_EXISTANCE #if EXT2_VERIFY_INODE
const uint32_t inode_bitmap_block = bgd.inode_bitmap; const uint32_t inode_bitmap_block = bgd.inode_bitmap;
// NOTE: we can reuse the bgd_buffer since it is not needed anymore // NOTE: we can reuse the bgd_buffer since it is not needed anymore

4
kernel/kernel/FS/Ext2/Inode.cpp
View File

@ -3,8 +3,6 @@
#include <kernel/FS/Ext2/Inode.h> #include <kernel/FS/Ext2/Inode.h>
#include <kernel/Timer/Timer.h> #include <kernel/Timer/Timer.h>
#define EXT2_DEBUG_PRINT 1
namespace Kernel namespace Kernel
{ {
@ -406,7 +404,7 @@ namespace Kernel
.mtime = (uint32_t)current_time.tv_sec, .mtime = (uint32_t)current_time.tv_sec,
.dtime = 0, .dtime = 0,
.gid = (uint16_t)gid, .gid = (uint16_t)gid,
.links_count = 5, .links_count = 1,
.blocks = 0, .blocks = 0,
.flags = 0, .flags = 0,
.osd1 = 0, .osd1 = 0,