X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/c6de44b989e9d7286337e4cbf4d82d919f9120e6..5f4f16c074be65639b5c3333441d48b1d418104c:/lunaix-os/kernel/fs/twifs/twifs.c?ds=sidebyside diff --git a/lunaix-os/kernel/fs/twifs/twifs.c b/lunaix-os/kernel/fs/twifs/twifs.c index 312c0a4..3679ee1 100644 --- a/lunaix-os/kernel/fs/twifs/twifs.c +++ b/lunaix-os/kernel/fs/twifs/twifs.c @@ -8,21 +8,23 @@ * @copyright Copyright (c) 2022 * */ -#include +#include #include #include -#include +#include #include #include #include #include #include +#include + static struct twifs_node* fs_root; static struct cake_pile* twi_pile; -static volatile uint32_t inode_id = 0; +static volatile u32_t inode_id = 0; extern const struct v_file_ops twifs_file_ops; extern const struct v_inode_ops twifs_inode_ops; @@ -31,7 +33,7 @@ struct twifs_node* __twifs_new_node(struct twifs_node* parent, const char* name, int name_len, - uint32_t itype) + u32_t itype) { struct twifs_node* node = cake_grab(twi_pile); memset(node, 0, sizeof(*node)); @@ -54,8 +56,15 @@ __twifs_new_node(struct twifs_node* parent, void __twifs_init_inode(struct v_superblock* vsb, struct v_inode* inode) { - inode->ops = &twifs_inode_ops; - inode->default_fops = &twifs_file_ops; + inode->ops = (struct v_inode_ops*)&twifs_inode_ops; + inode->default_fops = (struct v_file_ops*)&twifs_file_ops; + + + // we set default access right to be 0660. + // TODO need a way to allow this to be changed + + fsapi_inode_setaccess(inode, FSACL_u(R, W, _) | FSACL_g(R, W, _)); + fsapi_inode_setowner(inode, 0, 0); } int @@ -77,6 +86,12 @@ __twifs_mount(struct v_superblock* vsb, struct v_dnode* mount_point) return 0; } +int +__twifs_unmount(struct v_superblock* vsb) +{ + return 0; +} + int __twifs_fwrite(struct v_inode* inode, void* buffer, size_t len, size_t fpos) { @@ -87,6 +102,12 @@ __twifs_fwrite(struct v_inode* inode, void* buffer, size_t len, size_t fpos) return twi_node->ops.write(inode, buffer, len, fpos); } +int +__twifs_fwrite_pg(struct v_inode* inode, void* buffer, size_t fpos) +{ + return __twifs_fwrite(inode, buffer, PAGE_SIZE, fpos); +} + int __twifs_fread(struct v_inode* inode, void* buffer, size_t len, size_t fpos) { @@ -97,6 +118,12 @@ __twifs_fread(struct v_inode* inode, void* buffer, size_t len, size_t fpos) return twi_node->ops.read(inode, buffer, len, fpos); } +int +__twifs_fread_pg(struct v_inode* inode, void* buffer, size_t fpos) +{ + return __twifs_fread(inode, buffer, PAGE_SIZE, fpos); +} + struct twifs_node* __twifs_get_node(struct twifs_node* parent, struct hstr* name) { @@ -118,7 +145,7 @@ __twifs_dirlookup(struct v_inode* inode, struct v_dnode* dnode) { struct twifs_node* twi_node = (struct twifs_node*)inode->data; - if (!(twi_node->itype & VFS_IFDIR)) { + if (!check_directory_node(inode)) { return ENOTDIR; } @@ -151,14 +178,17 @@ int __twifs_iterate_dir(struct v_file* file, struct dir_context* dctx) { struct twifs_node* twi_node = (struct twifs_node*)(file->inode->data); - int counter = 0; + unsigned int counter = 2; struct twifs_node *pos, *n; + if (fsapi_handle_pseudo_dirent(file, dctx)) { + return 1; + } + llist_for_each(pos, n, &twi_node->children, siblings) { - if (counter++ >= dctx->index) { - dctx->index = counter; - dctx->read_complete_callback( + if (counter++ >= file->f_pos) { + fsapi_dir_report( dctx, pos->name.value, pos->name.len, vfs_get_dtype(pos->itype)); return 1; } @@ -180,7 +210,7 @@ __twifs_openfile(struct v_inode* inode, struct v_file* file) int twifs_rm_node(struct twifs_node* node) { - if ((node->itype & VFS_IFDIR) && !llist_empty(&node->children)) { + if (check_itype(node->itype, VFS_IFDIR) && !llist_empty(&node->children)) { return ENOTEMPTY; } llist_delete(&node->siblings); @@ -192,9 +222,9 @@ struct twifs_node* twifs_file_node_vargs(struct twifs_node* parent, const char* fmt, va_list args) { char buf[VFS_NAME_MAXLEN]; - size_t len = __ksprintf_internal(buf, fmt, VFS_NAME_MAXLEN, args); + size_t len = ksnprintfv(buf, fmt, VFS_NAME_MAXLEN, args); - return __twifs_new_node(parent ? parent : fs_root, buf, len, VFS_IFSEQDEV); + return __twifs_new_node(parent ? parent : fs_root, buf, len, F_FILE); } struct twifs_node* @@ -217,7 +247,7 @@ twifs_dir_node(struct twifs_node* parent, const char* fmt, ...) va_start(args, fmt); char buf[VFS_NAME_MAXLEN]; - size_t len = __ksprintf_internal(buf, fmt, VFS_NAME_MAXLEN, args); + size_t len = ksnprintfv(buf, fmt, VFS_NAME_MAXLEN, args); struct twifs_node* twi_node = __twifs_new_node(parent ? parent : fs_root, buf, len, VFS_IFDIR); @@ -229,18 +259,22 @@ twifs_dir_node(struct twifs_node* parent, const char* fmt, ...) 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); + struct filesystem* fs; + fs = fsapi_fs_declare("twifs", FSTYPE_PSEUDO | FSTYPE_ROFS); + + fsapi_fs_set_mntops(fs, __twifs_mount, __twifs_unmount); + fsapi_fs_finalise(fs); + twi_pile = cake_new_pile("twifs_node", sizeof(struct twifs_node), 1, 0); fs_root = twifs_dir_node(NULL, NULL, 0, 0); } +EXPORT_FILE_SYSTEM(twifs, twifs_init); + +void +twifs_register_plugins() +{ + ldga_invoke_fn0(twiplugin_inits); +} int __twifs_twimap_file_read(struct v_inode* inode, @@ -268,7 +302,9 @@ twifs_mapping(struct twifs_node* parent, void* data, const char* fmt, ...) const struct v_file_ops twifs_file_ops = { .close = default_file_close, .read = __twifs_fread, + .read_page = __twifs_fread_pg, .write = __twifs_fwrite, + .write_page = __twifs_fwrite_pg, .readdir = __twifs_iterate_dir }; const struct v_inode_ops twifs_inode_ops = { .dir_lookup = __twifs_dirlookup,