diff options
Diffstat (limited to 'kernel/kernel/filesystems/ext2/filesystem.hpp')
| -rw-r--r-- | kernel/kernel/filesystems/ext2/filesystem.hpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/kernel/kernel/filesystems/ext2/filesystem.hpp b/kernel/kernel/filesystems/ext2/filesystem.hpp index cdf552c9..7ea7b43a 100644 --- a/kernel/kernel/filesystems/ext2/filesystem.hpp +++ b/kernel/kernel/filesystems/ext2/filesystem.hpp @@ -3,9 +3,9 @@ #include <kernel/filesystems/ext2/block_group_descriptor.hpp> #include <kernel/filesystems/ext2/directory_iterator.hpp> +#include <kernel/filesystems/ext2/driver_state.hpp> #include <kernel/filesystems/ext2/inode.hpp> #include <kernel/filesystems/ext2/linked_directory_entry.hpp> -#include <kernel/filesystems/ext2/mount_state.hpp> #include <kernel/filesystems/ext2/superblock.hpp> #include <kernel/filesystems/ext2/write_batch.hpp> #include <kernel/vfs/filesystem.hpp> @@ -80,28 +80,28 @@ namespace kernel::filesystems::ext2 //! //! @param state The driver state to operate on. //! @return The size of a block in bytes. - [[nodiscard]] auto block_size(mount_state const & state) -> kstd::bytes; + [[nodiscard]] auto block_size(driver_state const & state) -> kstd::bytes; //! Get the number of blocks allocated to an inode. //! //! @param inode The inode whose block count to query. //! @param state The driver state to operate on. //! @return The number of blocks allocated to the inode. - [[nodiscard]] auto block_count(inode const & inode, mount_state const & state) -> uint32_t; + [[nodiscard]] auto block_count(inode const & inode, driver_state const & state) -> uint32_t; //! Determine the size of an inode's data on disk. //! //! @param inode The inode whose data size to determine. //! @param state The driver state to operate on. //! @return The size of the data referenced by the inode. - [[nodiscard]] auto data_size(inode const & inode, mount_state const & state) -> kstd::bytes; + [[nodiscard]] auto data_size(inode const & inode, driver_state const & state) -> kstd::bytes; //! Set the size of an inode's data on disk. //! //! @param inode The inode whose data size to set. //! @param new_size The size to set. //! @param state The driver state to operate on. - auto set_data_size(inode & inode, kstd::bytes new_size, mount_state const & state) -> void; + auto set_data_size(inode & inode, kstd::bytes new_size, driver_state const & state) -> void; //! Perform the actual read of the requested data. //! @@ -111,7 +111,7 @@ namespace kernel::filesystems::ext2 //! @param state The driver state to operate on. //! @return The number of bytes read on success, an error otherwise. [[nodiscard]] auto do_read(inode const & inode, std::span<std::byte> buffer, kstd::bytes offset, - mount_state const & state) -> kstd::result<kstd::bytes>; + driver_state const & state) -> kstd::result<kstd::bytes>; //! Allocate a specified number of blocks. //! @@ -119,21 +119,21 @@ namespace kernel::filesystems::ext2 //! @param state The state to operate on. //! @param batch The active write batch. //! @return A vector of the allocated block numbers. - auto allocate_blocks(size_t count, mount_state & state, write_batch & batch) -> kstd::result<kstd::vector<uint32_t>>; + auto allocate_blocks(size_t count, driver_state & state, write_batch & batch) -> kstd::result<kstd::vector<uint32_t>>; //! Update the number of blocks allocated to an inode. //! //! @param data The inode data. //! @param state The state to operate on. //! @param delta The change in the number of blocks. - auto update_inode_block_count(inode_data & data, uint32_t delta, mount_state & state) -> void; + auto update_inode_block_count(inode_data & data, uint32_t delta, driver_state & state) -> void; //! Write an inode to the backing inode. //! //! @param inode_number The number of the inode to write. //! @param state The state to operate on. //! @param data The inode data to write. - auto write_inode(uint32_t inode_number, inode_data const & data, mount_state & state) -> kstd::result<void>; + auto write_inode(uint32_t inode_number, inode_data const & data, driver_state & state) -> kstd::result<void>; //! Get the block number associated with the nth block of an inode. //! @@ -141,7 +141,7 @@ namespace kernel::filesystems::ext2 //! @param inode The inode. //! @param state The state to operate on. //! @return The global block number on success, an error otherwise. - [[nodiscard]] auto inode_block_number(size_t index, inode const & inode, mount_state const & state) + [[nodiscard]] auto inode_block_number(size_t index, inode const & inode, driver_state const & state) -> kstd::result<std::size_t>; //! Write a global block number to an inode block index. @@ -152,13 +152,13 @@ namespace kernel::filesystems::ext2 //! @param state The state to operate on. //! @param batch The active write batch. auto write_global_block_number_to_inode_block_index(size_t block_index, inode_data & data, - uint32_t global_block_number, mount_state & state, + uint32_t global_block_number, driver_state & state, write_batch & batch) -> kstd::result<void>; [[nodiscard]] auto write_block_group_descriptor(block_group_descriptor const & block_group_descriptor, - size_t block_group_descriptor_index, mount_state const & state) + size_t block_group_descriptor_index, driver_state const & state) -> kstd::result<void>; - [[nodiscard]] auto write_superblock(mount_state & state) -> kstd::result<void>; + [[nodiscard]] auto write_superblock(driver_state & state) -> kstd::result<void>; } // namespace kernel::filesystems::ext2 #endif |