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_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_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_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()
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);
+ fs_root = twifs_dir_node(NULL, NULL, 0, 0);
}
struct twifs_node*
-__twifs_new_node(struct twifs_node* parent, const char* name, int name_len)
+__twifs_new_node(struct twifs_node* parent,
+ const char* name,
+ int name_len,
+ uint32_t itype)
{
struct twifs_node* node = cake_grab(twi_pile);
memset(node, 0, sizeof(*node));
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);
int
twifs_rm_node(struct twifs_node* node)
{
- if ((node->itype & VFS_INODE_TYPE_DIR) && !llist_empty(&node->children)) {
+ if ((node->itype & VFS_IFDIR) && !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*
-twifs_file_node(struct twifs_node* parent, const char* name, int name_len)
+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);
- twi_node->itype = VFS_INODE_TYPE_FILE;
-
- struct v_inode* twi_inode = __twifs_create_inode(twi_node);
- twi_node->inode = twi_inode;
+ 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)
+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);
return node;
}
- struct twifs_node* twi_node = __twifs_new_node(parent, name, name_len);
- twi_node->itype = VFS_INODE_TYPE_DIR;
-
- struct v_inode* twi_inode = __twifs_create_inode(twi_node);
- twi_node->fops.readdir = __twifs_iterate_dir;
- twi_node->inode = twi_inode;
+ 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)
+twifs_toplevel_node(const char* name, int name_len, uint32_t itype)
{
- return twifs_dir_node(fs_root, name, name_len);
+ return twifs_dir_node(fs_root, name, name_len, 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_INODE_TYPE_DIR)) {
- return ENOTDIR;
- }
- struct twifs_node* new_node =
- twifs_dir_node(parent_node, dnode->name.value, dnode->name.len);
- 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.unlink = __twifs_rmstuff;
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;
}
+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)
+{
+ struct twifs_node* twi_node = (struct twifs_node*)inode->data;
+ if (!twi_node || !twi_node->ops.write) {
+ return ENOTSUP;
+ }
+ return twi_node->ops.write(inode, buffer, len, fpos);
+}
+
+int
+__twifs_fread(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.read) {
+ return ENOTSUP;
+ }
+ return twi_node->ops.read(inode, buffer, len, fpos);
+}
+
struct twifs_node*
__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
{
struct twifs_node* twi_node = (struct twifs_node*)inode->data;
- if (!(twi_node->itype & VFS_INODE_TYPE_DIR)) {
+ if (!(twi_node->itype & VFS_IFDIR)) {
return ENOTDIR;
}
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
-__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;
{
struct twifs_node* twi_node = (struct twifs_node*)inode->data;
if (twi_node) {
- file->inode = twi_node->inode;
- file->ops = twi_node->fops;
return 0;
}
return ENOTSUP;
git://scm.lunaixsky.com / lunaix-os.git / blobdiff