1、在文件系统目录下增加mod.rs 2、将VFS的路径改为vfs(#133)

2、将VFS的路径改为vfs

kernel/src/driver/keyboard/ps2_keyboard.c

@@ -3,7 +3,7 @@
 #include <mm/mm.h>
 #include <mm/slab.h>
 #include <common/printk.h>
-#include <filesystem/VFS/VFS.h>
+#include <filesystem/vfs/VFS.h>
 #include <filesystem/devfs/devfs.h>
 #include <common/wait_queue.h>
 #include <common/spinlock.h>

kernel/src/driver/tty/tty.c

@@ -1,5 +1,5 @@
 #include <filesystem/devfs/devfs.h>
-#include <filesystem/VFS/VFS.h>
+#include <filesystem/vfs/VFS.h>
 #include "tty.h"
 
 static struct devfs_private_inode_info_t * tty_inode_private_data_ptr;  // 由devfs创建的inode私有信息指针

kernel/src/filesystem/Makefile

@@ -3,7 +3,7 @@ CFLAGS += -I .
 
 
 kernel_fs_objs:= $(shell find ./*.c)
-kernel_fs_subdirs:= devfs VFS fat32 rootfs procfs
+kernel_fs_subdirs:= devfs vfs fat32 rootfs procfs
 
 ECHO:
 	@echo "$@"

kernel/src/filesystem/devfs/chardev.c

@@ -1,6 +1,6 @@
 #include "chardev.h"
 #include "internal.h"
-#include <filesystem/VFS/VFS.h>
+#include <filesystem/vfs/VFS.h>
 
 #include <common/mutex.h>
 #include <common/stdlib.h>

kernel/src/filesystem/devfs/devfs-types.h

@@ -1,5 +1,5 @@
 #pragma once
-#include <filesystem/VFS/VFS.h>
+#include <filesystem/vfs/VFS.h>
 
 /**
  * @brief devfs_private_file_info_t的type字段值

kernel/src/filesystem/devfs/devfs.c

@@ -1,6 +1,6 @@
 #include "devfs.h"
 #include "internal.h"
-#include <filesystem/VFS/VFS.h>
+#include <filesystem/vfs/VFS.h>
 #include <common/glib.h>
 #include <common/string.h>
 #include <mm/slab.h>

kernel/src/filesystem/fat32/fat32.h

@@ -12,7 +12,7 @@
 #pragma once
 
 #include <filesystem/MBR.h>
-#include <filesystem/VFS/VFS.h>
+#include <filesystem/vfs/VFS.h>
 
 #define FAT32_MAX_PARTITION_NUM 128 // 系统支持的最大的fat32分区数量
 

kernel/src/filesystem/fat32/fat_ent.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "fat32.h"
-#include <filesystem/VFS/VFS.h>
+#include <filesystem/vfs/VFS.h>
 #include <stdbool.h>
 
 /**

kernel/src/filesystem/mod.rs

@@ -0,0 +1,5 @@
+pub mod devfs;
+pub mod fat32;
+pub mod procfs;
+pub mod rootfs;
+pub mod vfs;

kernel/src/filesystem/procfs/procfs.h

@@ -6,7 +6,7 @@
 #include <common/stdio.h>
 #include <common/stdlib.h>
 #include <common/string.h>
-#include <filesystem/VFS/VFS.h>
+#include <filesystem/vfs/VFS.h>
 #include <process/process.h>
 
 /**

kernel/src/filesystem/rootfs/rootfs.c

@@ -1,7 +1,7 @@
 #include "rootfs.h"
-#include <filesystem/VFS/VFS.h>
+#include <filesystem/vfs/VFS.h>
 #include <common/string.h>
-#include <filesystem/VFS/mount.h>
+#include <filesystem/vfs/mount.h>
 
 static struct vfs_superblock_t rootfs_sb = {0};
 extern struct vfs_superblock_t *vfs_root_sb;

kernel/src/ipc/pipe.c

@@ -2,7 +2,7 @@
 #include <common/spinlock.h>
 #include <process/process.h>
 #include <process/ptrace.h>
-#include <filesystem/VFS/VFS.h>
+#include <filesystem/vfs/VFS.h>
 #include <filesystem/fat32/fat32.h>
 #include <common/atomic.h>
 #include <mm/slab.h>

kernel/src/lib.rs

@@ -16,13 +16,13 @@ use core::panic::PanicInfo;
 #[macro_use]
 mod arch;
 
+mod driver;
+mod filesystem;
 #[macro_use]
 mod include;
 mod ipc;
-
 #[macro_use]
 mod libs;
-mod driver;
 mod mm;
 mod process;
 mod sched;

kernel/src/main.c

@@ -19,7 +19,7 @@
 #include <sched/sched.h>
 #include <smp/ipi.h>
 
-#include <filesystem/VFS/VFS.h>
+#include <filesystem/vfs/VFS.h>
 #include <filesystem/devfs/devfs.h>
 #include <filesystem/procfs/procfs.h>
 #include <filesystem/fat32/fat32.h>

kernel/src/process/process.h

@@ -14,7 +14,7 @@
 #include <common/errno.h>
 #include <common/glib.h>
 #include <common/wait_queue.h>
-#include <filesystem/VFS/VFS.h>
+#include <filesystem/vfs/VFS.h>
 #include <mm/mm-types.h>
 #include <syscall/syscall.h>
 

kernel/src/syscall/syscall.c

@@ -6,7 +6,7 @@
 #include <driver/disk/ahci/ahci.h>
 #include <exception/gate.h>
 #include <exception/irq.h>
-#include <filesystem/VFS/VFS.h>
+#include <filesystem/vfs/VFS.h>
 #include <filesystem/fat32/fat32.h>
 #include <mm/slab.h>
 #include <process/process.h>