diff options
Diffstat (limited to 'kernel/filesystem/include')
4 files changed, 40 insertions, 1 deletions
diff --git a/kernel/filesystem/include/filesystem/ext2/ext2_filesystem.hpp b/kernel/filesystem/include/filesystem/ext2/ext2_filesystem.hpp index 91ba14a..cba2192 100644 --- a/kernel/filesystem/include/filesystem/ext2/ext2_filesystem.hpp +++ b/kernel/filesystem/include/filesystem/ext2/ext2_filesystem.hpp @@ -3,12 +3,16 @@ #include "devices/device.hpp" #include "filesystem/filesystem.hpp" +#include "filesystem/inode.hpp" + +#include <string_view> namespace filesystem::ext2 { struct ext2_filesystem : filesystem { auto mount(devices::device * device) -> int override; + auto lookup(inode const & parent, std::string_view name) -> inode * override; private: devices::device * m_device{}; diff --git a/kernel/filesystem/include/filesystem/filesystem.hpp b/kernel/filesystem/include/filesystem/filesystem.hpp index 2077ed6..8deb336 100644 --- a/kernel/filesystem/include/filesystem/filesystem.hpp +++ b/kernel/filesystem/include/filesystem/filesystem.hpp @@ -4,6 +4,8 @@ #include "devices/device.hpp" #include "filesystem/inode.hpp" +#include <string_view> + namespace filesystem { struct filesystem @@ -11,8 +13,10 @@ namespace filesystem virtual ~filesystem() = default; virtual auto mount(devices::device * 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() -> inode *; + [[nodiscard]] auto root_inode() const -> inode const *; protected: inode m_root_inode{}; // TODO BA-FS26 set during mount? diff --git a/kernel/filesystem/include/filesystem/inode.hpp b/kernel/filesystem/include/filesystem/inode.hpp index eb8440f..bceabb6 100644 --- a/kernel/filesystem/include/filesystem/inode.hpp +++ b/kernel/filesystem/include/filesystem/inode.hpp @@ -2,6 +2,7 @@ #define TEACH_OS_KERNEL_FILESYSTEM_INODE_HPP #include "devices/device.hpp" +#include "filesystem/inode_metadata.hpp" #include <cstddef> @@ -10,8 +11,13 @@ namespace filesystem struct inode { inode() = default; + explicit inode(inode_kind kind); explicit inode(devices::device * device); + [[nodiscard]] auto metadata() const -> inode_metadata; + + [[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; @@ -22,6 +28,7 @@ namespace filesystem auto write(void const * buffer, size_t offset, size_t size) -> size_t; private: + inode_kind m_kind{inode_kind::regular}; devices::device * m_device{}; }; } // namespace filesystem diff --git a/kernel/filesystem/include/filesystem/inode_metadata.hpp b/kernel/filesystem/include/filesystem/inode_metadata.hpp new file mode 100644 index 0000000..ed5a09d --- /dev/null +++ b/kernel/filesystem/include/filesystem/inode_metadata.hpp @@ -0,0 +1,24 @@ +#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 |