static struct cake_pile* twi_pile;
-static volatile int32_t inode_id = 0;
+static volatile uint32_t inode_id = 0;
-int
-__twifs_dirlookup(struct v_inode* inode, struct v_dnode* dnode);
-
-int
-__twifs_openfile(struct v_inode* inode, struct v_file* file);
-
-struct twifs_node*
-__twifs_get_node(struct twifs_node* parent, struct hstr* name);
-
-struct v_inode*
-__twifs_get_inode(struct twifs_node* twi_node);
-
-int
-__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_mkdir(struct v_inode* inode, struct v_dnode* dnode);
-
-int
-__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);
-
-int
-__twifs_fread(struct v_inode* inode, void* buffer, size_t len, size_t fpos);
-
-void
-twifs_init()
-{
- twi_pile = cake_new_pile("twifs_node", sizeof(struct twifs_node), 1, 0);
-
- struct filesystem* twifs = vzalloc(sizeof(struct filesystem));
- twifs->fs_name = HSTR("twifs", 5);
- twifs->mount = __twifs_mount;
- twifs->types = FSTYPE_ROFS;
- twifs->fs_id = 0;
-
- fsm_register(twifs);
-
- fs_root = twifs_dir_node(NULL, NULL, 0, 0);
-}
+extern const struct v_file_ops twifs_file_ops;
+extern const struct v_inode_ops twifs_inode_ops;
struct twifs_node*
__twifs_new_node(struct twifs_node* parent,
return node;
}
-int
-twifs_rm_node(struct twifs_node* node)
-{
- if ((node->itype & VFS_IFDIR) && !llist_empty(&node->children)) {
- return ENOTEMPTY;
- }
- llist_delete(&node->siblings);
- cake_release(twi_pile, node);
- return 0;
-}
-
-struct twifs_node*
-twifs_file_node(struct twifs_node* parent,
- const char* name,
- int name_len,
- uint32_t itype)
-{
- struct twifs_node* twi_node =
- __twifs_new_node(parent, name, name_len, VFS_IFFILE | itype);
-
- return twi_node;
-}
-
-struct twifs_node*
-twifs_dir_node(struct twifs_node* parent,
- const char* name,
- int name_len,
- uint32_t itype)
-{
- struct hstr hname = HSTR(name, name_len);
- hstr_rehash(&hname, HSTR_FULL_HASH);
- struct twifs_node* node = __twifs_get_node(parent, &hname);
- if (node) {
- return node;
- }
-
- struct twifs_node* twi_node =
- __twifs_new_node(parent, name, name_len, VFS_IFDIR | itype);
-
- return twi_node;
-}
-
-struct twifs_node*
-twifs_toplevel_node(const char* name, int name_len, uint32_t itype)
-{
- return twifs_dir_node(fs_root, name, name_len, itype);
-}
-
-int
-__twifs_mkdir(struct v_inode* inode, struct v_dnode* dnode)
-{
- return ENOTSUP;
-}
-
void
-__twifs_init_inode(struct v_inode* inode, void* data)
+__twifs_init_inode(struct v_superblock* vsb, struct v_inode* inode)
{
- 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;
-
- inode->ops.dir_lookup = __twifs_dirlookup;
- inode->ops.mkdir = __twifs_mkdir;
- inode->ops.rmdir = __twifs_rmstuff;
- inode->ops.open = __twifs_openfile;
-
- inode->default_fops = (struct v_file_ops){ .read = __twifs_fread,
- .write = __twifs_fwrite,
- .readdir = __twifs_iterate_dir };
-
- return inode;
+ inode->ops = &twifs_inode_ops;
+ inode->default_fops = &twifs_file_ops;
}
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);
+ vsb->ops.init_inode = __twifs_init_inode;
+
+ struct v_inode* inode = vfs_i_alloc(vsb);
if (!inode) {
return ENOMEM;
}
+
+ inode->id = fs_root->ino_id;
+ inode->itype = fs_root->itype;
+ inode->data = fs_root;
+
+ vfs_i_addhash(inode);
vfs_assign_inode(mount_point, inode);
return 0;
}
return NULL;
}
-int
-__twifs_rmstuff(struct v_inode* inode, struct v_dnode* dir)
-{
- return ENOTSUP;
-}
-
int
__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 v_inode* inode = vfs_i_alloc(dnode->super_block,
- child_node->ino_id,
- __twifs_init_inode,
- child_node);
- if (!inode) {
+ struct v_inode* inode = vfs_i_find(inode->sb, child_node->ino_id);
+ if (inode) {
+ goto done;
+ }
+
+ if (!(inode = vfs_i_alloc(inode->sb))) {
return ENOENT;
}
- dnode->data = twi_node->data;
+ inode->id = child_node->ino_id;
+ inode->itype = child_node->itype;
+ inode->data = child_node;
+
+ vfs_i_addhash(inode);
+
+ done:
+ dnode->data = child_node->data;
vfs_assign_inode(dnode, inode);
return 0;
}
}
int
-__twifs_iterate_dir(struct v_inode* inode, struct dir_context* dctx)
+__twifs_iterate_dir(struct v_file* file, struct dir_context* dctx)
{
- struct twifs_node* twi_node = (struct twifs_node*)(inode->data);
+ struct twifs_node* twi_node = (struct twifs_node*)(file->inode->data);
int counter = 0;
struct twifs_node *pos, *n;
dctx->index = counter;
dctx->read_complete_callback(
dctx, pos->name.value, pos->name.len, pos->itype);
- return 0;
+ return 1;
}
}
- return 1;
+ return 0;
}
int
}
return ENOTSUP;
}
+
+int
+twifs_rm_node(struct twifs_node* node)
+{
+ if ((node->itype & VFS_IFDIR) && !llist_empty(&node->children)) {
+ return ENOTEMPTY;
+ }
+ llist_delete(&node->siblings);
+ cake_release(twi_pile, node);
+ return 0;
+}
+
+struct twifs_node*
+twifs_file_node(struct twifs_node* parent,
+ const char* name,
+ int name_len,
+ uint32_t itype)
+{
+ struct twifs_node* twi_node =
+ __twifs_new_node(parent, name, name_len, VFS_IFFILE | itype);
+
+ return twi_node;
+}
+
+struct twifs_node*
+twifs_dir_node(struct twifs_node* parent,
+ const char* name,
+ int name_len,
+ uint32_t itype)
+{
+ struct hstr hname = HSTR(name, name_len);
+ hstr_rehash(&hname, HSTR_FULL_HASH);
+ struct twifs_node* node = __twifs_get_node(parent, &hname);
+ if (node) {
+ return node;
+ }
+
+ struct twifs_node* twi_node =
+ __twifs_new_node(parent, name, name_len, VFS_IFDIR | itype);
+
+ return twi_node;
+}
+
+struct twifs_node*
+twifs_toplevel_node(const char* name, int name_len, uint32_t itype)
+{
+ return twifs_dir_node(fs_root, name, name_len, itype);
+}
+
+void
+twifs_init()
+{
+ twi_pile = cake_new_pile("twifs_node", sizeof(struct twifs_node), 1, 0);
+
+ struct filesystem* twifs = vzalloc(sizeof(struct filesystem));
+ twifs->fs_name = HSTR("twifs", 5);
+ twifs->mount = __twifs_mount;
+ twifs->types = FSTYPE_ROFS;
+ twifs->fs_id = 0;
+
+ fsm_register(twifs);
+
+ fs_root = twifs_dir_node(NULL, NULL, 0, 0);
+}
+
+const struct v_file_ops twifs_file_ops = { .close = default_file_close,
+ .read = __twifs_fread,
+ .write = __twifs_fwrite,
+ .readdir = __twifs_iterate_dir };
+
+const struct v_inode_ops twifs_inode_ops = { .dir_lookup = __twifs_dirlookup,
+ .mkdir = default_inode_mkdir,
+ .rmdir = default_inode_rmdir,
+ .open = __twifs_openfile };
\ No newline at end of file
git://scm.lunaixsky.com / lunaix-os.git / blobdiff