refactor: send the command with retry and error detection

[lunaix-os.git] / 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 f53508418ed4bea89d23c2cafac0bf793e53438e..6049861a246654057dd5e812e531f5469de4ab6d 100644 (file)
--- a/lunaix-os/kernel/fs/twifs/twifs.c
+++ b/lunaix-os/kernel/fs/twifs/twifs.c
@@ -19,6 +19,8 @@ static struct twifs_node* fs_root;
 
 static struct cake_pile* twi_pile;
 
 
 static struct cake_pile* twi_pile;
 

+static volatile int32_t inode_id = 0;
+

 int
 __twifs_dirlookup(struct v_inode* inode, struct v_dnode* dnode);
 
 int
 __twifs_dirlookup(struct v_inode* inode, struct v_dnode* dnode);
 


@@ -29,10 +31,10 @@ struct twifs_node*
 __twifs_get_node(struct twifs_node* parent, struct hstr* name);
 
 struct v_inode*
 __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
 
 int

-__twifs_iterate_dir(struct v_file* file, struct dir_context* dctx);
+__twifs_iterate_dir(struct v_inode* inode, struct dir_context* dctx);

 
 int
 __twifs_mount(struct v_superblock* vsb, struct v_dnode* mount_point);
 
 int
 __twifs_mount(struct v_superblock* vsb, struct v_dnode* mount_point);


@@ -41,13 +43,13 @@ int
 __twifs_mkdir(struct v_inode* inode, struct v_dnode* dnode);
 
 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
 
 int

-__twifs_fwrite(struct v_file* file, void* buffer, size_t len, size_t fpos);
+__twifs_fwrite(struct v_inode* inode, void* buffer, size_t len, size_t fpos);

 
 int
 
 int

-__twifs_fread(struct v_file* file, void* buffer, size_t len, size_t fpos);
+__twifs_fread(struct v_inode* inode, void* buffer, size_t len, size_t fpos);

 
 void
 twifs_init()
 
 void
 twifs_init()


@@ -58,6 +60,7 @@ twifs_init()
     twifs->fs_name = HSTR("twifs", 5);
     twifs->mount = __twifs_mount;
     twifs->types = FSTYPE_ROFS;
     twifs->fs_name = HSTR("twifs", 5);
     twifs->mount = __twifs_mount;
     twifs->types = FSTYPE_ROFS;

+    twifs->fs_id = 0;

 
     fsm_register(twifs);
 
 
     fsm_register(twifs);
 


@@ -75,6 +78,7 @@ __twifs_new_node(struct twifs_node* parent,
 
     node->name = HSTR(name, name_len);
     node->itype = itype;
 
     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);
 
     hstr_rehash(&node->name, HSTR_FULL_HASH);
     llist_init_head(&node->children);
 


@@ -92,7 +96,6 @@ twifs_rm_node(struct twifs_node* node)
         return ENOTEMPTY;
     }
     llist_delete(&node->siblings);
         return ENOTEMPTY;
     }
     llist_delete(&node->siblings);

-    vfs_i_free(node->inode);

     cake_release(twi_pile, node);
     return 0;
 }
     cake_release(twi_pile, node);
     return 0;
 }


@@ -106,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 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;
 }
 
     return twi_node;
 }
 


@@ -128,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 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;
 }
 
     return twi_node;
 }
 


@@ -143,38 +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)
 {
 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;
+
+    inode->itype = twi_node->itype;
+    inode->data = twi_node;
+
+    inode->ctime = clock_unixtime();
+    inode->atime = inode->ctime;
+    inode->mtime = inode->ctime;

 
 

-struct v_inode*
-__twifs_create_inode(struct twifs_node* twi_node)
-{
-    struct v_inode* inode = vfs_i_alloc();
-    *inode = (struct v_inode){ .ctime = 0,
-                               .itype = twi_node->itype,
-                               .lb_addr = 0,
-                               .lb_usage = 0,
-                               .data = twi_node,
-                               .mtime = 0,
-                               .open_count = 0 };

     inode->ops.dir_lookup = __twifs_dirlookup;
     inode->ops.mkdir = __twifs_mkdir;
     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;
 
     inode->ops.rmdir = __twifs_rmstuff;
     inode->ops.open = __twifs_openfile;
 


@@ -186,23 +168,36 @@ __twifs_create_inode(struct twifs_node* twi_node)
 }
 
 int
 }
 
 int

-__twifs_fwrite(struct v_file* file, void* buffer, size_t len, size_t fpos)
+__twifs_mount(struct v_superblock* vsb, struct v_dnode* mount_point)

 {
 {

-    struct twifs_node* twi_node = (struct twifs_node*)file->inode->data;
+    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)
+{
+    struct twifs_node* twi_node = (struct twifs_node*)inode->data;

     if (!twi_node || !twi_node->ops.write) {
         return ENOTSUP;
     }
     if (!twi_node || !twi_node->ops.write) {
         return ENOTSUP;
     }

-    return twi_node->ops.write(file, buffer, len, fpos);
+    return twi_node->ops.write(inode, buffer, len, fpos);

 }
 
 int
 }
 
 int

-__twifs_fread(struct v_file* file, void* buffer, size_t len, size_t fpos)
+__twifs_fread(struct v_inode* inode, void* buffer, size_t len, size_t fpos)

 {
 {

-    struct twifs_node* twi_node = (struct twifs_node*)file->inode->data;
+    struct twifs_node* twi_node = (struct twifs_node*)inode->data;

     if (!twi_node || !twi_node->ops.read) {
         return ENOTSUP;
     }
     if (!twi_node || !twi_node->ops.read) {
         return ENOTSUP;
     }

-    return twi_node->ops.read(file, buffer, len, fpos);
+    return twi_node->ops.read(inode, buffer, len, fpos);

 }
 
 struct twifs_node*
 }
 
 struct twifs_node*


@@ -222,10 +217,9 @@ __twifs_get_node(struct twifs_node* parent, struct hstr* name)
 }
 
 int
 }
 
 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
 }
 
 int


@@ -239,16 +233,25 @@ __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) {
 
     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;
 }
 
 int
         return 0;
     }
     return ENOENT;
 }
 
 int

-__twifs_iterate_dir(struct v_file* file, struct dir_context* dctx)
+__twifs_iterate_dir(struct v_inode* inode, struct dir_context* dctx)

 {
 {

-    struct twifs_node* twi_node = (struct twifs_node*)(file->inode->data);
+    struct twifs_node* twi_node = (struct twifs_node*)(inode->data);

     int counter = 0;
     struct twifs_node *pos, *n;
 
     int counter = 0;
     struct twifs_node *pos, *n;