X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/6fefc6f5af83f316e18b0cb9dbbde1cea0b98add..847763577fbcc79179722874c81b44ee36108edb:/lunaix-os/kernel/fs/twifs.c

diff --git a/lunaix-os/kernel/fs/twifs.c b/lunaix-os/kernel/fs/twifs.c
index ad226ca..a67300b 100644
--- a/lunaix-os/kernel/fs/twifs.c
+++ b/lunaix-os/kernel/fs/twifs.c
@@ -37,6 +37,9 @@ __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()
 {
@@ -45,15 +48,11 @@ twifs_init()
     struct filesystem* twifs = vzalloc(sizeof(struct filesystem));
     twifs->fs_name = HSTR("twifs", 5);
     twifs->mount = __twifs_mount;
+    twifs->types = FSTYPE_ROFS;
 
     fsm_register(twifs);
 
     fs_root = twifs_dir_node(NULL, NULL, 0);
-
-    // 预备一些常用的类别
-    twifs_toplevel_node("kernel", 6);
-    twifs_toplevel_node("dev", 3);
-    twifs_toplevel_node("bus", 3);
 }
 
 struct twifs_node*
@@ -73,6 +72,18 @@ __twifs_new_node(struct twifs_node* parent, const char* name, int name_len)
     return node;
 }
 
+int
+twifs_rm_node(struct twifs_node* node)
+{
+    if ((node->itype & VFS_INODE_TYPE_DIR) && !llist_empty(&node->children)) {
+        return ENOTEMPTY;
+    }
+    llist_delete(&node->siblings);
+    vfs_i_free(node->inode);
+    cake_release(twi_pile, node);
+    return 0;
+}
+
 struct twifs_node*
 twifs_file_node(struct twifs_node* parent, const char* name, int name_len)
 {
@@ -82,7 +93,7 @@ twifs_file_node(struct twifs_node* parent, const char* name, int name_len)
     struct v_inode* twi_inode = __twifs_create_inode(twi_node);
     twi_node->inode = twi_inode;
 
-    return twi_inode;
+    return twi_node;
 }
 
 struct twifs_node*
@@ -97,18 +108,10 @@ twifs_dir_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_DIR;
-    twi_node->fops.readdir = __twifs_iterate_dir;
 
     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);
-
-    dot->itype = VFS_INODE_TYPE_DIR;
-    ddot->itype = VFS_INODE_TYPE_DIR;
-
+    twi_node->fops.readdir = __twifs_iterate_dir;
     twi_node->inode = twi_inode;
-    dot->inode = twi_inode;
-    ddot->inode = parent ? parent->inode : twi_inode;
 
     return twi_node;
 }
@@ -119,17 +122,24 @@ twifs_toplevel_node(const char* name, int name_len)
     return twifs_dir_node(fs_root, name, name_len);
 }
 
+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 = 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;
 }
 
@@ -143,8 +153,11 @@ __twifs_create_inode(struct twifs_node* twi_node)
                                .lb_usage = 0,
                                .data = twi_node,
                                .mtime = 0,
-                               .ref_count = 0 };
+                               .open_count = 0 };
     inode->ops.dir_lookup = __twifs_dirlookup;
+    inode->ops.mkdir = __twifs_mkdir;
+    inode->ops.unlink = __twifs_rmstuff;
+    inode->ops.rmdir = __twifs_rmstuff;
     inode->ops.open = __twifs_openfile;
 
     return inode;
@@ -166,11 +179,22 @@ __twifs_get_node(struct twifs_node* parent, struct hstr* name)
     return NULL;
 }
 
+int
+__twifs_rmstuff(struct v_inode* inode)
+{
+    struct twifs_node* twi_node = (struct twifs_node*)inode->data;
+    return twifs_rm_node(twi_node);
+}
+
 int
 __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 = child_node->inode;