将 sys_mount 的 data 参数通过 vfs 传递进各文件系统实现.

Author: xiaoyi1212

module/all_include/fs_subsystem.h

@@ -33,7 +33,7 @@
 
 typedef struct vfs_node *vfs_node_t;
 
-typedef errno_t (*vfs_mount_t)(const char *src, vfs_node_t node);
+typedef errno_t (*vfs_mount_t)(const char *src, vfs_node_t node, void *data);
 typedef void (*vfs_unmount_t)(void *root);
 
 typedef void (*vfs_open_t)(void *parent, const char *name, vfs_node_t node);

module/fatfs/fatfs.c

@@ -137,7 +137,7 @@ bool fatfs_close(file_t handle) {
     return true;
 }
 
-errno_t fatfs_mount(const char *src, vfs_node_t node) {
+errno_t fatfs_mount(const char *src, vfs_node_t node, void *data) {
     int drive                   = alloc_number();
     drive_number_mapping[drive] = vfs_open(src);
     if (drive_number_mapping[drive] == NULL) return -ENODEV;

module/iso9660/iso9660.c

@@ -356,20 +356,20 @@ bool iso9660_close(file_t handle) {
     return true;
 }
 
-errno_t iso9660_mount(const char *src, vfs_node_t node) {
-    vfs_node_t device = vfs_open(src);
+static errno_t iso9660_mount(const char *src, const vfs_node_t node, void *data) {
+    const vfs_node_t device = vfs_open(src);
     if (device == NULL || device->type == file_dir) { return -1; }
     node->dev           = device->rdev;
-    l9660_fs    *fs     = (l9660_fs *)malloc(sizeof(l9660_fs));
-    l9660_status status = l9660_openfs(fs, read_sector, device);
+    l9660_fs    *fs     = malloc(sizeof(l9660_fs));
+    const l9660_status status = l9660_openfs(fs, read_sector, device);
     if (status != L9660_OK) {
         free(fs);
         vfs_close(device);
         return -1;
     }
-    l9660_dir *root_dir = (l9660_dir *)malloc(sizeof(l9660_dir));
+    l9660_dir *root_dir = malloc(sizeof(l9660_dir));
     l9660_fs_open_root(root_dir, fs);
-    file_t handle  = (file_t)malloc(sizeof(struct file));
+    const file_t handle  = malloc(sizeof(struct file));
     handle->type   = file_dir;
     handle->handle = (void *)root_dir;
     node->fsid     = iso9660_id;
@@ -429,4 +429,4 @@ __attribute__((used)) __attribute__((visibility("default"))) int dlmain(void) {
     iso9660_id = vfs_regist("iso9660", &iso_callbacks, 0x9660, 0);
     if (iso9660_id == -EINVAL) { printk("Failed to register iso9660 filesystem\n"); }
     return EOK;
-}
+}

src/fs/cpio.c

@@ -104,7 +104,7 @@ void cpio_init(void) {
     if (!init_ramfs) {
         return;
     }
-    if (vfs_mount(NULL, "tmpfs", get_rootdir()) != EOK) {
+    if (vfs_mount(NULL, "tmpfs", get_rootdir(), NULL) != EOK) {
         kerror("Cannot mount tmpfs to root_dir");
         return;
     }

src/fs/devtmpfs.c

@@ -81,7 +81,7 @@ static void load_drm_device(vfs_node_t node) {
     free(builder);
 }
 
-errno_t devtmpfs_mount(const char *handle, vfs_node_t node) {
+errno_t devtmpfs_mount(const char *handle, vfs_node_t node, void *data) {
     node->fsid                = dev_tmpfs_id;
     dtmp_handle_t *tmpfs_root = (dtmp_handle_t *)malloc(sizeof(dtmp_handle_t));
     tmpfs_root->type          = dtp_file_dir;

src/fs/fssys.c

@@ -583,11 +583,12 @@ syscall_(fcntl, int fd, int cmd, uint64_t arg) {
 }
 
 syscall_(mount, char *dev_name, char *dir_name, char *type, uint64_t flags, void *data) {
-    if (dir_name == NULL)
+    if (dir_name == NULL) {
         return SYSCALL_FAULT_(EINVAL);
+    }
 
     char *ndir_name = vfs_cwd_path_build(dir_name);
-    vfs_node_t dir  = vfs_open((const char *)ndir_name);
+    vfs_node_t dir  = vfs_open(ndir_name);
     if (!dir) {
         free(ndir_name);
         return SYSCALL_FAULT_(ENOENT);
@@ -631,7 +632,7 @@ syscall_(mount, char *dev_name, char *dir_name, char *type, uint64_t flags, void
     char *ndev_name = vfs_cwd_path_build(dev_name);
     errno_t mret    = EOK;
 mount:
-    mret = vfs_mount((const char *)ndev_name, type, dir);
+    mret = vfs_mount(ndev_name, type, dir, data);
     if (mret != EOK) {
         free(ndir_name);
         free(ndev_name);

src/fs/pipefs.c

@@ -306,7 +306,7 @@ int pipefs_poll(void *file, size_t events) {
     return out;
 }
 
-int pipefs_mount(const char *handle, vfs_node_t node) {
+int pipefs_mount(const char *handle, vfs_node_t node, void *data) {
     if (pipefs_root != NULL)
         return -EBUSY;
     node->fsid   = pipefs_id;

src/fs/procfs/proc_dpatch.c

@@ -2,7 +2,7 @@
 #include "bootarg.h"
 #include "fs/procfs.h"
 
-proc_handle_node_t *dispatch_array[256];
+static proc_handle_node_t *dispatch_array[256];
 static size_t dp_index = 0;
 extern vfs_node_t procfs_root;
 
@@ -19,12 +19,15 @@ size_t procfs_node_read(size_t len, size_t offset, size_t size, char *addr, char
 
 static uint64_t hash_dp(const char *s) {
     uint64_t h = 0;
-    while (*s)
+    while (*s) {
         h = h * 131 + (unsigned char)*s++;
+    }
     return h;
 }
 
-static void create_procfs_handle(char *name, read_entry_t read_entry, stat_entry_t stat_entry) {
+static void create_procfs_handle(
+    const char *name, const read_entry_t read_entry, const stat_entry_t stat_entry
+) {
     proc_handle_node_t *handle = malloc(sizeof(proc_handle_node_t));
     handle->name               = strdup(name);
     handle->hash               = hash_dp(handle->name);
@@ -33,9 +36,10 @@ static void create_procfs_handle(char *name, read_entry_t read_entry, stat_entry
     dispatch_array[dp_index++] = handle;
 }
 
-static void create_procfs_node(char *name, read_entry_t read_entry, stat_entry_t stat_entry) {
+static void
+create_procfs_node(char *name, const read_entry_t read_entry, const stat_entry_t stat_entry) {
     create_procfs_handle(name, read_entry, stat_entry);
-    vfs_node_t node        = vfs_node_alloc(procfs_root, name);
+    const vfs_node_t node        = vfs_node_alloc(procfs_root, name);
     node->type             = file_none;
     node->mode             = 0700;
     proc_handle_t *handle0 = malloc(sizeof(proc_handle_t));

src/fs/procfs/procfs.c

@@ -11,9 +11,9 @@
 static int procfs_id    = 0;
 static int proc_self_id = 0;
 vfs_node_t procfs_root  = NULL;
-spin_t procfs_oplock    = SPIN_INIT;
+static spin_t procfs_oplock    = SPIN_INIT;
 
-errno_t procfs_mount(const char *src, vfs_node_t node) {
+errno_t procfs_mount(const char *src, vfs_node_t node, void *data) {
     procfs_root = node;
 
     procfs_root->fsid = procfs_id;

src/fs/sockfs.c

@@ -283,9 +283,10 @@ static errno_t sockfs_free(void *handle) {
     return EOK;
 }
 
-static int sockfs_mount(const char *handle, vfs_node_t node) {
-    if (sockfs_root != NULL)
+static int sockfs_mount(const char *handle, vfs_node_t node, void *data) {
+    if (sockfs_root != NULL) {
         return -EBUSY;
+    }
     node->fsid   = sockfs_id;
     sockfs_root  = node;
     node->handle = calloc(1, sizeof(socket_specific_t));