X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/e6dbd781772925dfc07b2facfa0a1350e756ad8f..21ffd87b228fa0bd0c25a09b710c6aeac8b81281:/lunaix-os/kernel/fs/twifs/twifs.c

diff --git a/lunaix-os/kernel/fs/twifs/twifs.c b/lunaix-os/kernel/fs/twifs/twifs.c
index 6efc833..6049861 100644
--- a/lunaix-os/kernel/fs/twifs/twifs.c
+++ b/lunaix-os/kernel/fs/twifs/twifs.c
@@ -31,7 +31,7 @@ struct twifs_node*
 __twifs_get_node(struct twifs_node* parent, struct hstr* name);
 
 struct v_inode*
-__twifs_create_inode(struct twifs_node* twi_node);
+__twifs_get_inode(struct twifs_node* twi_node);
 
 int
 __twifs_iterate_dir(struct v_inode* inode, struct dir_context* dctx);
@@ -43,7 +43,7 @@ int
 __twifs_mkdir(struct v_inode* inode, struct v_dnode* dnode);
 
 int
-__twifs_rmstuff(struct v_inode* inode);
+__twifs_rmstuff(struct v_inode* inode, struct v_dnode* dir);
 
 int
 __twifs_fwrite(struct v_inode* inode, void* buffer, size_t len, size_t fpos);
@@ -60,6 +60,7 @@ twifs_init()
     twifs->fs_name = HSTR("twifs", 5);
     twifs->mount = __twifs_mount;
     twifs->types = FSTYPE_ROFS;
+    twifs->fs_id = 0;
 
     fsm_register(twifs);
 
@@ -77,6 +78,7 @@ __twifs_new_node(struct twifs_node* parent,
 
     node->name = HSTR(name, name_len);
     node->itype = itype;
+    node->ino_id = inode_id++;
     hstr_rehash(&node->name, HSTR_FULL_HASH);
     llist_init_head(&node->children);
 
@@ -94,7 +96,6 @@ twifs_rm_node(struct twifs_node* node)
         return ENOTEMPTY;
     }
     llist_delete(&node->siblings);
-    vfs_i_free(node->inode);
     cake_release(twi_pile, node);
     return 0;
 }
@@ -108,9 +109,6 @@ twifs_file_node(struct twifs_node* parent,
     struct twifs_node* twi_node =
       __twifs_new_node(parent, name, name_len, VFS_IFFILE | itype);
 
-    struct v_inode* twi_inode = __twifs_create_inode(twi_node);
-    twi_node->inode = twi_inode;
-
     return twi_node;
 }
 
@@ -130,9 +128,6 @@ twifs_dir_node(struct twifs_node* parent,
     struct twifs_node* twi_node =
       __twifs_new_node(parent, name, name_len, VFS_IFDIR | itype);
 
-    struct v_inode* twi_inode = __twifs_create_inode(twi_node);
-    twi_node->inode = twi_inode;
-
     return twi_node;
 }
 
@@ -145,39 +140,23 @@ twifs_toplevel_node(const char* name, int name_len, uint32_t itype)
 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_IFDIR)) {
-        return ENOTDIR;
-    }
-    struct twifs_node* new_node =
-      twifs_dir_node(parent_node, dnode->name.value, dnode->name.len, 0);
-    dnode->inode = new_node->inode;
-
-    return 0;
+    return ENOTSUP;
 }
 
-int
-__twifs_mount(struct v_superblock* vsb, struct v_dnode* mount_point)
+void
+__twifs_init_inode(struct v_inode* inode, void* data)
 {
-    mount_point->inode = fs_root->inode;
-    return 0;
-}
+    struct twifs_node* twi_node = (struct twifs_node*)data;
 
-struct v_inode*
-__twifs_create_inode(struct twifs_node* twi_node)
-{
-    struct v_inode* inode = vfs_i_alloc();
     inode->itype = twi_node->itype;
     inode->data = twi_node;
 
-    inode->id = inode_id++;
     inode->ctime = clock_unixtime();
     inode->atime = inode->ctime;
     inode->mtime = inode->ctime;
 
     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;
 
@@ -188,6 +167,19 @@ __twifs_create_inode(struct twifs_node* twi_node)
     return inode;
 }
 
+int
+__twifs_mount(struct v_superblock* vsb, struct v_dnode* mount_point)
+{
+    vsb->dev = 1;
+    struct v_inode* inode =
+      vfs_i_alloc(vsb, fs_root->ino_id, __twifs_init_inode, fs_root);
+    if (!inode) {
+        return ENOMEM;
+    }
+    vfs_assign_inode(mount_point, inode);
+    return 0;
+}
+
 int
 __twifs_fwrite(struct v_inode* inode, void* buffer, size_t len, size_t fpos)
 {
@@ -225,10 +217,9 @@ __twifs_get_node(struct twifs_node* parent, struct hstr* name)
 }
 
 int
-__twifs_rmstuff(struct v_inode* inode)
+__twifs_rmstuff(struct v_inode* inode, struct v_dnode* dir)
 {
-    struct twifs_node* twi_node = (struct twifs_node*)inode->data;
-    return twifs_rm_node(twi_node);
+    return ENOTSUP;
 }
 
 int
@@ -242,7 +233,16 @@ __twifs_dirlookup(struct v_inode* inode, struct v_dnode* dnode)
 
     struct twifs_node* child_node = __twifs_get_node(twi_node, &dnode->name);
     if (child_node) {
-        dnode->inode = child_node->inode;
+        struct v_inode* inode = vfs_i_alloc(dnode->super_block,
+                                            child_node->ino_id,
+                                            __twifs_init_inode,
+                                            child_node);
+        if (!inode) {
+            return ENOENT;
+        }
+
+        dnode->data = twi_node->data;
+        vfs_assign_inode(dnode, inode);
         return 0;
     }
     return ENOENT;