summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Kernel/FileDescriptor.cpp2
-rw-r--r--Kernel/FileDescriptor.h4
-rw-r--r--Kernel/FileSystem/DevPtsFS.cpp (renamed from Kernel/DevPtsFS.cpp)4
-rw-r--r--Kernel/FileSystem/DevPtsFS.h (renamed from Kernel/DevPtsFS.h)2
-rw-r--r--Kernel/FileSystem/DiskBackedFileSystem.cpp (renamed from Kernel/DiskBackedFileSystem.cpp)0
-rw-r--r--Kernel/FileSystem/DiskBackedFileSystem.h (renamed from Kernel/DiskBackedFileSystem.h)0
-rw-r--r--Kernel/FileSystem/Ext2FileSystem.cpp (renamed from Kernel/Ext2FileSystem.cpp)0
-rw-r--r--Kernel/FileSystem/Ext2FileSystem.h (renamed from Kernel/Ext2FileSystem.h)0
-rw-r--r--Kernel/FileSystem/FileSystem.cpp (renamed from Kernel/FileSystem.cpp)0
-rw-r--r--Kernel/FileSystem/FileSystem.h (renamed from Kernel/FileSystem.h)0
-rw-r--r--Kernel/FileSystem/InodeIdentifier.h (renamed from Kernel/InodeIdentifier.h)0
-rw-r--r--Kernel/FileSystem/InodeMetadata.h (renamed from Kernel/InodeMetadata.h)0
-rw-r--r--Kernel/FileSystem/ProcFS.cpp (renamed from Kernel/ProcFS.cpp)2
-rw-r--r--Kernel/FileSystem/ProcFS.h (renamed from Kernel/ProcFS.h)2
-rw-r--r--Kernel/FileSystem/SyntheticFileSystem.cpp (renamed from Kernel/SyntheticFileSystem.cpp)4
-rw-r--r--Kernel/FileSystem/SyntheticFileSystem.h (renamed from Kernel/SyntheticFileSystem.h)0
-rw-r--r--Kernel/FileSystem/VirtualFileSystem.cpp (renamed from Kernel/VirtualFileSystem.cpp)0
-rw-r--r--Kernel/FileSystem/VirtualFileSystem.h (renamed from Kernel/VirtualFileSystem.h)0
-rw-r--r--Kernel/FileSystem/ext2_fs.h (renamed from Kernel/ext2_fs.h)0
-rw-r--r--Kernel/FileSystem/ext2_types.h (renamed from Kernel/ext2_types.h)0
-rw-r--r--Kernel/LocalSocket.cpp2
-rw-r--r--Kernel/Makefile14
-rw-r--r--Kernel/MemoryManager.h2
-rw-r--r--Kernel/Process.cpp2
-rw-r--r--Kernel/Process.h2
-rw-r--r--Kernel/SlavePTY.cpp2
-rw-r--r--Kernel/init.cpp8
-rwxr-xr-xKernel/sync.sh1
28 files changed, 27 insertions, 26 deletions
diff --git a/Kernel/FileDescriptor.cpp b/Kernel/FileDescriptor.cpp
index 42e144cc1e..78661f1ff2 100644
--- a/Kernel/FileDescriptor.cpp
+++ b/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"
diff --git a/Kernel/FileDescriptor.h b/Kernel/FileDescriptor.h
index 4fa5aa6dae..80b3827c64 100644
--- a/Kernel/FileDescriptor.h
+++ b/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>
diff --git a/Kernel/DevPtsFS.cpp b/Kernel/FileSystem/DevPtsFS.cpp
index e4c9ac8e0e..f66d846750 100644
--- a/Kernel/DevPtsFS.cpp
+++ b/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;
diff --git a/Kernel/DevPtsFS.h b/Kernel/FileSystem/DevPtsFS.h
index 2355523cda..9898ea0786 100644
--- a/Kernel/DevPtsFS.h
+++ b/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;
diff --git a/Kernel/DiskBackedFileSystem.cpp b/Kernel/FileSystem/DiskBackedFileSystem.cpp
index f6214bb8b3..f6214bb8b3 100644
--- a/Kernel/DiskBackedFileSystem.cpp
+++ b/Kernel/FileSystem/DiskBackedFileSystem.cpp
diff --git a/Kernel/DiskBackedFileSystem.h b/Kernel/FileSystem/DiskBackedFileSystem.h
index 75d3f8f8fc..75d3f8f8fc 100644
--- a/Kernel/DiskBackedFileSystem.h
+++ b/Kernel/FileSystem/DiskBackedFileSystem.h
diff --git a/Kernel/Ext2FileSystem.cpp b/Kernel/FileSystem/Ext2FileSystem.cpp
index 8fb75f2ce9..8fb75f2ce9 100644
--- a/Kernel/Ext2FileSystem.cpp
+++ b/Kernel/FileSystem/Ext2FileSystem.cpp
diff --git a/Kernel/Ext2FileSystem.h b/Kernel/FileSystem/Ext2FileSystem.h
index 80f779b278..80f779b278 100644
--- a/Kernel/Ext2FileSystem.h
+++ b/Kernel/FileSystem/Ext2FileSystem.h
diff --git a/Kernel/FileSystem.cpp b/Kernel/FileSystem/FileSystem.cpp
index 0b237b3129..0b237b3129 100644
--- a/Kernel/FileSystem.cpp
+++ b/Kernel/FileSystem/FileSystem.cpp
diff --git a/Kernel/FileSystem.h b/Kernel/FileSystem/FileSystem.h
index 4c16ba05c0..4c16ba05c0 100644
--- a/Kernel/FileSystem.h
+++ b/Kernel/FileSystem/FileSystem.h
diff --git a/Kernel/InodeIdentifier.h b/Kernel/FileSystem/InodeIdentifier.h
index cb0c24f8c3..cb0c24f8c3 100644
--- a/Kernel/InodeIdentifier.h
+++ b/Kernel/FileSystem/InodeIdentifier.h
diff --git a/Kernel/InodeMetadata.h b/Kernel/FileSystem/InodeMetadata.h
index ee24330f9d..ee24330f9d 100644
--- a/Kernel/InodeMetadata.h
+++ b/Kernel/FileSystem/InodeMetadata.h
diff --git a/Kernel/ProcFS.cpp b/Kernel/FileSystem/ProcFS.cpp
index bfa183a49f..d08e896f6d 100644
--- a/Kernel/ProcFS.cpp
+++ b/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"
diff --git a/Kernel/ProcFS.h b/Kernel/FileSystem/ProcFS.h
index 23a84062f2..849cff70a7 100644
--- a/Kernel/ProcFS.h
+++ b/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;
diff --git a/Kernel/SyntheticFileSystem.cpp b/Kernel/FileSystem/SyntheticFileSystem.cpp
index bcf37dcf0f..d0cabdc209 100644
--- a/Kernel/SyntheticFileSystem.cpp
+++ b/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>
diff --git a/Kernel/SyntheticFileSystem.h b/Kernel/FileSystem/SyntheticFileSystem.h
index c1b95e5fe6..c1b95e5fe6 100644
--- a/Kernel/SyntheticFileSystem.h
+++ b/Kernel/FileSystem/SyntheticFileSystem.h
diff --git a/Kernel/VirtualFileSystem.cpp b/Kernel/FileSystem/VirtualFileSystem.cpp
index 4a6d985b39..4a6d985b39 100644
--- a/Kernel/VirtualFileSystem.cpp
+++ b/Kernel/FileSystem/VirtualFileSystem.cpp
diff --git a/Kernel/VirtualFileSystem.h b/Kernel/FileSystem/VirtualFileSystem.h
index 6baee90cd0..6baee90cd0 100644
--- a/Kernel/VirtualFileSystem.h
+++ b/Kernel/FileSystem/VirtualFileSystem.h
diff --git a/Kernel/ext2_fs.h b/Kernel/FileSystem/ext2_fs.h
index 4f0856acf1..4f0856acf1 100644
--- a/Kernel/ext2_fs.h
+++ b/Kernel/FileSystem/ext2_fs.h
diff --git a/Kernel/ext2_types.h b/Kernel/FileSystem/ext2_types.h
index 27277fa3fe..27277fa3fe 100644
--- a/Kernel/ext2_types.h
+++ b/Kernel/FileSystem/ext2_types.h
diff --git a/Kernel/LocalSocket.cpp b/Kernel/LocalSocket.cpp
index d14cf3ca13..d9f543a99f 100644
--- a/Kernel/LocalSocket.cpp
+++ b/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
diff --git a/Kernel/Makefile b/Kernel/Makefile
index 85ef1c7e55..dd157bfa3c 100644
--- a/Kernel/Makefile
+++ b/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 \
diff --git a/Kernel/MemoryManager.h b/Kernel/MemoryManager.h
index 60e7fc8c9b..bc1340695b 100644
--- a/Kernel/MemoryManager.h
+++ b/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)))
diff --git a/Kernel/Process.cpp b/Kernel/Process.cpp
index d8c41d662d..731a27b353 100644
--- a/Kernel/Process.cpp
+++ b/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"
diff --git a/Kernel/Process.h b/Kernel/Process.h
index 826bcd194f..e7ce808ee3 100644
--- a/Kernel/Process.h
+++ b/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>
diff --git a/Kernel/SlavePTY.cpp b/Kernel/SlavePTY.cpp
index 980ac598e0..96f07e151f 100644
--- a/Kernel/SlavePTY.cpp
+++ b/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
diff --git a/Kernel/init.cpp b/Kernel/init.cpp
index e896dce1dc..b5310b0b91 100644
--- a/Kernel/init.cpp
+++ b/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>
diff --git a/Kernel/sync.sh b/Kernel/sync.sh
index 2cd3585008..6df8867014 100755
--- a/Kernel/sync.sh
+++ b/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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 07:46:40 +0000