remove inode metadata

4 files changed, 26 insertions, 40 deletions

diff --git a/kernel/include/kernel/filesystem/device_inode.hpp b/kernel/include/kernel/filesystem/device_inode.hpp
index a99e5d1..0287875 100644
--- a/kernel/include/kernel/filesystem/device_inode.hpp
+++ b/kernel/include/kernel/filesystem/device_inode.hpp
@@ -1,13 +1,26 @@
 #ifndef TEACH_OS_KERNEL_FILESYSTEM_DEVICE_INODE_HPP
 #define TEACH_OS_KERNEL_FILESYSTEM_DEVICE_INODE_HPP
 
+#include "kernel/devices/device.hpp"
 #include "kernel/filesystem/inode.hpp"
 
+#include <kstd/memory>
+
+#include <cstddef>
+
 namespace filesystem
 {
   struct device_inode : inode
   {
-    // TODO BA-FS26
+    explicit device_inode(kstd::shared_ptr<devices::device> const & device);
+
+    [[nodiscard]] auto backing_device() const -> kstd::shared_ptr<devices::device> const &;
+
+    auto read(void * buffer, size_t offset, size_t size) const -> size_t override;
+    auto write(void const * buffer, size_t offset, size_t size) -> size_t override;
+
+  private:
+    kstd::shared_ptr<devices::device> m_device{};
   };
 }  // namespace filesystem
 
diff --git a/kernel/include/kernel/filesystem/filesystem.hpp b/kernel/include/kernel/filesystem/filesystem.hpp
index 23924c4..035f49d 100644
--- a/kernel/include/kernel/filesystem/filesystem.hpp
+++ b/kernel/include/kernel/filesystem/filesystem.hpp
@@ -17,10 +17,10 @@ namespace filesystem
     virtual auto mount(kstd::shared_ptr<devices::device> const & device) -> int = 0;
     virtual auto lookup(inode const & parent, std::string_view name) -> inode * = 0;
 
-    [[nodiscard]] auto root_inode() const -> inode const &;
+    [[nodiscard]] auto root_inode() const -> kstd::shared_ptr<inode> const &;
 
   protected:
-    inode m_root_inode{};  // TODO BA-FS26 set during mount?
+    kstd::shared_ptr<inode> m_root_inode{};
   };
 
 }  // namespace filesystem
diff --git a/kernel/include/kernel/filesystem/inode.hpp b/kernel/include/kernel/filesystem/inode.hpp
index a2955f9..dcf83b9 100644
--- a/kernel/include/kernel/filesystem/inode.hpp
+++ b/kernel/include/kernel/filesystem/inode.hpp
@@ -1,9 +1,6 @@
 #ifndef TEACH_OS_KERNEL_FILESYSTEM_INODE_HPP
 #define TEACH_OS_KERNEL_FILESYSTEM_INODE_HPP
 
-#include "kernel/devices/device.hpp"
-#include "kernel/filesystem/inode_metadata.hpp"
-
 #include <kstd/memory>
 
 #include <cstddef>
@@ -12,26 +9,26 @@ namespace filesystem
 {
   struct inode
   {
-    inode() = default;
+    enum class inode_kind
+    {
+      regular,
+      directory,
+      device
+    };
+
     explicit inode(inode_kind kind);
-    explicit inode(kstd::shared_ptr<devices::device> const & device);
 
-    [[nodiscard]] auto metadata() const -> inode_metadata;
+    virtual ~inode() = default;
 
     [[nodiscard]] auto is_directory() const -> bool;
     [[nodiscard]] auto is_regular() const -> bool;
     [[nodiscard]] auto is_device() const -> bool;
-    [[nodiscard]] auto is_block_device() const -> bool;
-    [[nodiscard]] auto major_device() const -> size_t;
-    [[nodiscard]] auto minor_device() const -> size_t;
-    [[nodiscard]] auto backing_device() const -> kstd::shared_ptr<devices::device> const &;
 
-    auto read(void * buffer, size_t offset, size_t size) const -> size_t;
-    auto write(void const * buffer, size_t offset, size_t size) -> size_t;
+    virtual auto read(void * buffer, size_t offset, size_t size) const -> size_t = 0;
+    virtual auto write(void const * buffer, size_t offset, size_t size) -> size_t = 0;
 
   private:
     inode_kind m_kind{inode_kind::regular};
-    kstd::shared_ptr<devices::device> m_device{};
   };
 }  // namespace filesystem
 
diff --git a/kernel/include/kernel/filesystem/inode_metadata.hpp b/kernel/include/kernel/filesystem/inode_metadata.hpp
deleted file mode 100644
index ed5a09d..0000000
--- a/kernel/include/kernel/filesystem/inode_metadata.hpp
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifndef TEACH_OS_KERNEL_FILESYSTEM_INODE_METADATA_HPP
-#define TEACH_OS_KERNEL_FILESYSTEM_INODE_METADATA_HPP
-
-#include <cstddef>
-#include <optional>
-
-namespace filesystem
-{
-  enum class inode_kind
-  {
-    regular,
-    directory,
-    device
-  };
-
-  struct inode_metadata
-  {
-    inode_kind kind{inode_kind::regular};
-    std::optional<size_t> major{};
-    std::optional<size_t> minor{};
-  };
-}  // namespace filesystem
-
-#endif  // TEACH_OS_KERNEL_FILESYSTEM_INODE_METADATA_HPP
\ No newline at end of file