From 5ec2d8508121cfdf850afd9757c68898c9b4835f Mon Sep 17 00:00:00 2001 From: Bananymous Date: Mon, 10 Jul 2023 09:51:13 +0300 Subject: [PATCH] Kernel: Inode rename directory functions --- kernel/include/kernel/DeviceManager.h | 4 ++-- kernel/include/kernel/FS/Ext2.h | 4 ++-- kernel/include/kernel/FS/Inode.h | 4 ++-- kernel/kernel/DeviceManager.cpp | 4 ++-- kernel/kernel/FS/Ext2.cpp | 6 +++--- kernel/kernel/FS/VirtualFileSystem.cpp | 8 ++++---- kernel/kernel/OpenFileDescriptorSet.cpp | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/kernel/include/kernel/DeviceManager.h b/kernel/include/kernel/DeviceManager.h index fa6dacd6..e9914d49 100644 --- a/kernel/include/kernel/DeviceManager.h +++ b/kernel/include/kernel/DeviceManager.h @@ -33,8 +33,8 @@ namespace Kernel virtual BAN::StringView name() const override { return "device-manager"; } - virtual BAN::ErrorOr> read_directory_inode(BAN::StringView) override; - virtual BAN::ErrorOr read_next_directory_entries(off_t, DirectoryEntryList*, size_t) override; + virtual BAN::ErrorOr> directory_find_inode(BAN::StringView) override; + virtual BAN::ErrorOr directory_read_next_entries(off_t, DirectoryEntryList*, size_t) override; private: DeviceManager() = default; diff --git a/kernel/include/kernel/FS/Ext2.h b/kernel/include/kernel/FS/Ext2.h index d7bca02f..48994449 100644 --- a/kernel/include/kernel/FS/Ext2.h +++ b/kernel/include/kernel/FS/Ext2.h @@ -141,8 +141,8 @@ namespace Kernel virtual BAN::ErrorOr link_target() override; - virtual BAN::ErrorOr read_next_directory_entries(off_t, DirectoryEntryList*, size_t) override; - virtual BAN::ErrorOr> read_directory_inode(BAN::StringView) override; + virtual BAN::ErrorOr directory_read_next_entries(off_t, DirectoryEntryList*, size_t) override; + virtual BAN::ErrorOr> directory_find_inode(BAN::StringView) override; virtual BAN::ErrorOr read(size_t, void*, size_t) override; diff --git a/kernel/include/kernel/FS/Inode.h b/kernel/include/kernel/FS/Inode.h index e31b23e0..642a89a6 100644 --- a/kernel/include/kernel/FS/Inode.h +++ b/kernel/include/kernel/FS/Inode.h @@ -82,8 +82,8 @@ namespace Kernel virtual BAN::ErrorOr link_target() { ASSERT_NOT_REACHED(); } - virtual BAN::ErrorOr> read_directory_inode(BAN::StringView) { if (!mode().ifdir()) return BAN::Error::from_errno(ENOTDIR); ASSERT_NOT_REACHED(); } - virtual BAN::ErrorOr read_next_directory_entries(off_t, DirectoryEntryList*, size_t) { if (!mode().ifdir()) return BAN::Error::from_errno(ENOTDIR); ASSERT_NOT_REACHED(); } + virtual BAN::ErrorOr> directory_find_inode(BAN::StringView) { if (!mode().ifdir()) return BAN::Error::from_errno(ENOTDIR); ASSERT_NOT_REACHED(); } + virtual BAN::ErrorOr directory_read_next_entries(off_t, DirectoryEntryList*, size_t) { if (!mode().ifdir()) return BAN::Error::from_errno(ENOTDIR); ASSERT_NOT_REACHED(); } virtual BAN::ErrorOr read(size_t, void*, size_t) { if (mode().ifdir()) return BAN::Error::from_errno(EISDIR); ASSERT_NOT_REACHED(); } virtual BAN::ErrorOr write(size_t, const void*, size_t) { if (mode().ifdir()) return BAN::Error::from_errno(EISDIR); ASSERT_NOT_REACHED(); } diff --git a/kernel/kernel/DeviceManager.cpp b/kernel/kernel/DeviceManager.cpp index 930ea701..81b9e454 100644 --- a/kernel/kernel/DeviceManager.cpp +++ b/kernel/kernel/DeviceManager.cpp @@ -103,7 +103,7 @@ namespace Kernel MUST(m_devices.push_back(device)); } - BAN::ErrorOr> DeviceManager::read_directory_inode(BAN::StringView name) + BAN::ErrorOr> DeviceManager::directory_find_inode(BAN::StringView name) { LockGuard _(m_lock); if (name == "."sv || name == ".."sv) @@ -114,7 +114,7 @@ namespace Kernel return BAN::Error::from_errno(ENOENT); } - BAN::ErrorOr DeviceManager::read_next_directory_entries(off_t offset, DirectoryEntryList* list, size_t list_size) + BAN::ErrorOr DeviceManager::directory_read_next_entries(off_t offset, DirectoryEntryList* list, size_t list_size) { if (offset != 0) { diff --git a/kernel/kernel/FS/Ext2.cpp b/kernel/kernel/FS/Ext2.cpp index 43768f14..64e149db 100644 --- a/kernel/kernel/FS/Ext2.cpp +++ b/kernel/kernel/FS/Ext2.cpp @@ -291,7 +291,7 @@ namespace Kernel return n_read; } - BAN::ErrorOr Ext2Inode::read_next_directory_entries(off_t offset, DirectoryEntryList* list, size_t list_size) + BAN::ErrorOr Ext2Inode::directory_read_next_entries(off_t offset, DirectoryEntryList* list, size_t list_size) { if (!mode().ifdir()) return BAN::Error::from_errno(ENOTDIR); @@ -368,7 +368,7 @@ namespace Kernel BAN::Vector block_buffer; TRY(block_buffer.resize(block_size)); - auto error_or = read_directory_inode(name); + auto error_or = directory_find_inode(name); if (!error_or.is_error()) return BAN::Error::from_errno(EEXISTS); if (error_or.error().get_error_code() != ENOENT) @@ -441,7 +441,7 @@ namespace Kernel return {}; } - BAN::ErrorOr> Ext2Inode::read_directory_inode(BAN::StringView file_name) + BAN::ErrorOr> Ext2Inode::directory_find_inode(BAN::StringView file_name) { if (!mode().ifdir()) return BAN::Error::from_errno(ENOTDIR); diff --git a/kernel/kernel/FS/VirtualFileSystem.cpp b/kernel/kernel/FS/VirtualFileSystem.cpp index ceb1a275..210a01c5 100644 --- a/kernel/kernel/FS/VirtualFileSystem.cpp +++ b/kernel/kernel/FS/VirtualFileSystem.cpp @@ -20,7 +20,7 @@ namespace Kernel ASSERT(root.size() >= 5 && root.substring(0, 5) == "/dev/"sv);; root = root.substring(5); - auto partition_inode = MUST(DeviceManager::get().read_directory_inode(root)); + auto partition_inode = MUST(DeviceManager::get().directory_find_inode(root)); s_instance->m_root_fs = MUST(Ext2FS::create(*(Partition*)partition_inode.ptr())); DeviceManager::get().set_blksize(s_instance->m_root_fs->root_inode()->blksize()); @@ -110,9 +110,9 @@ namespace Kernel else if (path_part == ".."sv) { if (auto* mount_point = mount_from_root_inode(inode)) - inode = TRY(mount_point->host.inode->read_directory_inode(".."sv)); + inode = TRY(mount_point->host.inode->directory_find_inode(".."sv)); else - inode = TRY(inode->read_directory_inode(".."sv)); + inode = TRY(inode->directory_find_inode(".."sv)); if (!canonical_path.empty()) { @@ -127,7 +127,7 @@ namespace Kernel if (!inode->can_access(credentials, O_RDONLY)) return BAN::Error::from_errno(EACCES); - inode = TRY(inode->read_directory_inode(path_part)); + inode = TRY(inode->directory_find_inode(path_part)); if (auto* mount_point = mount_from_host_inode(inode)) inode = mount_point->target->root_inode(); diff --git a/kernel/kernel/OpenFileDescriptorSet.cpp b/kernel/kernel/OpenFileDescriptorSet.cpp index e99bd366..56e399c4 100644 --- a/kernel/kernel/OpenFileDescriptorSet.cpp +++ b/kernel/kernel/OpenFileDescriptorSet.cpp @@ -199,7 +199,7 @@ namespace Kernel { TRY(validate_fd(fd)); auto& open_file = m_open_files[fd]; - TRY(open_file->inode->read_next_directory_entries(open_file->offset, list, list_size)); + TRY(open_file->inode->directory_read_next_entries(open_file->offset, list, list_size)); open_file->offset++; return {}; }