X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/5fc669295655ec0eea7722aa4a48921dc6b700ec..7515e526342f6ee07cbe92f5a458f1c2c4a1fcaf:/lunaix-os/kernel/fs/twifs.c

diff --git a/lunaix-os/kernel/fs/twifs.c b/lunaix-os/kernel/fs/twifs.c
index d24b6a0..37af44e 100644
--- a/lunaix-os/kernel/fs/twifs.c
+++ b/lunaix-os/kernel/fs/twifs.c
@@ -15,7 +15,7 @@
 #include <lunaix/mm/cake.h>
 #include <lunaix/mm/valloc.h>
 
-static struct twifs_node fs_root;
+static struct twifs_node* fs_root;
 
 static struct cake_pile* twi_pile;
 
@@ -28,6 +28,18 @@ __twifs_openfile(struct v_inode* inode, struct v_file* file);
 struct twifs_node*
 __twifs_get_node(struct twifs_node* parent, struct hstr* name);
 
+struct v_inode*
+__twifs_create_inode(struct twifs_node* twi_node);
+
+int
+__twifs_iterate_dir(struct v_file* file, struct dir_context* dctx);
+
+int
+__twifs_mount(struct v_superblock* vsb, struct v_dnode* mount_point);
+
+int
+__twifs_mkdir(struct v_inode* inode, struct v_dnode* dnode);
+
 void
 twifs_init()
 {
@@ -39,46 +51,115 @@ twifs_init()
 
     fsm_register(twifs);
 
-    memset(&fs_root, 0, sizeof(fs_root));
-    llist_init_head(&fs_root.children);
+    fs_root = twifs_dir_node(NULL, NULL, 0);
+}
+
+struct twifs_node*
+__twifs_new_node(struct twifs_node* parent, const char* name, int name_len)
+{
+    struct twifs_node* node = cake_grab(twi_pile);
+    memset(node, 0, sizeof(*node));
+
+    node->name = HSTR(name, name_len);
+    hstr_rehash(&node->name, HSTR_FULL_HASH);
+    llist_init_head(&node->children);
+
+    if (parent) {
+        llist_append(&parent->children, &node->siblings);
+    }
+
+    return node;
+}
+
+void
+twifs_rm_node(struct twifs_node* node)
+{
+    // TODO recursivly delete any sub-directories.
+    if ((node->itype & VFS_INODE_TYPE_DIR)) {
+        struct twifs_node* dir = __twifs_get_node(node, &vfs_dot);
+        struct twifs_node* dir2 = __twifs_get_node(node, &vfs_ddot);
+        vfs_i_free(dir->inode);
+        vfs_i_free(dir2->inode);
+        cake_release(twi_pile, dir);
+        cake_release(twi_pile, dir2);
+    }
+    llist_delete(&node->siblings);
+    vfs_i_free(node->inode);
+    cake_release(twi_pile, node);
+}
+
+struct twifs_node*
+twifs_file_node(struct twifs_node* parent, const char* name, int name_len)
+{
+    struct twifs_node* twi_node = __twifs_new_node(parent, name, name_len);
+    twi_node->itype = VFS_INODE_TYPE_FILE;
 
-    // 预备一些常用的类别
-    twifs_toplevel_node("kernel", 6);
-    twifs_toplevel_node("dev", 3);
-    twifs_toplevel_node("bus", 3);
+    struct v_inode* twi_inode = __twifs_create_inode(twi_node);
+    twi_node->inode = twi_inode;
+
+    return twi_node;
 }
 
 struct twifs_node*
