X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/5fc669295655ec0eea7722aa4a48921dc6b700ec..fac3bbf2b2634f4f15cb33ece3acfa39db1433df:/lunaix-os/includes/lunaix/fs.h diff --git a/lunaix-os/includes/lunaix/fs.h b/lunaix-os/includes/lunaix/fs.h index 0f8d0d5..87f259a 100644 --- a/lunaix-os/includes/lunaix/fs.h +++ b/lunaix-os/includes/lunaix/fs.h @@ -3,44 +3,45 @@ #include #include +#include +#include #include #include #include +#include #define VFS_NAME_MAXLEN 128 #define VFS_MAX_FD 32 -#define VFS_INODE_TYPE_DIR 0x1 -#define VFS_INODE_TYPE_FILE 0x2 -#define VFS_INODE_TYPE_DEVICE 0x4 - -#define VFS_ETOOLONG -1 -#define VFS_ENOFS -2 -#define VFS_EBADMNT -3 -#define VFS_ENODIR -4 -#define VFS_EENDOFDIR -5 -#define VFS_ENOTFOUND -6 -#define VFS_ENOOPS -7 -#define VFS_EINVLD -8 -#define VFS_EEOF -9 +#define VFS_IFDIR 0x1 +#define VFS_IFFILE 0x2 +#define VFS_IFSEQDEV 0x4 +#define VFS_IFVOLDEV 0x8 +#define VFS_IFSYMLINK 0x16 #define VFS_WALK_MKPARENT 0x1 #define VFS_WALK_FSRELATIVE 0x2 -#define VFS_WALK_MKDIR 0x4 +#define VFS_WALK_PARENT 0x4 +#define VFS_WALK_NOFOLLOW 0x4 -#define VFS_IOBUF_FDIRTY 0x1 +#define FSTYPE_ROFS 0x1 #define VFS_VALID_CHAR(chr) \ ('A' <= (chr) && (chr) <= 'Z' || 'a' <= (chr) && (chr) <= 'z' || \ '0' <= (chr) && (chr) <= '9' || (chr) == '.' || (chr) == '_' || \ (chr) == '-') +extern struct hstr vfs_ddot; +extern struct hstr vfs_dot; + struct v_dnode; +struct pcache; struct filesystem { struct hlist_node fs_list; struct hstr fs_name; + uint32_t types; int (*mount)(struct v_superblock* vsb, struct v_dnode* mount_point); int (*unmount)(struct v_superblock* vsb); }; @@ -66,13 +67,14 @@ struct dir_context void* cb_data; void (*read_complete_callback)(struct dir_context* dctx, const char* name, + const int len, const int dtype); }; struct v_file_ops { - int (*write)(struct v_file* file, void* buffer, size_t len); - int (*read)(struct v_file* file, void* buffer, size_t len); + int (*write)(struct v_file* file, void* buffer, size_t len, size_t fpos); + int (*read)(struct v_file* file, void* buffer, size_t len, size_t fpos); int (*readdir)(struct v_file* file, struct dir_context* dctx); int (*seek)(struct v_file* file, size_t offset); int (*rename)(struct v_file* file, char* new_name); @@ -83,8 +85,10 @@ struct v_file_ops struct v_file { struct v_inode* inode; + struct v_dnode* dnode; struct llist_header* f_list; uint32_t f_pos; + uint32_t ref_count; void* data; // 允许底层FS绑定他的一些专有数据 struct v_file_ops ops; }; @@ -92,25 +96,36 @@ struct v_file struct v_fd { struct v_file* file; - int pos; + int flags; }; struct v_inode { uint32_t itype; - uint32_t ctime; - uint32_t mtime; - uint64_t lb_addr; - uint32_t ref_count; + time_t ctime; + time_t mtime; + time_t atime; + lba_t lb_addr; + uint32_t open_count; + uint32_t link_count; uint32_t lb_usage; + uint32_t fsize; + struct pcache* pg_cache; void* data; // 允许底层FS绑定他的一些专有数据 struct { - int (*open)(struct v_inode* inode, struct v_file* file); - int (*sync)(struct v_inode* inode); - int (*mkdir)(struct v_inode* inode, struct v_dnode* dnode); - int (*dir_lookup)(struct v_inode* inode, struct v_dnode* dnode); + int (*create)(struct v_inode* this); + int (*open)(struct v_inode* this, struct v_file* file); + int (*sync)(struct v_inode* this); + int (*mkdir)(struct v_inode* this, struct v_dnode* dnode); + int (*rmdir)(struct v_inode* this); + int (*unlink)(struct v_inode* this); + int (*link)(struct v_inode* this, struct v_dnode* new_name); + int (*read_symlink)(struct v_inode* this, const char** path_out); + int (*symlink)(struct v_inode* this, const char* target); + int (*dir_lookup)(struct v_inode* this, struct v_dnode* dnode); } ops; + struct v_file_ops default_fops; }; struct v_dnode @@ -133,6 +148,24 @@ struct v_fdtable struct v_fd* fds[VFS_MAX_FD]; }; +struct pcache_pg +{ + struct llist_header pg_list; + struct llist_header dirty_list; + void* pg; + uint32_t flags; + uint32_t fpos; +}; + +struct pcache +{ + struct btrie tree; + struct llist_header pages; + struct llist_header dirty; + uint32_t n_dirty; + uint32_t n_pages; +}; + /* --- file system manager --- */ void fsm_init(); @@ -143,6 +176,9 @@ fsm_register(struct filesystem* fs); struct filesystem* fsm_get(const char* fs_name); +void +vfs_init(); + struct v_dnode* vfs_dcache_lookup(struct v_dnode* parent, struct hstr* str); @@ -153,18 +189,23 @@ int vfs_walk(struct v_dnode* start, const char* path, struct v_dnode** dentry, + struct hstr* component, int walk_options); int -vfs_mount(const char* fs_name, bdev_t device, struct v_dnode* mnt_point); +vfs_mount(const char* target, const char* fs_name, bdev_t device); + +int +vfs_unmount(const char* target); int -vfs_unmount(struct v_dnode* mnt_point); +vfs_mount_at(const char* fs_name, bdev_t device, struct v_dnode* mnt_point); int -vfs_mkdir(const char* parent_path, - const char* component, - struct v_dnode** dentry); +vfs_unmount_at(struct v_dnode* mnt_point); + +int +vfs_mkdir(const char* path, struct v_dnode** dentry); int vfs_open(struct v_dnode* dnode, struct v_file** file); @@ -192,4 +233,40 @@ vfs_i_alloc(); void vfs_i_free(struct v_inode* inode); + +void +pcache_init(struct pcache* pcache); + +void +pcache_release_page(struct pcache* pcache, struct pcache_pg* page); + +struct pcache_pg* +pcache_new_page(struct pcache* pcache, uint32_t index); + +void +pcache_set_dirty(struct pcache* pcache, struct pcache_pg* pg); + +struct pcache_pg* +pcache_get_page(struct pcache* pcache, + uint32_t index, + uint32_t* offset, + struct pcache_pg** page); + +int +pcache_write(struct v_file* file, void* data, uint32_t len, uint32_t fpos); + +int +pcache_read(struct v_file* file, void* data, uint32_t len, uint32_t fpos); + +void +pcache_release(struct pcache* pcache); + +int +pcache_commit(struct v_file* file, struct pcache_pg* page); + +void +pcache_invalidate(struct v_file* file, struct pcache_pg* page); + +void +pcache_commit_all(struct v_file* file); #endif /* __LUNAIX_VFS_H */