int
__twifs_mkdir(struct v_inode* inode, struct v_dnode* dnode);
+int
+__twifs_rmstuff(struct v_inode* inode);
+
void
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);
return node;
}
-void
+int
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);
+ 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*
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;
}
__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;
}
.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;
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)
{