kstd: flatten units namespace

1 files changed, 10 insertions, 10 deletions

diff --git a/kernel/kernel/filesystem/ext2/inode.cpp b/kernel/kernel/filesystem/ext2/inode.cpp
index cba0e70c..5f161e82 100644
--- a/kernel/kernel/filesystem/ext2/inode.cpp
+++ b/kernel/kernel/filesystem/ext2/inode.cpp
@@ -31,12 +31,12 @@ namespace kernel::filesystem::ext2
     }
   }
 
-  auto inode::read(std::span<std::byte> buffer, kstd::units::bytes offset) const -> kstd::result<kstd::units::bytes>
+  auto inode::read(std::span<std::byte> buffer, kstd::bytes offset) const -> kstd::result<kstd::bytes>
   {
     auto const max_readable = this->size() - offset;
-    auto const requested_size = std::min(kstd::units::bytes{buffer.size()}, max_readable);
+    auto const requested_size = std::min(kstd::bytes{buffer.size()}, max_readable);
 
-    if (is_symbolic_link() && this->size() <= kstd::units::bytes{sizeof(m_data.block)})
+    if (is_symbolic_link() && this->size() <= kstd::bytes{sizeof(m_data.block)})
     {
       auto inline_target = reinterpret_cast<uint8_t const *>(m_data.block.data());
       kstd::libc::memcpy(buffer.data(), inline_target + offset, requested_size.value);
@@ -83,7 +83,7 @@ namespace kernel::filesystem::ext2
     return bytes_read;
   }
 
-  auto inode::write(std::span<std::byte const> buffer, kstd::units::bytes offset) -> kstd::result<kstd::units::bytes>
+  auto inode::write(std::span<std::byte const> buffer, kstd::bytes offset) -> kstd::result<kstd::bytes>
   {
     if (!is_regular())
     {
@@ -93,7 +93,7 @@ namespace kernel::filesystem::ext2
     // TODO check maximum file size of filesystem
     // TODO handle sparse files
 
-    auto const new_inode_size = std::max(this->size(), offset + kstd::units::bytes{buffer.size()});
+    auto const new_inode_size = std::max(this->size(), offset + kstd::bytes{buffer.size()});
 
     auto const current_block_count = m_filesystem->inode_block_count(m_data);
     auto const max_new_inode_size_without_new_blocks = current_block_count * m_filesystem->block_size();
@@ -116,7 +116,7 @@ namespace kernel::filesystem::ext2
 
     auto bytes_written = 0_B;
 
-    while (bytes_written < kstd::units::bytes{buffer.size()})
+    while (bytes_written < kstd::bytes{buffer.size()})
     {
       auto const block_number = m_filesystem->map_inode_block_index_to_global_block_number(block_index, m_data);
       // TODO BA-FS26 if blocknumber == 0 --> handle sparse file
@@ -126,7 +126,7 @@ namespace kernel::filesystem::ext2
       }
 
       auto const bytes_to_write =
-          std::min(kstd::units::bytes{buffer.size()} - bytes_written, m_filesystem->block_size() - in_block_offset);
+          std::min(kstd::bytes{buffer.size()} - bytes_written, m_filesystem->block_size() - in_block_offset);
 
       auto const block_start_offset = block_number.value() * m_filesystem->block_size();
       auto const write_offset = block_start_offset + in_block_offset;
@@ -244,7 +244,7 @@ namespace kernel::filesystem::ext2
     };
   }
 
-  auto inode::size() const -> kstd::units::bytes
+  auto inode::size() const -> kstd::bytes
   {
     uint64_t size = m_data.size;
 
@@ -253,10 +253,10 @@ namespace kernel::filesystem::ext2
       size |= static_cast<uint64_t>(m_data.dir_acl) << 32;
     }
 
-    return kstd::units::bytes{size};
+    return kstd::bytes{size};
   }
 
-  auto inode::set_size(kstd::units::bytes new_size) -> void
+  auto inode::set_size(kstd::bytes new_size) -> void
   {
     if (m_filesystem->revision_level() > constants::good_old_revision && is_regular())
     {