Revert LibHac update

Users are facing save destruction on failing extra data update apparently

5 files changed, 74 insertions, 117 deletions

diff --git a/Ryujinx.HLE/HOS/Services/Fs/FileSystemProxy/FileSystemProxyHelper.cs b/Ryujinx.HLE/HOS/Services/Fs/FileSystemProxy/FileSystemProxyHelper.cs
index 1b6c84c3..7774af23 100644
--- a/Ryujinx.HLE/HOS/Services/Fs/FileSystemProxy/FileSystemProxyHelper.cs
+++ b/Ryujinx.HLE/HOS/Services/Fs/FileSystemProxy/FileSystemProxyHelper.cs
@@ -1,16 +1,10 @@
 using LibHac;
 using LibHac.Common;
-using LibHac.Common.Keys;
 using LibHac.Fs;
-using LibHac.FsSrv.Impl;
-using LibHac.FsSrv.Sf;
 using LibHac.FsSystem;
 using LibHac.FsSystem.NcaUtils;
 using LibHac.Spl;
-using System;
 using System.IO;
-using System.Runtime.InteropServices;
-using Path = System.IO.Path;
 
 namespace Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy
 {
@@ -22,12 +16,12 @@ namespace Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy
 
             try
             {
-                LocalStorage storage = new LocalStorage(pfsPath, FileAccess.Read, FileMode.Open);
-                ReferenceCountedDisposable<LibHac.Fs.Fsa.IFileSystem> nsp = new(new PartitionFileSystem(storage));
+                LocalStorage        storage = new LocalStorage(pfsPath, FileAccess.Read, FileMode.Open);
+                PartitionFileSystem nsp     = new PartitionFileSystem(storage);
 
-                ImportTitleKeysFromNsp(nsp.Target, context.Device.System.KeySet);
+                ImportTitleKeysFromNsp(nsp, context.Device.System.KeySet);
 
-                openedFileSystem = new IFileSystem(FileSystemInterfaceAdapter.CreateShared(ref nsp));
+                openedFileSystem = new IFileSystem(nsp);
             }
             catch (HorizonResultException ex)
             {
@@ -51,9 +45,8 @@ namespace Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy
                 }
 
                 LibHac.Fs.Fsa.IFileSystem fileSystem = nca.OpenFileSystem(NcaSectionType.Data, context.Device.System.FsIntegrityCheckLevel);
-                var sharedFs = new ReferenceCountedDisposable<LibHac.Fs.Fsa.IFileSystem>(fileSystem);
 
-                openedFileSystem = new IFileSystem(FileSystemInterfaceAdapter.CreateShared(ref sharedFs));
+                openedFileSystem = new IFileSystem(fileSystem);
             }
             catch (HorizonResultException ex)
             {
@@ -106,7 +99,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy
             return ResultCode.PathDoesNotExist;
         }
 
-        public static void ImportTitleKeysFromNsp(LibHac.Fs.Fsa.IFileSystem nsp, KeySet keySet)
+        public static void ImportTitleKeysFromNsp(LibHac.Fs.Fsa.IFileSystem nsp, Keyset keySet)
         {
             foreach (DirectoryEntryEx ticketEntry in nsp.EnumerateEntries("/", "*.tik"))
             {
@@ -132,27 +125,5 @@ namespace Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy
 
             return FsPath.FromSpan(out path, pathBytes);
         }
-
-        public static ref readonly FspPath GetFspPath(ServiceCtx context, int index = 0)
-        {
-            ulong position = (ulong)context.Request.PtrBuff[index].Position;
-            ulong size = (ulong)context.Request.PtrBuff[index].Size;
-
-            ReadOnlySpan<byte> buffer = context.Memory.GetSpan(position, (int)size);
-            ReadOnlySpan<FspPath> fspBuffer = MemoryMarshal.Cast<byte, FspPath>(buffer);
-
-            return ref fspBuffer[0];
-        }
-
-        public static ref readonly LibHac.FsSrv.Sf.Path GetSfPath(ServiceCtx context, int index = 0)
-        {
-            ulong position = (ulong)context.Request.PtrBuff[index].Position;
-            ulong size = (ulong)context.Request.PtrBuff[index].Size;
-
-            ReadOnlySpan<byte> buffer = context.Memory.GetSpan(position, (int)size);
-            ReadOnlySpan<LibHac.FsSrv.Sf.Path> pathBuffer = MemoryMarshal.Cast<byte, LibHac.FsSrv.Sf.Path>(buffer);
-
-            return ref pathBuffer[0];
-        }
     }
 }
