diff options
Diffstat (limited to 'kernel/kernel/filesystems/ext2/filesystem.hpp')
| -rw-r--r-- | kernel/kernel/filesystems/ext2/filesystem.hpp | 49 |
1 files changed, 25 insertions, 24 deletions
diff --git a/kernel/kernel/filesystems/ext2/filesystem.hpp b/kernel/kernel/filesystems/ext2/filesystem.hpp index 7ea7b43a..15328d94 100644 --- a/kernel/kernel/filesystems/ext2/filesystem.hpp +++ b/kernel/kernel/filesystems/ext2/filesystem.hpp @@ -32,26 +32,26 @@ namespace kernel::filesystems::ext2 { constexpr kstd::bytes inline base_block_size = kstd::bytes{1024}; constexpr kstd::bytes inline superblock_offset = base_block_size; - constexpr uint16_t inline magic_number = 0xEF53; + constexpr std::uint16_t inline magic_number = 0xEF53; - constexpr uint32_t inline good_old_revision = 0; - constexpr uint32_t inline dynamic_revision = 1; + constexpr std::uint32_t inline good_old_revision = 0; + constexpr std::uint32_t inline dynamic_revision = 1; - constexpr uint32_t inline root_inode_number = 2; + constexpr std::uint32_t inline root_inode_number = 2; - constexpr size_t inline direct_block_count = 12; - constexpr size_t inline singly_indirect_block_index = direct_block_count; - constexpr size_t inline doubly_indirect_block_index = singly_indirect_block_index + 1; - constexpr size_t inline triply_indirect_block_index = doubly_indirect_block_index + 1; + constexpr std::size_t inline direct_block_count = 12; + constexpr std::size_t inline singly_indirect_block_index = direct_block_count; + constexpr std::size_t inline doubly_indirect_block_index = singly_indirect_block_index + 1; + constexpr std::size_t inline triply_indirect_block_index = doubly_indirect_block_index + 1; - constexpr uint16_t inline mode_mask = 0xF000; - constexpr uint16_t inline mode_regular = 0x8000; - constexpr uint16_t inline mode_directory = 0x4000; - constexpr uint16_t inline mode_symbolic_link = 0xA000; - constexpr uint16_t inline mode_block_device = 0x6000; - constexpr uint16_t inline mode_character_device = 0x2000; - constexpr uint16_t inline mode_fifo = 0x1000; - constexpr uint16_t inline mode_socket = 0xC000; + constexpr std::uint16_t inline mode_mask = 0xF000; + constexpr std::uint16_t inline mode_regular = 0x8000; + constexpr std::uint16_t inline mode_directory = 0x4000; + constexpr std::uint16_t inline mode_symbolic_link = 0xA000; + constexpr std::uint16_t inline mode_block_device = 0x6000; + constexpr std::uint16_t inline mode_character_device = 0x2000; + constexpr std::uint16_t inline mode_fifo = 0x1000; + constexpr std::uint16_t inline mode_socket = 0xC000; } // namespace constants @@ -87,7 +87,7 @@ namespace kernel::filesystems::ext2 //! @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, driver_state const & state) -> uint32_t; + [[nodiscard]] auto block_count(inode const & inode, driver_state const & state) -> std::uint32_t; //! Determine the size of an inode's data on disk. //! @@ -119,21 +119,22 @@ 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, driver_state & state, write_batch & batch) -> kstd::result<kstd::vector<uint32_t>>; + auto allocate_blocks(std::size_t count, driver_state & state, write_batch & batch) + -> kstd::result<kstd::vector<std::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, driver_state & state) -> void; + auto update_inode_block_count(inode_data & data, std::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, driver_state & state) -> kstd::result<void>; + auto write_inode(std::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 +142,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, driver_state const & state) + [[nodiscard]] auto inode_block_number(std::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. @@ -151,12 +152,12 @@ namespace kernel::filesystems::ext2 //! @param global_block_number The global block number to write. //! @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, driver_state & state, + auto write_global_block_number_to_inode_block_index(std::size_t block_index, inode_data & data, + std::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, driver_state const & state) + std::size_t block_group_descriptor_index, driver_state const & state) -> kstd::result<void>; [[nodiscard]] auto write_superblock(driver_state & state) -> kstd::result<void>; } // namespace kernel::filesystems::ext2 |