aboutsummaryrefslogtreecommitdiff
path: root/kernel/src
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/src')
-rw-r--r--kernel/src/filesystem/device_inode.cpp9
-rw-r--r--kernel/src/filesystem/ext2/ext2_inode.cpp11
-rw-r--r--kernel/src/filesystem/vfs.cpp2
3 files changed, 5 insertions, 17 deletions
diff --git a/kernel/src/filesystem/device_inode.cpp b/kernel/src/filesystem/device_inode.cpp
index 65dd9a3..b9ccd6d 100644
--- a/kernel/src/filesystem/device_inode.cpp
+++ b/kernel/src/filesystem/device_inode.cpp
@@ -21,14 +21,9 @@ namespace filesystem
}
}
- auto device_inode::open_file(kstd::shared_ptr<inode> const & self) const -> kstd::shared_ptr<file>
+ auto device_inode::open_file() -> kstd::shared_ptr<file>
{
- if (!self)
- {
- kapi::system::panic("[FILESYSTEM] device_inode::open_file called with null inode.");
- }
-
- return kstd::make_shared<device_file>(self);
+ return kstd::make_shared<device_file>(shared_from_this());
}
auto device_inode::device() const -> kstd::shared_ptr<devices::device> const &
diff --git a/kernel/src/filesystem/ext2/ext2_inode.cpp b/kernel/src/filesystem/ext2/ext2_inode.cpp
index 0a1994b..0760cb1 100644
--- a/kernel/src/filesystem/ext2/ext2_inode.cpp
+++ b/kernel/src/filesystem/ext2/ext2_inode.cpp
@@ -1,7 +1,5 @@
#include "kernel/filesystem/ext2/ext2_inode.hpp"
-#include "kapi/system.hpp"
-
#include "kernel/filesystem/file.hpp"
#include "kernel/filesystem/inode.hpp"
#include "kernel/filesystem/inode_file.hpp"
@@ -14,13 +12,8 @@ namespace filesystem::ext2
: inode(inode_kind::regular)
{}
- auto ext2_inode::open_file(kstd::shared_ptr<inode> const & self) const -> kstd::shared_ptr<filesystem::file>
+ auto ext2_inode::open_file() -> kstd::shared_ptr<filesystem::file>
{
- if (!self)
- {
- kapi::system::panic("[FILESYSTEM] ext2_inode::open_file called with null inode.");
- }
-
- return kstd::make_shared<inode_file>(self);
+ return kstd::make_shared<inode_file>(shared_from_this());
}
} // namespace filesystem::ext2 \ No newline at end of file
diff --git a/kernel/src/filesystem/vfs.cpp b/kernel/src/filesystem/vfs.cpp
index 5330b82..2316de0 100644
--- a/kernel/src/filesystem/vfs.cpp
+++ b/kernel/src/filesystem/vfs.cpp
@@ -70,7 +70,7 @@ namespace filesystem
{
auto node = custody->get_inode();
- if (auto opened_file = node->open_file(node))
+ if (auto opened_file = node->open_file())
{
return kstd::make_shared<open_file_description>(opened_file);
}