Merge branch 'master' into vfs-dev

[lunaix-os.git] / lunaix-os / includes / lunaix / fs.h

diff --git a/lunaix-os/includes/lunaix/fs.h b/lunaix-os/includes/lunaix/fs.h
index fffb26f5cd07f69db888544436dc450d14e74e18..0764a61c26af42b9562d97d13b4252b5699b17d7 100644 (file)
--- a/lunaix-os/includes/lunaix/fs.h
+++ b/lunaix-os/includes/lunaix/fs.h
@@ -3,6 +3,8 @@
 
 #include <hal/ahci/hba.h>
 #include <lunaix/block.h>
+#include <lunaix/clock.h>
+#include <lunaix/ds/btrie.h>
 #include <lunaix/ds/hashtable.h>
 #include <lunaix/ds/hstr.h>
 #include <lunaix/ds/llist.h>
@@ -11,23 +13,16 @@
 #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 0x3
-
-#define VFS_ENOFS -2
-#define VFS_EBADMNT -3
-
-#define VFS_EENDOFDIR -5
-
-#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_PARENT 0x4
-
-#define VFS_IOBUF_FDIRTY 0x1
+#define VFS_WALK_NOFOLLOW 0x4
 
 #define FSTYPE_ROFS 0x1
 
@@ -40,6 +35,7 @@ extern struct hstr vfs_ddot;
 extern struct hstr vfs_dot;
 
 struct v_dnode;
+struct pcache;
 
 struct filesystem
 {
@@ -77,8 +73,8 @@ struct dir_context
 
 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);
@@ -92,6 +88,7 @@ struct v_file
     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;
 };
@@ -99,29 +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;
+    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 (*create)(struct v_inode* inode, struct v_file* file);
-        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 (*rmdir)(struct v_inode* inode);
-        int (*unlink)(struct v_inode* inode);
-        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
@@ -144,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();
@@ -211,4 +233,43 @@ vfs_i_alloc();
 
 void
 vfs_i_free(struct v_inode* inode);
+
+int
+vfs_dup_fd(struct v_fd* old, struct v_fd** new);
+
+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 */