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

update main #1

Merged
Sinipelto merged 240 commits from Bananymous/banan-os:main into main 2023-11-20 13:20:51 +02:00
Conversation 0 Commits 240 Files Changed 263 +7 -8
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit dedb2a2399 - Show all commits

8
kernel/include/kernel/Device/Device.h
View File

@ -25,9 +25,9 @@ namespace Kernel
{
protected:
BlockDevice(mode_t mode, uid_t uid, gid_t gid)
: Device(Mode::IFBLK | mode, uid, gid)
: Device(mode, uid, gid)
{
ASSERT(Device::mode().ifblk());
m_inode_info.mode |= Inode::Mode::IFBLK;
}
};
@ -35,9 +35,9 @@ namespace Kernel
{
protected:
CharacterDevice(mode_t mode, uid_t uid, gid_t gid)
: Device(Mode::IFCHR | mode, uid, gid)
: Device(mode, uid, gid)
{
ASSERT(Device::mode().ifchr());
m_inode_info.mode |= Inode::Mode::IFCHR;
}
};

4
kernel/include/kernel/FS/RamFS/Inode.h
View File

@ -52,7 +52,9 @@ namespace Kernel
RamInode(RamFileSystem& fs, const FullInodeInfo& inode_info)
: m_fs(fs)
, m_inode_info(inode_info)
{}
{
ASSERT((inode_info.mode & Inode::Mode::TYPE_MASK) == 0);
}
protected:
RamFileSystem& m_fs;

3
kernel/kernel/FS/RamFS/Inode.cpp
View File

@ -45,7 +45,6 @@ namespace Kernel
RamFileInode::RamFileInode(RamFileSystem& fs, const FullInodeInfo& inode_info)
: RamInode(fs, inode_info)
{
ASSERT((m_inode_info.mode & Inode::Mode::TYPE_MASK) == 0);
m_inode_info.mode |= Inode::Mode::IFREG;
}
@ -108,7 +107,6 @@ namespace Kernel
: RamInode(fs, inode_info)
, m_parent(parent)
{
ASSERT((m_inode_info.mode & Inode::Mode::TYPE_MASK) == 0);
m_inode_info.mode |= Inode::Mode::IFDIR;
}
@ -263,7 +261,6 @@ namespace Kernel
: RamInode(fs, inode_info)
, m_target(BAN::move(target))
{
ASSERT((m_inode_info.mode & Inode::Mode::TYPE_MASK) == 0);
m_inode_info.mode |= Inode::Mode::IFLNK;
}