static struct cake_pile* twi_pile;
+static volatile int32_t inode_id = 0;
+
int
__twifs_dirlookup(struct v_inode* inode, struct v_dnode* dnode);
__twifs_create_inode(struct twifs_node* twi_node);
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);
__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_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
-__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()
twifs->fs_name = HSTR("twifs", 5);
twifs->mount = __twifs_mount;
twifs->types = FSTYPE_ROFS;
+ twifs->fs_id = 0;
fsm_register(twifs);
return ENOTEMPTY;
}
llist_delete(&node->siblings);
- vfs_i_free(node->inode);
cake_release(twi_pile, node);
return 0;
}
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)
{
- mount_point->inode = fs_root->inode;
+ vfs_assign_inode(mount_point, fs_root->inode);
return 0;
}
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 };
+ struct v_inode* inode = vfs_i_alloc(1, inode_id++);
+ inode->itype = twi_node->itype;
+ inode->data = twi_node;
+
+ 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;
}
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)
{
- 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.write) {
return ENOTSUP;
}
- return twi_node->ops.write(file, buffer, len, fpos);
+ return twi_node->ops.write(inode, buffer, len, fpos);
}
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;
}
- return twi_node->ops.read(file, buffer, len, fpos);
+ return twi_node->ops.read(inode, buffer, len, fpos);
}
struct twifs_node*
}
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
struct twifs_node* child_node = __twifs_get_node(twi_node, &dnode->name);
if (child_node) {
- dnode->inode = child_node->inode;
+ vfs_assign_inode(dnode, child_node->inode);
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;