From 45789fda08f58078705cf0483675886e0320188d Mon Sep 17 00:00:00 2001 From: Bananymous Date: Mon, 10 Jul 2023 14:09:35 +0300 Subject: [PATCH] Kernel: You can now read/write to RamInodes RamFS should be stored on physical pages and not in kmalloc, but that will be implemented later :) --- kernel/include/kernel/FS/RamFS/Inode.h | 3 ++ kernel/kernel/FS/RamFS/Inode.cpp | 63 +++++++++++++++++++++++--- 2 files changed, 59 insertions(+), 7 deletions(-) diff --git a/kernel/include/kernel/FS/RamFS/Inode.h b/kernel/include/kernel/FS/RamFS/Inode.h index f82995c98..57c3299da 100644 --- a/kernel/include/kernel/FS/RamFS/Inode.h +++ b/kernel/include/kernel/FS/RamFS/Inode.h @@ -30,6 +30,9 @@ namespace Kernel virtual BAN::StringView name() const override { ASSERT_NOT_REACHED(); } + virtual BAN::ErrorOr read(size_t, void*, size_t) override; + virtual BAN::ErrorOr write(size_t, const void*, size_t) override; + void add_link() { m_inode_info.nlink++; } protected: diff --git a/kernel/kernel/FS/RamFS/Inode.cpp b/kernel/kernel/FS/RamFS/Inode.cpp index 48e6a0199..1c38008e7 100644 --- a/kernel/kernel/FS/RamFS/Inode.cpp +++ b/kernel/kernel/FS/RamFS/Inode.cpp @@ -43,6 +43,34 @@ namespace Kernel m_inode_info.rdev = 0; } + BAN::ErrorOr RamInode::read(size_t offset, void* buffer, size_t bytes) + { + if (offset >= (size_t)size()) + return 0; + + size_t to_copy = BAN::Math::min(m_inode_info.size - offset, bytes); + memcpy(buffer, m_data.data(), to_copy); + + return to_copy; + } + + BAN::ErrorOr RamInode::write(size_t offset, const void* buffer, size_t bytes) + { + if (offset + bytes > (size_t)size()) + { + TRY(m_data.resize(offset + bytes)); + if (offset > (size_t)size()) + memset(m_data.data() + offset, 0, offset - size()); + + m_inode_info.size = m_data.size(); + m_inode_info.blocks = BAN::Math::div_round_up(size(), blksize()); + } + + memcpy(m_data.data() + offset, buffer, bytes); + + return bytes; + } + /* RAM DIRECTORY INODE @@ -100,8 +128,6 @@ namespace Kernel } } - sizeof(Entry); - return BAN::Error::from_errno(ENOENT); } @@ -155,11 +181,34 @@ namespace Kernel BAN::ErrorOr RamDirectoryInode::create_file(BAN::StringView name, mode_t mode, uid_t uid, gid_t gid) { - (void)name; - (void)mode; - (void)uid; - (void)gid; - ASSERT_NOT_REACHED(); + if (name.size() > m_name_max) + return BAN::Error::from_errno(ENAMETOOLONG); + + for (auto& entry : m_entries) + if (name == entry.name) + return BAN::Error::from_errno(EEXIST); + + BAN::RefPtr inode; + if (Mode{ mode }.ifreg()) + inode = TRY(RamInode::create(m_fs, mode, uid, gid)); + else if (Mode{ mode }.ifdir()) + inode = TRY(RamDirectoryInode::create(m_fs, ino(), mode, uid, gid)); + else + ASSERT_NOT_REACHED(); + + TRY(m_entries.push_back({ })); + Entry& entry = m_entries.back(); + strcpy(entry.name, name.data()); + entry.name_len = name.size(); + entry.ino = inode->ino(); + + if (auto ret = m_fs.add_inode(inode); ret.is_error()) + { + m_entries.pop_back(); + return ret.release_error(); + } + + return {}; } } \ No newline at end of file