aboutsummaryrefslogtreecommitdiff
path: root/kernel/filesystem/src
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/filesystem/src')
-rw-r--r--kernel/filesystem/src/ext2/ext2_filesystem.cpp14
-rw-r--r--kernel/filesystem/src/filesystem.cpp9
-rw-r--r--kernel/filesystem/src/inode.cpp34
3 files changed, 51 insertions, 6 deletions
diff --git a/kernel/filesystem/src/ext2/ext2_filesystem.cpp b/kernel/filesystem/src/ext2/ext2_filesystem.cpp
index 97257a2..f092ddf 100644
--- a/kernel/filesystem/src/ext2/ext2_filesystem.cpp
+++ b/kernel/filesystem/src/ext2/ext2_filesystem.cpp
@@ -3,6 +3,8 @@
#include "devices/device.hpp"
#include "filesystem/inode.hpp"
+#include <string_view>
+
namespace filesystem::ext2
{
auto ext2_filesystem::mount(devices::device * device) -> int
@@ -12,9 +14,17 @@ namespace filesystem::ext2
return -1; // TODO BA-FS26 panic or errorcode?
}
- m_root_inode = inode{}; // TODO BA-FS26 set properly during mount?
+ m_device = device;
+ // TODO BA-FS26 load proper root inode from ext2 metadata
+ m_root_inode = inode{inode_kind::directory};
// TODO BA-FS26 implement
return 0;
}
-} // namespace filesystem::ext2 \ No newline at end of file
+
+ auto ext2_filesystem::lookup(inode const & /*parent*/, std::string_view /*name*/) -> inode *
+ {
+ // TODO BA-FS26 implement ext2 directory traversal and inode loading
+ return nullptr;
+ }
+} // namespace filesystem::ext2
diff --git a/kernel/filesystem/src/filesystem.cpp b/kernel/filesystem/src/filesystem.cpp
index cdfe7f8..a06bccc 100644
--- a/kernel/filesystem/src/filesystem.cpp
+++ b/kernel/filesystem/src/filesystem.cpp
@@ -4,8 +4,13 @@
namespace filesystem
{
- auto filesystem::root_inode() const -> inode const &
+ auto filesystem::root_inode() -> inode *
{
- return m_root_inode;
+ return &m_root_inode;
+ }
+
+ auto filesystem::root_inode() const -> inode const *
+ {
+ return &m_root_inode;
}
} // namespace filesystem \ No newline at end of file
diff --git a/kernel/filesystem/src/inode.cpp b/kernel/filesystem/src/inode.cpp
index a1427e2..17aa52a 100644
--- a/kernel/filesystem/src/inode.cpp
+++ b/kernel/filesystem/src/inode.cpp
@@ -3,13 +3,19 @@
#include "kapi/system.hpp"
#include "devices/device.hpp"
+#include "filesystem/inode_metadata.hpp"
#include <cstddef>
namespace filesystem
{
+ inode::inode(inode_kind kind)
+ : m_kind(kind)
+ {}
+
inode::inode(devices::device * device)
- : m_device(device)
+ : m_kind(inode_kind::device)
+ , m_device(device)
{
if (!m_device)
{
@@ -17,9 +23,33 @@ namespace filesystem
}
}
+ auto inode::metadata() const -> inode_metadata
+ {
+ auto meta = inode_metadata{};
+ meta.kind = m_kind;
+
+ if (is_device())
+ {
+ meta.major = m_device->major();
+ meta.minor = m_device->minor();
+ }
+
+ return meta;
+ }
+
+ auto inode::is_directory() const -> bool
+ {
+ return m_kind == inode_kind::directory;
+ }
+
+ auto inode::is_regular() const -> bool
+ {
+ return m_kind == inode_kind::regular;
+ }
+
auto inode::is_device() const -> bool
{
- return m_device != nullptr;
+ return m_kind == inode_kind::device;
}
auto inode::is_block_device() const -> bool