-twifs_child_node(struct twifs_node* parent, const char* name, int name_len)
+twifs_dir_node(struct twifs_node* parent, const char* name, int name_len)
 {
     struct hstr hname = HSTR(name, name_len);
     hstr_rehash(&hname, HSTR_FULL_HASH);
-
     struct twifs_node* node = __twifs_get_node(parent, &hname);
     if (node) {
         return node;
     }
 
-    node = cake_grab(twi_pile);
-    memset(node, 0, sizeof(*node));
+    struct twifs_node* twi_node = __twifs_new_node(parent, name, name_len);
+    twi_node->itype = VFS_INODE_TYPE_DIR;
+    twi_node->fops.readdir = __twifs_iterate_dir;
 
-    node->name = hname;
-    llist_init_head(&node->children);
-    llist_append(&parent->children, &node->siblings);
+    struct v_inode* twi_inode = __twifs_create_inode(twi_node);
+    struct twifs_node* dot = __twifs_new_node(twi_node, ".", 1);
+    struct twifs_node* ddot = __twifs_new_node(twi_node, "..", 2);
 
-    return node;
+    dot->itype = VFS_INODE_TYPE_DIR;
+    ddot->itype = VFS_INODE_TYPE_DIR;
+
+    twi_node->inode = twi_inode;
+    dot->inode = twi_inode;
+    ddot->inode = parent ? parent->inode : twi_inode;
+
+    return twi_node;
 }
 
 struct twifs_node*
 twifs_toplevel_node(const char* name, int name_len)
 {
-    return twifs_child_node(&fs_root, name, name_len);
+    return twifs_dir_node(fs_root, name, name_len);
 }
 
-void
+int
+__twifs_mkdir(struct v_inode* inode, struct v_dnode* dnode)
+{
+    struct twifs_node* parent_node = (struct twifs_node*)inode->data;
+    if (!(parent_node->itype & VFS_INODE_TYPE_DIR)) {
+        return ENOTDIR;
+    }
+    struct twifs_node* new_node =
+      twifs_dir_node(parent_node, dnode->name.value, dnode->name.len);
+    dnode->inode = new_node->inode;
+
+    return 0;
+}
+
+int
 __twifs_mount(struct v_superblock* vsb, struct v_dnode* mount_point)
 {
-    mount_point->inode = __twifs_create_inode(&fs_root);
+    mount_point->inode = fs_root->inode;
+    // FIXME try to mitigate this special case or pull it up to higher level of
+    // abstraction
+    if (mount_point->parent && mount_point->parent->inode) {
+        struct hstr ddot_name = HSTR("..", 2);
+        struct twifs_node* root_ddot = __twifs_get_node(fs_root, &ddot_name);
+        root_ddot->inode = mount_point->parent->inode;
+    }
+    return 0;
 }
 
 struct v_inode*
@@ -93,12 +174,18 @@ __twifs_create_inode(struct twifs_node* twi_node)
                                .mtime = 0,
                                .ref_count = 0 };
     inode->ops.dir_lookup = __twifs_dirlookup;
+    inode->ops.mkdir = __twifs_mkdir;
     inode->ops.open = __twifs_openfile;
+
+    return inode;
 }
 
 struct twifs_node*
 __twifs_get_node(struct twifs_node* parent, struct hstr* name)
 {
+    if (!parent)
+        return NULL;
+
     struct twifs_node *pos, *n;
     llist_for_each(pos, n, &parent->children, siblings)
     {
@@ -114,12 +201,16 @@ __twifs_dirlookup(struct v_inode* inode, struct v_dnode* dnode)
 {
     struct twifs_node* twi_node = (struct twifs_node*)inode->data;
 
+    if (!(twi_node->itype & VFS_INODE_TYPE_DIR)) {
+        return ENOTDIR;
+    }
+
     struct twifs_node* child_node = __twifs_get_node(twi_node, &dnode->name);
     if (child_node) {
-        dnode->inode = __twifs_create_inode(child_node);
+        dnode->inode = child_node->inode;
         return 0;
     }
-    return VFS_ENODIR;
+    return ENOENT;
 }
 
 int
@@ -133,12 +224,13 @@ __twifs_iterate_dir(struct v_file* file, struct dir_context* dctx)
     {
         if (counter++ >= dctx->index) {
             dctx->index = counter;
-            dctx->read_complete_callback(dctx, pos->name.value, pos->itype);
+            dctx->read_complete_callback(
+              dctx, pos->name.value, pos->name.len, pos->itype);
             return 0;
         }
     }
 
-    return VFS_EENDOFDIR;
+    return 1;
 }
 
 int
@@ -146,8 +238,9 @@ __twifs_openfile(struct v_inode* inode, struct v_file* file)
 {
     struct twifs_node* twi_node = (struct twifs_node*)inode->data;
     if (twi_node) {
+        file->inode = twi_node->inode;
         file->ops = twi_node->fops;
-        return 1;
+        return 0;
     }
-    return 0;
+    return ENOTSUP;
 }