renaming

2 files changed, 17 insertions, 16 deletions

diff --git a/kernel/include/kernel/filesystem/vfs.hpp b/kernel/include/kernel/filesystem/vfs.hpp
index 8515af0..7e2eae7 100644
--- a/kernel/include/kernel/filesystem/vfs.hpp
+++ b/kernel/include/kernel/filesystem/vfs.hpp
@@ -94,8 +94,9 @@ namespace kernel::filesystem
     [[nodiscard]] auto resolve_path(std::string_view path) -> kstd::shared_ptr<dentry>;
     [[nodiscard]] auto find_mount(std::string_view path) -> kstd::shared_ptr<mount>;
 
-    auto do_mount_internal(kstd::shared_ptr<dentry> const & target_dentry, kstd::shared_ptr<mount> const & target_mount,
-                           kstd::shared_ptr<filesystem> const & fs) -> void;
+    auto do_mount_internal(kstd::shared_ptr<dentry> const & mount_point_dentry,
+                           kstd::shared_ptr<mount> const & parent_mount, kstd::shared_ptr<filesystem> const & fs)
+        -> void;
 
     auto graft_persistent_device_fs(kstd::shared_ptr<devfs::filesystem> const & device_fs) -> void;
 
diff --git a/kernel/src/filesystem/vfs.cpp b/kernel/src/filesystem/vfs.cpp
index 9b0440d..77ae015 100644
--- a/kernel/src/filesystem/vfs.cpp
+++ b/kernel/src/filesystem/vfs.cpp
@@ -54,9 +54,9 @@ namespace kernel::filesystem
     auto device_fs = kstd::make_shared<devfs::filesystem>();
     device_fs->mount(nullptr);
 
-    if (auto dev_target_dentry = resolve_path("/dev"))
+    if (auto dev_mount_point_dentry = resolve_path("/dev"))
     {
-      do_mount_internal(dev_target_dentry, root_mount, device_fs);
+      do_mount_internal(dev_mount_point_dentry, root_mount, device_fs);
     }
     else
     {
@@ -99,15 +99,15 @@ namespace kernel::filesystem
       return operation_result::invalid_path;
     }
 
-    auto [target_dentry, target_mount] = resolve_path_internal(target);
+    auto [mount_point_dentry, mount_context] = resolve_path_internal(target);
 
-    if (target_dentry && target_mount)
+    if (mount_point_dentry && mount_context)
     {
       if (auto source_dentry = resolve_path(source))
       {
         if (auto fs = kernel::filesystem::filesystem::probe_and_mount(source_dentry->get_inode()))
         {
-          do_mount_internal(target_dentry, target_mount, fs);
+          do_mount_internal(mount_point_dentry, mount_context, fs);
           return operation_result::success;
         }
         return operation_result::invalid_filesystem;
@@ -138,26 +138,26 @@ namespace kernel::filesystem
     return operation_result::mount_point_not_found;
   }
 
-  auto vfs::do_mount_internal(kstd::shared_ptr<dentry> const & target_dentry,
-                              kstd::shared_ptr<mount> const & target_mount, kstd::shared_ptr<filesystem> const & fs)
+  auto vfs::do_mount_internal(kstd::shared_ptr<dentry> const & mount_point_dentry,
+                              kstd::shared_ptr<mount> const & parent_mount, kstd::shared_ptr<filesystem> const & fs)
       -> void
   {
     auto new_fs_root =
-        kstd::make_shared<dentry>(target_dentry->get_parent(), fs->root_inode(), target_dentry->get_name());
-    auto new_mount = kstd::make_shared<mount>(target_dentry, new_fs_root, fs, target_mount);
+        kstd::make_shared<dentry>(mount_point_dentry->get_parent(), fs->root_inode(), mount_point_dentry->get_name());
+    auto new_mount = kstd::make_shared<mount>(mount_point_dentry, new_fs_root, fs, parent_mount);
     m_mount_table.add_mount(new_mount);
   }
 
   auto vfs::graft_persistent_device_fs(kstd::shared_ptr<devfs::filesystem> const & device_fs) -> void
   {
-    auto [new_root_dentry, root_mount] = resolve_path_internal("/");
-    if (new_root_dentry && root_mount)
+    auto [root_mount_point_dentry, root_mount] = resolve_path_internal("/");
+    if (root_mount_point_dentry && root_mount)
     {
-      auto dev_dentry = new_root_dentry->find_child("dev");
+      auto dev_dentry = root_mount_point_dentry->find_child("dev");
       if (!dev_dentry)
       {
-        dev_dentry = kstd::make_shared<dentry>(new_root_dentry, device_fs->root_inode(), "dev");
-        new_root_dentry->add_child(dev_dentry);
+        dev_dentry = kstd::make_shared<dentry>(root_mount_point_dentry, device_fs->root_inode(), "dev");
+        root_mount_point_dentry->add_child(dev_dentry);
       }
 
       do_mount_internal(dev_dentry, root_mount, device_fs);