kernel: split vfs and filesystem drivers

1 files changed, 27 insertions, 27 deletions

diff --git a/kernel/CMakeLists.txt b/kernel/CMakeLists.txt
index c44383b8..359ad1f6 100644
--- a/kernel/CMakeLists.txt
+++ b/kernel/CMakeLists.txt
@@ -56,38 +56,38 @@ target_sources("kernel_lib" PRIVATE
     "kernel/drivers/pseudo/zero.cpp"
     "kernel/drivers/storage/ram_disk.cpp"
 
-    # Filesystem Subsystem
-    "kernel/filesystem/byte_offset_file_descriptor.cpp"
-    "kernel/filesystem/dentry.cpp"
-    "kernel/filesystem/device_inode.cpp"
-    "kernel/filesystem/device_number_registry.cpp"
-    "kernel/filesystem/directory_file_descriptor.cpp"
-    "kernel/filesystem/driver_registry.cpp"
-    "kernel/filesystem/error.cpp"
-    "kernel/filesystem/inode.cpp"
-    "kernel/filesystem/mount_table.cpp"
-    "kernel/filesystem/mount.cpp"
-    "kernel/filesystem/open_file_descriptor.cpp"
-    "kernel/filesystem/open_file_table.cpp"
-    "kernel/filesystem/vfs.cpp"
+    # Virtual Filesystem Subsystem
+    "kernel/vfs/byte_offset_file_descriptor.cpp"
+    "kernel/vfs/dentry.cpp"
+    "kernel/vfs/device_inode.cpp"
+    "kernel/vfs/device_number_registry.cpp"
+    "kernel/vfs/directory_file_descriptor.cpp"
+    "kernel/vfs/driver_registry.cpp"
+    "kernel/vfs/error.cpp"
+    "kernel/vfs/inode.cpp"
+    "kernel/vfs/mount_table.cpp"
+    "kernel/vfs/mount.cpp"
+    "kernel/vfs/open_file_descriptor.cpp"
+    "kernel/vfs/open_file_table.cpp"
+    "kernel/vfs.cpp"
 
     # DevFS Filesystem
-    "kernel/filesystem/devfs/filesystem.cpp"
-    "kernel/filesystem/devfs/inode.cpp"
-    "kernel/filesystem/devfs/module.cpp"
+    "kernel/filesystems/devfs/filesystem.cpp"
+    "kernel/filesystems/devfs/inode.cpp"
+    "kernel/filesystems/devfs/module.cpp"
 
     # ext2 Filesystem
-    "kernel/filesystem/ext2/directory_iterator.cpp"
-    "kernel/filesystem/ext2/error.cpp"
-    "kernel/filesystem/ext2/filesystem.cpp"
-    "kernel/filesystem/ext2/inode.cpp"
-    "kernel/filesystem/ext2/module.cpp"
-    "kernel/filesystem/ext2/write_batch.cpp"
+    "kernel/filesystems/ext2/directory_iterator.cpp"
+    "kernel/filesystems/ext2/error.cpp"
+    "kernel/filesystems/ext2/filesystem.cpp"
+    "kernel/filesystems/ext2/inode.cpp"
+    "kernel/filesystems/ext2/module.cpp"
+    "kernel/filesystems/ext2/write_batch.cpp"
 
     # Rootfs Filesystem
-    "kernel/filesystem/rootfs/filesystem.cpp"
-    "kernel/filesystem/rootfs/inode.cpp"
-    "kernel/filesystem/rootfs/module.cpp"
+    "kernel/filesystems/rootfs/filesystem.cpp"
+    "kernel/filesystems/rootfs/inode.cpp"
+    "kernel/filesystems/rootfs/module.cpp"
 )
 
 file(GLOB_RECURSE KERNEL_HEADERS
@@ -184,7 +184,7 @@ if(BUILD_TESTING)
     )
 
     target_compile_definitions("${TEST_TARGET}" PRIVATE
-        KERNEL_TEST_ASSETS_DIR="${CMAKE_CURRENT_SOURCE_DIR}/kernel/test_support/filesystem/test_assets"
+        KERNEL_TEST_ASSETS_DIR="${CMAKE_CURRENT_SOURCE_DIR}/kernel/test_support/vfs/test_assets"
     )
     
     if(COMMAND "enable_coverage" AND TEACHOS_ENABLE_TEST_COVERAGE)