Kernel: Move FS-related files into Kernel/FileSystem/

Kernel/FileDescriptor.cpp

@@ -1,5 +1,5 @@
 #include "FileDescriptor.h"
-#include "FileSystem.h"
+#include <Kernel/FileSystem/FileSystem.h>
 #include "CharacterDevice.h"
 #include <LibC/errno_numbers.h>
 #include "UnixTypes.h"

Kernel/FileDescriptor.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "VirtualFileSystem.h"
-#include "InodeMetadata.h"
+#include <Kernel/FileSystem/VirtualFileSystem.h>
+#include <Kernel/FileSystem/InodeMetadata.h>
 #include "FIFO.h"
 #include <AK/ByteBuffer.h>
 #include <AK/CircularQueue.h>

Kernel/FileSystem/DevPtsFS.cpp

@@ -1,6 +1,6 @@
-#include <Kernel/DevPtsFS.h>
+#include <Kernel/FileSystem/DevPtsFS.h>
 #include <Kernel/SlavePTY.h>
-#include <Kernel/VirtualFileSystem.h>
+#include <Kernel/FileSystem/VirtualFileSystem.h>
 #include <AK/StringBuilder.h>
 
 static DevPtsFS* s_the;

Kernel/FileSystem/DevPtsFS.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <AK/Types.h>
-#include <Kernel/SyntheticFileSystem.h>
+#include <Kernel/FileSystem/SyntheticFileSystem.h>
 
 class Process;
 class SlavePTY;

Kernel/FileSystem/ProcFS.cpp

@@ -1,6 +1,6 @@
 #include "ProcFS.h"
 #include "Process.h"
-#include <Kernel/VirtualFileSystem.h>
+#include <Kernel/FileSystem/VirtualFileSystem.h>
 #include "system.h"
 #include "MemoryManager.h"
 #include "StdLib.h"

Kernel/FileSystem/ProcFS.h

@@ -2,7 +2,7 @@
 
 #include <Kernel/Lock.h>
 #include <AK/Types.h>
-#include <Kernel/FileSystem.h>
+#include <Kernel/FileSystem/FileSystem.h>
 
 class Process;
 

Kernel/FileSystem/SyntheticFileSystem.cpp

@@ -1,5 +1,5 @@
-#include "SyntheticFileSystem.h"
-#include "FileDescriptor.h"
+#include <Kernel/FileSystem/SyntheticFileSystem.h>
+#include <Kernel/FileDescriptor.h>
 #include <LibC/errno_numbers.h>
 #include <AK/StdLibExtras.h>
 

Kernel/LocalSocket.cpp

@@ -1,7 +1,7 @@
 #include <Kernel/LocalSocket.h>
 #include <Kernel/UnixTypes.h>
 #include <Kernel/Process.h>
-#include <Kernel/VirtualFileSystem.h>
+#include <Kernel/FileSystem/VirtualFileSystem.h>
 #include <LibC/errno_numbers.h>
 
 //#define DEBUG_LOCAL_SOCKET

Kernel/Makefile

@@ -15,7 +15,6 @@ KERNEL_OBJS = \
        Console.o \
        IRQHandler.o \
        kprintf.o \
-       ProcFS.o \
        RTC.o \
        TTY.o \
        PTYMultiplexer.o \
@@ -28,7 +27,7 @@ KERNEL_OBJS = \
        ELFImage.o \
        ELFLoader.o \
        KSyms.o \
-       DevPtsFS.o \
+       FileSystem/DevPtsFS.o \
        BXVGADevice.o \
        PCI.o \
        PS2MouseDevice.o \
@@ -44,6 +43,7 @@ KERNEL_OBJS = \
        Net/NetworkTask.o
 
 VFS_OBJS = \
+    FileSystem/ProcFS.o \
     DiskDevice.o \
     Device.o \
     CharacterDevice.o \
@@ -52,12 +52,12 @@ VFS_OBJS = \
     FullDevice.o \
     ZeroDevice.o \
     RandomDevice.o \
-    FileSystem.o \
-    DiskBackedFileSystem.o \
-    Ext2FileSystem.o \
-    VirtualFileSystem.o \
+    FileSystem/FileSystem.o \
+    FileSystem/DiskBackedFileSystem.o \
+    FileSystem/Ext2FileSystem.o \
+    FileSystem/VirtualFileSystem.o \
     FileDescriptor.o \
-    SyntheticFileSystem.o
+    FileSystem/SyntheticFileSystem.o
 
 AK_OBJS = \
     ../AK/String.o \

Kernel/MemoryManager.h

@@ -11,7 +11,7 @@
 #include <AK/AKString.h>
 #include <AK/Badge.h>
 #include <AK/Weakable.h>
-#include <Kernel/VirtualFileSystem.h>
+#include <Kernel/FileSystem/VirtualFileSystem.h>
 
 #define PAGE_ROUND_UP(x) ((((dword)(x)) + PAGE_SIZE-1) & (~(PAGE_SIZE-1)))
 

Kernel/Process.cpp

@@ -5,7 +5,7 @@
 #include "i386.h"
 #include "system.h"
 #include <Kernel/FileDescriptor.h>
-#include <Kernel/VirtualFileSystem.h>
+#include <Kernel/FileSystem/VirtualFileSystem.h>
 #include <Kernel/NullDevice.h>
 #include "ELFLoader.h"
 #include "MemoryManager.h"

Kernel/Process.h

@@ -3,7 +3,7 @@
 #include "types.h"
 #include "TTY.h"
 #include "Syscall.h"
-#include <Kernel/VirtualFileSystem.h>
+#include <Kernel/FileSystem/VirtualFileSystem.h>
 #include <Kernel/UnixTypes.h>
 #include <AK/InlineLinkedList.h>
 #include <AK/AKString.h>

Kernel/SlavePTY.cpp

@@ -1,6 +1,6 @@
 #include "SlavePTY.h"
 #include "MasterPTY.h"
-#include "DevPtsFS.h"
+#include <Kernel/FileSystem/DevPtsFS.h>
 #include <Kernel/Process.h>
 
 //#define SLAVEPTY_DEBUG

Kernel/init.cpp

@@ -12,16 +12,16 @@
 #include <Kernel/ZeroDevice.h>
 #include <Kernel/FullDevice.h>
 #include <Kernel/RandomDevice.h>
-#include <Kernel/Ext2FileSystem.h>
-#include <Kernel/VirtualFileSystem.h>
+#include <Kernel/FileSystem/Ext2FileSystem.h>
+#include <Kernel/FileSystem/VirtualFileSystem.h>
 #include "MemoryManager.h"
-#include "ProcFS.h"
+#include <Kernel/FileSystem/ProcFS.h>
 #include "RTC.h"
 #include "VirtualConsole.h"
 #include "Scheduler.h"
 #include "PS2MouseDevice.h"
 #include "PTYMultiplexer.h"
-#include "DevPtsFS.h"
+#include <Kernel/FileSystem/DevPtsFS.h>
 #include "BXVGADevice.h"
 #include <Kernel/Net/E1000NetworkAdapter.h>
 #include <Kernel/Net/NetworkTask.h>

Kernel/sync.sh

@@ -94,5 +94,6 @@ cp -v ../Servers/LookupServer/LookupServer mnt/bin/LookupServer
 cp -v ../Servers/WindowServer/WindowServer mnt/bin/WindowServer
 cp -v kernel.map mnt/
 sh sync-local.sh
+sync
 umount mnt
 sync