From 60a32ab7238336becedfa68929bc0937745a38b0 Mon Sep 17 00:00:00 2001
From: Marek Ledworowski <fotelpl@gmail.com>
Date: Mon, 27 Oct 2025 00:09:27 +0100
Subject: [PATCH] moar

---
 src/core/file_sys/fs.cpp                        |  1 -
 src/core/libraries/app_content/app_content.cpp  |  2 --
 src/core/libraries/avplayer/avplayer_source.cpp | 10 +++++-----
 src/core/libraries/kernel/process.cpp           | 10 +++++-----
 src/core/libraries/save_data/save_instance.h    |  3 ---
 5 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/src/core/file_sys/fs.cpp b/src/core/file_sys/fs.cpp
index 96bb6af81..7b8902086 100644
--- a/src/core/file_sys/fs.cpp
+++ b/src/core/file_sys/fs.cpp
@@ -5,7 +5,6 @@
 #include "common/config.h"
 #include "common/string_util.h"
 #include "core/file_sys/devices/logger.h"
-#include "core/file_sys/devices/nop_device.h"
 #include "core/file_sys/fs.h"
 
 namespace Core::FileSys {
diff --git a/src/core/libraries/app_content/app_content.cpp b/src/core/libraries/app_content/app_content.cpp
index ccf228f73..fd1918bf8 100644
--- a/src/core/libraries/app_content/app_content.cpp
+++ b/src/core/libraries/app_content/app_content.cpp
@@ -9,7 +9,6 @@
 #include "common/logging/log.h"
 #include "common/singleton.h"
 #include "core/file_format/psf.h"
-#include "core/file_sys/fs.h"
 #include "core/libraries/app_content/app_content_error.h"
 #include "core/libraries/libs.h"
 #include "core/libraries/system/systemservice.h"
@@ -63,7 +62,6 @@ int PS4_SYSV_ABI sceAppContentAddcontMount(u32 service_label,
     LOG_INFO(Lib_AppContent, "called");
 
     const auto& addon_path = Config::getAddonInstallDir() / title_id;
-    auto* mnt = Common::Singleton<Core::FileSys::MntPoints>::Instance();
 
     // Determine which loaded additional content this entitlement label is for.
     s32 i = 0;
diff --git a/src/core/libraries/avplayer/avplayer_source.cpp b/src/core/libraries/avplayer/avplayer_source.cpp
index cf783403c..77a92a884 100644
--- a/src/core/libraries/avplayer/avplayer_source.cpp
+++ b/src/core/libraries/avplayer/avplayer_source.cpp
@@ -4,7 +4,7 @@
 #include "common/alignment.h"
 #include "common/singleton.h"
 #include "common/thread.h"
-#include "core/file_sys/fs.h"
+#include "core/file_sys/quasifs/quasifs.h"
 #include "core/libraries/avplayer/avplayer_file_streamer.h"
 #include "core/libraries/avplayer/avplayer_source.h"
 
@@ -45,10 +45,10 @@ bool AvPlayerSource::Init(const SceAvPlayerInitData& init_data, std::string_view
             return false;
         }
     } else {
-        const auto mnt = Common::Singleton<Core::FileSys::MntPoints>::Instance();
-        const auto filepath = mnt->GetHostPath(path);
-        if (AVPLAYER_IS_ERROR(
-                avformat_open_input(&context, filepath.string().c_str(), nullptr, nullptr))) {
+        auto qfs = Common::Singleton<QuasiFS::QFS>::Instance();
+        std::filesystem::path filepath{};
+        qfs->GetHostPath(filepath, path);
+        if (AVPLAYER_IS_ERROR(avformat_open_input(&context, filepath.c_str(), nullptr, nullptr))) {
             return false;
         }
     }
diff --git a/src/core/libraries/kernel/process.cpp b/src/core/libraries/kernel/process.cpp
index 0e168e43a..3cfb1e670 100644
--- a/src/core/libraries/kernel/process.cpp
+++ b/src/core/libraries/kernel/process.cpp
@@ -4,7 +4,7 @@
 #include "common/config.h"
 #include "common/elf_info.h"
 #include "common/logging/log.h"
-#include "core/file_sys/fs.h"
+#include "core/file_sys/quasifs/quasifs.h"
 #include "core/libraries/kernel/orbis_error.h"
 #include "core/libraries/kernel/process.h"
 #include "core/libraries/libs.h"
@@ -41,7 +41,7 @@ s32 PS4_SYSV_ABI sceKernelLoadStartModule(const char* moduleFileName, u64 args,
     LOG_INFO(Lib_Kernel, "called filename = {}, args = {}", moduleFileName, args);
     ASSERT(flags == 0);
 
-    auto* mnt = Common::Singleton<Core::FileSys::MntPoints>::Instance();
+    QuasiFS::QFS* qfs = Common::Singleton<QuasiFS::QFS>::Instance();
     auto* linker = Common::Singleton<Core::Linker>::Instance();
 
     std::filesystem::path path;
@@ -52,13 +52,13 @@ s32 PS4_SYSV_ABI sceKernelLoadStartModule(const char* moduleFileName, u64 args,
     if (guest_path[0] == '/') {
         // try load /system/common/lib/ +path
         // try load /system/priv/lib/   +path
-        path = mnt->GetHostPath(guest_path);
+        qfs->GetHostPath(path, guest_path);
         handle = linker->LoadAndStartModule(path, args, argp, pRes);
         if (handle != -1)
             return handle;
     } else {
         if (!guest_path.contains('/')) {
-            path = mnt->GetHostPath("/app0/" + guest_path);
+            qfs->GetHostPath(path, "/app0/" + guest_path);
             handle = linker->LoadAndStartModule(path, args, argp, pRes);
             if (handle != -1)
                 return handle;
@@ -66,7 +66,7 @@ s32 PS4_SYSV_ABI sceKernelLoadStartModule(const char* moduleFileName, u64 args,
             //  try load /system/priv/lib/   +basename
             //  try load /system/common/lib/ +basename
         } else {
-            path = mnt->GetHostPath(guest_path);
+            qfs->GetHostPath(path, guest_path);
             handle = linker->LoadAndStartModule(path, args, argp, pRes);
             if (handle != -1)
                 return handle;
diff --git a/src/core/libraries/save_data/save_instance.h b/src/core/libraries/save_data/save_instance.h
index 6e7ac8f66..50e33ff6a 100644
--- a/src/core/libraries/save_data/save_instance.h
+++ b/src/core/libraries/save_data/save_instance.h
@@ -8,9 +8,6 @@
 #include "common/io_file.h"
 #include "core/file_format/psf.h"
 
-namespace Core::FileSys {
-class MntPoints;
-}
 
 namespace Libraries::SaveData {