Move VFS sources into Kernel/.

Kernel/Console.h

@@ -2,7 +2,7 @@
 
 #include <AK/Compiler.h>
 #include <AK/Vector.h>
-#include <VirtualFileSystem/CharacterDevice.h>
+#include <Kernel/CharacterDevice.h>
 
 class ConsoleImplementation {
 public:

Kernel/FIFO.h

@@ -3,7 +3,7 @@
 #include "DoubleBuffer.h"
 #include <AK/Retainable.h>
 #include <AK/RetainPtr.h>
-#include <VirtualFileSystem/UnixTypes.h>
+#include <Kernel/UnixTypes.h>
 
 class FIFO : public Retainable<FIFO> {
 public:

Kernel/GUIEventDevice.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <VirtualFileSystem/CharacterDevice.h>
+#include <Kernel/CharacterDevice.h>
 
 class GUIEventDevice final : public CharacterDevice {
 public:

Kernel/IDEDiskDevice.h

@@ -2,7 +2,7 @@
 
 #include <AK/Lock.h>
 #include <AK/RetainPtr.h>
-#include <VirtualFileSystem/DiskDevice.h>
+#include <Kernel/DiskDevice.h>
 #include "IRQHandler.h"
 
 class IDEDiskDevice final : public IRQHandler, public DiskDevice {

Kernel/Keyboard.h

@@ -3,7 +3,7 @@
 #include <AK/Types.h>
 #include <AK/DoublyLinkedList.h>
 #include <AK/CircularQueue.h>
-#include <VirtualFileSystem/CharacterDevice.h>
+#include <Kernel/CharacterDevice.h>
 #include "IRQHandler.h"
 
 class KeyboardClient;

Kernel/Makefile

@@ -33,18 +33,18 @@ KERNEL_OBJS = \
        GUIEventDevice.o
 
 VFS_OBJS = \
-    ../VirtualFileSystem/DiskDevice.o \
+    DiskDevice.o \
-    ../VirtualFileSystem/CharacterDevice.o \
+    CharacterDevice.o \
-    ../VirtualFileSystem/NullDevice.o \
+    NullDevice.o \
-    ../VirtualFileSystem/FullDevice.o \
+    FullDevice.o \
-    ../VirtualFileSystem/ZeroDevice.o \
+    ZeroDevice.o \
-    ../VirtualFileSystem/RandomDevice.o \
+    RandomDevice.o \
-    ../VirtualFileSystem/FileSystem.o \
+    FileSystem.o \
-    ../VirtualFileSystem/DiskBackedFileSystem.o \
+    DiskBackedFileSystem.o \
-    ../VirtualFileSystem/Ext2FileSystem.o \
+    Ext2FileSystem.o \
-    ../VirtualFileSystem/VirtualFileSystem.o \
+    VirtualFileSystem.o \
-    ../VirtualFileSystem/FileDescriptor.o \
+    FileDescriptor.o \
-    ../VirtualFileSystem/SyntheticFileSystem.o
+    SyntheticFileSystem.o
 
 SHAREDGRAPHICS_OBJS = \
     ../SharedGraphics/Rect.o \

Kernel/MasterPTY.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <VirtualFileSystem/CharacterDevice.h>
+#include <Kernel/CharacterDevice.h>
 #include "DoubleBuffer.h"
 
 class SlavePTY;

Kernel/MemoryManager.h

@@ -9,7 +9,7 @@
 #include <AK/Vector.h>
 #include <AK/HashTable.h>
 #include <AK/AKString.h>
-#include <VirtualFileSystem/VirtualFileSystem.h>
+#include <Kernel/VirtualFileSystem.h>
 
 #define PAGE_ROUND_UP(x) ((((dword)(x)) + PAGE_SIZE-1) & (~(PAGE_SIZE-1)))
 

Kernel/PS2MouseDevice.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <VirtualFileSystem/CharacterDevice.h>
+#include <Kernel/CharacterDevice.h>
 #include "IRQHandler.h"
 
 class PS2MouseDevice final : public IRQHandler, public CharacterDevice {

Kernel/PTYMultiplexer.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <VirtualFileSystem/CharacterDevice.h>
+#include <Kernel/CharacterDevice.h>
 #include <AK/Lock.h>
 
 class MasterPTY;

Kernel/ProcFileSystem.cpp

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

Kernel/ProcFileSystem.h

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

Kernel/Process.cpp

@@ -4,8 +4,8 @@
 #include "StdLib.h"
 #include "i386.h"
 #include "system.h"
-#include <VirtualFileSystem/FileDescriptor.h>
+#include <Kernel/FileDescriptor.h>
-#include <VirtualFileSystem/VirtualFileSystem.h>
+#include <Kernel/VirtualFileSystem.h>
 #include "ELFLoader.h"
 #include "MemoryManager.h"
 #include "i8253.h"

Kernel/Process.h

@@ -6,8 +6,8 @@
 #include "TTY.h"
 #include "Syscall.h"
 #include "GUITypes.h"
-#include <VirtualFileSystem/VirtualFileSystem.h>
+#include <Kernel/VirtualFileSystem.h>
-#include <VirtualFileSystem/UnixTypes.h>
+#include <Kernel/UnixTypes.h>
 #include <AK/InlineLinkedList.h>
 #include <AK/AKString.h>
 #include <AK/Vector.h>

Kernel/TTY.h

@@ -1,8 +1,8 @@
 #pragma once
 
 #include "DoubleBuffer.h"
-#include <VirtualFileSystem/CharacterDevice.h>
+#include <Kernel/CharacterDevice.h>
-#include <VirtualFileSystem/UnixTypes.h>
+#include <Kernel/UnixTypes.h>
 
 class Process;
 

Kernel/init.cpp

@@ -9,12 +9,12 @@
 #include "CMOS.h"
 #include "IDEDiskDevice.h"
 #include "KSyms.h"
-#include <VirtualFileSystem/NullDevice.h>
+#include <Kernel/NullDevice.h>
-#include <VirtualFileSystem/ZeroDevice.h>
+#include <Kernel/ZeroDevice.h>
-#include <VirtualFileSystem/FullDevice.h>
+#include <Kernel/FullDevice.h>
-#include <VirtualFileSystem/RandomDevice.h>
+#include <Kernel/RandomDevice.h>
-#include <VirtualFileSystem/Ext2FileSystem.h>
+#include <Kernel/Ext2FileSystem.h>
-#include <VirtualFileSystem/VirtualFileSystem.h>
+#include <Kernel/VirtualFileSystem.h>
 #include "GUIEventDevice.h"
 #include "MemoryManager.h"
 #include "ProcFileSystem.h"

VirtualFileSystem/.gitignore

@@ -1,2 +0,0 @@
-*.o
-*.swp