diff --git a/Ryujinx.HLE/HOS/Services/Fs/FileSystemProxy/IDirectory.cs b/Ryujinx.HLE/HOS/Services/Fs/FileSystemProxy/IDirectory.cs
index 99e545b1..565ddc4c 100644
--- a/Ryujinx.HLE/HOS/Services/Fs/FileSystemProxy/IDirectory.cs
+++ b/Ryujinx.HLE/HOS/Services/Fs/FileSystemProxy/IDirectory.cs
@@ -1,13 +1,15 @@
 using LibHac;
-using LibHac.Sf;
+using LibHac.Fs;
+using System;
+using System.Runtime.InteropServices;
 
 namespace Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy
 {
-    class IDirectory : DisposableIpcService
+    class IDirectory : IpcService
     {
-        private ReferenceCountedDisposable<LibHac.FsSrv.Sf.IDirectory> _baseDirectory;
+        private LibHac.Fs.Fsa.IDirectory _baseDirectory;
 
-        public IDirectory(ReferenceCountedDisposable<LibHac.FsSrv.Sf.IDirectory> directory)
+        public IDirectory(LibHac.Fs.Fsa.IDirectory directory)
         {
             _baseDirectory = directory;
         }
@@ -17,13 +19,14 @@ namespace Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy
         public ResultCode Read(ServiceCtx context)
         {
             ulong bufferPosition = context.Request.ReceiveBuff[0].Position;
-            ulong bufferLen = context.Request.ReceiveBuff[0].Size;
+            ulong bufferLen      = context.Request.ReceiveBuff[0].Size;
 
-            byte[] entryBuffer = new byte[bufferLen];
+            byte[]               entriesBytes = new byte[bufferLen];
+            Span<DirectoryEntry> entries      = MemoryMarshal.Cast<byte, DirectoryEntry>(entriesBytes);
 
-            Result result = _baseDirectory.Target.Read(out long entriesRead, new OutBuffer(entryBuffer));
+            Result result = _baseDirectory.Read(out long entriesRead, entries);
 
-            context.Memory.Write(bufferPosition, entryBuffer);
+            context.Memory.Write(bufferPosition, entriesBytes);
             context.ResponseData.Write(entriesRead);
 
             return (ResultCode)result.Value;
@@ -33,19 +36,11 @@ namespace Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy
         // GetEntryCount() -> u64
         public ResultCode GetEntryCount(ServiceCtx context)
         {
-            Result result = _baseDirectory.Target.GetEntryCount(out long entryCount);
+            Result result = _baseDirectory.GetEntryCount(out long entryCount);
 
             context.ResponseData.Write(entryCount);
 
             return (ResultCode)result.Value;
         }
-
-        protected override void Dispose(bool isDisposing)
-        {
-            if (isDisposing)
-            {
-                _baseDirectory?.Dispose();
-            }
-        }
     }
 }
diff --git a/Ryujinx.HLE/HOS/Services/Fs/FileSystemProxy/IFile.cs b/Ryujinx.HLE/HOS/Services/Fs/FileSystemProxy/IFile.cs
index 3a94a2a7..cf1611e7 100644
--- a/Ryujinx.HLE/HOS/Services/Fs/FileSystemProxy/IFile.cs
+++ b/Ryujinx.HLE/HOS/Services/Fs/FileSystemProxy/IFile.cs
@@ -1,15 +1,13 @@
 using LibHac;
 using LibHac.Fs;
-using LibHac.Sf;
-using Ryujinx.Common;
 
 namespace Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy
 {
     class IFile : DisposableIpcService
     {
-        private ReferenceCountedDisposable<LibHac.FsSrv.Sf.IFile> _baseFile;
+        private LibHac.Fs.Fsa.IFile _baseFile;
 
-        public IFile(ReferenceCountedDisposable<LibHac.FsSrv.Sf.IFile> baseFile)
+        public IFile(LibHac.Fs.Fsa.IFile baseFile)
         {
             _baseFile = baseFile;
         }
@@ -20,15 +18,15 @@ namespace Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy
         {
             ulong position = context.Request.ReceiveBuff[0].Position;
 
-            ReadOption readOption = context.RequestData.ReadStruct<ReadOption>();
+            ReadOption readOption = new ReadOption(context.RequestData.ReadInt32());
             context.RequestData.BaseStream.Position += 4;
 
             long offset = context.RequestData.ReadInt64();
             long size   = context.RequestData.ReadInt64();
 
-            byte[] data = new byte[context.Request.ReceiveBuff[0].Size];
+            byte[] data = new byte[size];
 
-            Result result = _baseFile.Target.Read(out long bytesRead, offset, new OutBuffer(data), size, readOption);
+            Result result = _baseFile.Read(out long bytesRead, offset, data, readOption);
 
             context.Memory.Write(position, data);
 
@@ -43,24 +41,24 @@ namespace Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy
         {
             ulong position = context.Request.SendBuff[0].Position;
 
-            WriteOption writeOption = context.RequestData.ReadStruct<WriteOption>();
+            WriteOption writeOption = new WriteOption(context.RequestData.ReadInt32());
             context.RequestData.BaseStream.Position += 4;
 
             long offset = context.RequestData.ReadInt64();
             long size   = context.RequestData.ReadInt64();
 
-            byte[] data = new byte[context.Request.SendBuff[0].Size];
+            byte[] data = new byte[size];
 
             context.Memory.Read(position, data);
 
-            return (ResultCode)_baseFile.Target.Write(offset, new InBuffer(data), size, writeOption).Value;
+            return (ResultCode)_baseFile.Write(offset, data, writeOption).Value;
         }
 
         [CommandHipc(2)]
         // Flush()
         public ResultCode Flush(ServiceCtx context)
         {
-            return (ResultCode)_baseFile.Target.Flush().Value;
+            return (ResultCode)_baseFile.Flush().Value;
         }
 
         [CommandHipc(3)]
@@ -69,14 +67,14 @@ namespace Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy
         {
             long size = context.RequestData.ReadInt64();
 
-            return (ResultCode)_baseFile.Target.SetSize(size).Value;
+            return (ResultCode)_baseFile.SetSize(size).Value;
         }
 
         [CommandHipc(4)]
         // GetSize() -> u64 fileSize
         public ResultCode GetSize(ServiceCtx context)
         {
-            Result result = _baseFile.Target.GetSize(out long size);
+            Result result = _baseFile.GetSize(out long size);
 
             context.ResponseData.Write(size);
 
diff --git a/Ryujinx.HLE/HOS/Services/Fs/FileSystemProxy/IFileSystem.cs b/Ryujinx.HLE/HOS/Services/Fs/FileSystemProxy/IFileSystem.cs
index b9b4266d..5aa26258 100644
--- a/Ryujinx.HLE/HOS/Services/Fs/FileSystemProxy/IFileSystem.cs
+++ b/Ryujinx.HLE/HOS/Services/Fs/FileSystemProxy/IFileSystem.cs
@@ -1,19 +1,21 @@
 using LibHac;
+using LibHac.Common;
 using LibHac.Fs;
-using LibHac.FsSrv.Sf;
+using LibHac.Fs.Fsa;
+using static Ryujinx.HLE.Utilities.StringUtils;
 
 namespace Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy
 {
-    class IFileSystem : DisposableIpcService
+    class IFileSystem : IpcService
     {
-        private ReferenceCountedDisposable<LibHac.FsSrv.Sf.IFileSystem> _fileSystem;
+        private LibHac.Fs.Fsa.IFileSystem _fileSystem;
 
-        public IFileSystem(ReferenceCountedDisposable<LibHac.FsSrv.Sf.IFileSystem> provider)
+        public IFileSystem(LibHac.Fs.Fsa.IFileSystem provider)
         {
             _fileSystem = provider;
         }
 
-        public ReferenceCountedDisposable<LibHac.FsSrv.Sf.IFileSystem> GetBaseFileSystem()
+        public LibHac.Fs.Fsa.IFileSystem GetBaseFileSystem()
         {
             return _fileSystem;
         }
@@ -22,79 +24,79 @@ namespace Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy
         // CreateFile(u32 createOption, u64 size, buffer<bytes<0x301>, 0x19, 0x301> path)
         public ResultCode CreateFile(ServiceCtx context)
         {
-            ref readonly Path name = ref FileSystemProxyHelper.GetSfPath(context);
+            U8Span name = ReadUtf8Span(context);
 
-            int createOption = context.RequestData.ReadInt32();
+            CreateFileOptions createOption = (CreateFileOptions)context.RequestData.ReadInt32();
             context.RequestData.BaseStream.Position += 4;
 
             long size = context.RequestData.ReadInt64();
 
-            return (ResultCode)_fileSystem.Target.CreateFile(in name, size, createOption).Value;
+            return (ResultCode)_fileSystem.CreateFile(name, size, createOption).Value;
         }
 
         [CommandHipc(1)]
         // DeleteFile(buffer<bytes<0x301>, 0x19, 0x301> path)
         public ResultCode DeleteFile(ServiceCtx context)
         {
-            ref readonly Path name = ref FileSystemProxyHelper.GetSfPath(context);
+            U8Span name = ReadUtf8Span(context);
 
-            return (ResultCode)_fileSystem.Target.DeleteFile(in name).Value;
+            return (ResultCode)_fileSystem.DeleteFile(name).Value;
         }
 
         [CommandHipc(2)]
         // CreateDirectory(buffer<bytes<0x301>, 0x19, 0x301> path)
         public ResultCode CreateDirectory(ServiceCtx context)
         {
-            ref readonly Path name = ref FileSystemProxyHelper.GetSfPath(context);
+            U8Span name = ReadUtf8Span(context);
 
-            return (ResultCode)_fileSystem.Target.CreateDirectory(in name).Value;
+            return (ResultCode)_fileSystem.CreateDirectory(name).Value;
         }
 
         [CommandHipc(3)]
         // DeleteDirectory(buffer<bytes<0x301>, 0x19, 0x301> path)
         public ResultCode DeleteDirectory(ServiceCtx context)
         {
-            ref readonly Path name = ref FileSystemProxyHelper.GetSfPath(context);
+            U8Span name = ReadUtf8Span(context);
 
-            return (ResultCode)_fileSystem.Target.DeleteDirectory(in name).Value;
+            return (ResultCode)_fileSystem.DeleteDirectory(name).Value;
         }
 
         [CommandHipc(4)]
         // DeleteDirectoryRecursively(buffer<bytes<0x301>, 0x19, 0x301> path)
         public ResultCode DeleteDirectoryRecursively(ServiceCtx context)
         {
-            ref readonly Path name = ref FileSystemProxyHelper.GetSfPath(context);
+            U8Span name = ReadUtf8Span(context);
 
-            return (ResultCode)_fileSystem.Target.DeleteDirectoryRecursively(in name).Value;
+            return (ResultCode)_fileSystem.DeleteDirectoryRecursively(name).Value;
         }
 
         [CommandHipc(5)]
         // RenameFile(buffer<bytes<0x301>, 0x19, 0x301> oldPath, buffer<bytes<0x301>, 0x19, 0x301> newPath)
         public ResultCode RenameFile(ServiceCtx context)
         {
-            ref readonly Path currentName = ref FileSystemProxyHelper.GetSfPath(context, index: 0);
-            ref readonly Path newName = ref FileSystemProxyHelper.GetSfPath(context, index: 1);
+            U8Span oldName = ReadUtf8Span(context, 0);
+            U8Span newName = ReadUtf8Span(context, 1);
 
-            return (ResultCode)_fileSystem.Target.RenameFile(in currentName, in newName).Value;
+            return (ResultCode)_fileSystem.RenameFile(oldName, newName).Value;
         }
 
         [CommandHipc(6)]
         // RenameDirectory(buffer<bytes<0x301>, 0x19, 0x301> oldPath, buffer<bytes<0x301>, 0x19, 0x301> newPath)
         public ResultCode RenameDirectory(ServiceCtx context)
         {
-            ref readonly Path currentName = ref FileSystemProxyHelper.GetSfPath(context, index: 0);
-            ref readonly Path newName = ref FileSystemProxyHelper.GetSfPath(context, index: 1);
+            U8Span oldName = ReadUtf8Span(context, 0);
+            U8Span newName = ReadUtf8Span(context, 1);
 
-            return (ResultCode)_fileSystem.Target.RenameDirectory(in currentName, in newName).Value;
+            return (ResultCode)_fileSystem.RenameDirectory(oldName, newName).Value;
         }
 
         [CommandHipc(7)]
         // GetEntryType(buffer<bytes<0x301>, 0x19, 0x301> path) -> nn::fssrv::sf::DirectoryEntryType
         public ResultCode GetEntryType(ServiceCtx context)
         {
-            ref readonly Path name = ref FileSystemProxyHelper.GetSfPath(context);
+            U8Span name = ReadUtf8Span(context);
 
-            Result result = _fileSystem.Target.GetEntryType(out uint entryType, in name);
+            Result result = _fileSystem.GetEntryType(out DirectoryEntryType entryType, name);
 
             context.ResponseData.Write((int)entryType);
 
@@ -105,11 +107,11 @@ namespace Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy
         // OpenFile(u32 mode, buffer<bytes<0x301>, 0x19, 0x301> path) -> object<nn::fssrv::sf::IFile> file
         public ResultCode OpenFile(ServiceCtx context)
         {
-            uint mode = context.RequestData.ReadUInt32();
+            OpenMode mode = (OpenMode)context.RequestData.ReadInt32();
 
-            ref readonly Path name = ref FileSystemProxyHelper.GetSfPath(context);
+            U8Span name = ReadUtf8Span(context);
 
-            Result result = _fileSystem.Target.OpenFile(out ReferenceCountedDisposable<LibHac.FsSrv.Sf.IFile> file, in name, mode);
+            Result result = _fileSystem.OpenFile(out LibHac.Fs.Fsa.IFile file, name, mode);
 
             if (result.IsSuccess())
             {
@@ -125,11 +127,11 @@ namespace Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy
         // OpenDirectory(u32 filter_flags, buffer<bytes<0x301>, 0x19, 0x301> path) -> object<nn::fssrv::sf::IDirectory> directory
         public ResultCode OpenDirectory(ServiceCtx context)
         {
-            uint mode = context.RequestData.ReadUInt32();
+            OpenDirectoryMode mode = (OpenDirectoryMode)context.RequestData.ReadInt32();
 
-            ref readonly Path name = ref FileSystemProxyHelper.GetSfPath(context);
+            U8Span name = ReadUtf8Span(context);
 
-            Result result = _fileSystem.Target.OpenDirectory(out ReferenceCountedDisposable<LibHac.FsSrv.Sf.IDirectory> dir, name, mode);
+            Result result = _fileSystem.OpenDirectory(out LibHac.Fs.Fsa.IDirectory dir, name, mode);
 
             if (result.IsSuccess())
             {
@@ -145,16 +147,16 @@ namespace Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy
         // Commit()
         public ResultCode Commit(ServiceCtx context)
         {
-            return (ResultCode)_fileSystem.Target.Commit().Value;
+            return (ResultCode)_fileSystem.Commit().Value;
         }
 
         [CommandHipc(11)]
         // GetFreeSpaceSize(buffer<bytes<0x301>, 0x19, 0x301> path) -> u64 totalFreeSpace
         public ResultCode GetFreeSpaceSize(ServiceCtx context)
         {
-            ref readonly Path name = ref FileSystemProxyHelper.GetSfPath(context);
+            U8Span name = ReadUtf8Span(context);
 
-            Result result = _fileSystem.Target.GetFreeSpaceSize(out long size, in name);
+            Result result = _fileSystem.GetFreeSpaceSize(out long size, name);
 
             context.ResponseData.Write(size);
 
@@ -165,9 +167,9 @@ namespace Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy
         // GetTotalSpaceSize(buffer<bytes<0x301>, 0x19, 0x301> path) -> u64 totalSize
         public ResultCode GetTotalSpaceSize(ServiceCtx context)
         {
-            ref readonly Path name = ref FileSystemProxyHelper.GetSfPath(context);
+            U8Span name = ReadUtf8Span(context);
 
-            Result result = _fileSystem.Target.GetTotalSpaceSize(out long size, in name);
+            Result result = _fileSystem.GetTotalSpaceSize(out long size, name);
 
             context.ResponseData.Write(size);
 
@@ -178,18 +180,18 @@ namespace Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy
         // CleanDirectoryRecursively(buffer<bytes<0x301>, 0x19, 0x301> path)
         public ResultCode CleanDirectoryRecursively(ServiceCtx context)
         {
-            ref readonly Path name = ref FileSystemProxyHelper.GetSfPath(context);
+            U8Span name = ReadUtf8Span(context);
 
-            return (ResultCode)_fileSystem.Target.CleanDirectoryRecursively(in name).Value;
+            return (ResultCode)_fileSystem.CleanDirectoryRecursively(name).Value;
         }
 
         [CommandHipc(14)]
         // GetFileTimeStampRaw(buffer<bytes<0x301>, 0x19, 0x301> path) -> bytes<0x20> timestamp
         public ResultCode GetFileTimeStampRaw(ServiceCtx context)
         {
-            ref readonly Path name = ref FileSystemProxyHelper.GetSfPath(context);
+            U8Span name = ReadUtf8Span(context);
 
-            Result result = _fileSystem.Target.GetFileTimeStampRaw(out FileTimeStampRaw timestamp, in name);
+            Result result = _fileSystem.GetFileTimeStampRaw(out FileTimeStampRaw timestamp, name);
 
             context.ResponseData.Write(timestamp.Created);
             context.ResponseData.Write(timestamp.Modified);
@@ -204,13 +206,5 @@ namespace Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy
 
             return (ResultCode)result.Value;
         }
-
-        protected override void Dispose(bool isDisposing)
-        {
-            if (isDisposing)
-            {
-                _fileSystem?.Dispose();
-            }
-        }
     }
 }
\ No newline at end of file
diff --git a/Ryujinx.HLE/HOS/Services/Fs/FileSystemProxy/IStorage.cs b/Ryujinx.HLE/HOS/Services/Fs/FileSystemProxy/IStorage.cs
index 08f5b87b..62a3c62a 100644
--- a/Ryujinx.HLE/HOS/Services/Fs/FileSystemProxy/IStorage.cs
+++ b/Ryujinx.HLE/HOS/Services/Fs/FileSystemProxy/IStorage.cs
@@ -1,14 +1,13 @@
 using LibHac;
-using LibHac.Sf;
 using Ryujinx.HLE.HOS.Ipc;
 
 namespace Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy
 {
     class IStorage : DisposableIpcService
     {
-        private ReferenceCountedDisposable<LibHac.FsSrv.Sf.IStorage> _baseStorage;
+        private LibHac.Fs.IStorage _baseStorage;
 
-        public IStorage(ReferenceCountedDisposable<LibHac.FsSrv.Sf.IStorage> baseStorage)
+        public IStorage(LibHac.Fs.IStorage baseStorage)
         {
             _baseStorage = baseStorage;
         }
@@ -32,7 +31,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy
 
                 byte[] data = new byte[size];
 
-                Result result = _baseStorage.Target.Read((long)offset, new OutBuffer(data), (long)size);
+                Result result = _baseStorage.Read((long)offset, data);
 
                 context.Memory.Write(buffDesc.Position, data);
 
@@ -46,7 +45,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy
         // GetSize() -> u64 size
         public ResultCode GetSize(ServiceCtx context)
         {
-            Result result = _baseStorage.Target.GetSize(out long size);
+            Result result = _baseStorage.GetSize(out long size);
 
             context.ResponseData.Write(size);