X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/af8e873ae38b72a56a89485c62bb5ccd22a9f8a7..fb2d2e17e3ffc4bddf944dc67a6d86fe9453bb5a:/lunaix-os/includes/lunaix/fs.h

diff --git a/lunaix-os/includes/lunaix/fs.h b/lunaix-os/includes/lunaix/fs.h
index d0d59d1..c80eb22 100644
--- a/lunaix-os/includes/lunaix/fs.h
+++ b/lunaix-os/includes/lunaix/fs.h
@@ -1,15 +1,16 @@
 #ifndef __LUNAIX_VFS_H
 #define __LUNAIX_VFS_H
 
-#include <hal/ahci/hba.h>
-#include <lunaix/block.h>
 #include <lunaix/clock.h>
+#include <lunaix/device.h>
 #include <lunaix/ds/btrie.h>
 #include <lunaix/ds/hashtable.h>
 #include <lunaix/ds/hstr.h>
 #include <lunaix/ds/llist.h>
 #include <lunaix/ds/lru.h>
+#include <lunaix/ds/mutex.h>
 #include <lunaix/status.h>
+#include <stdatomic.h>
 
 #define VFS_NAME_MAXLEN 128
 #define VFS_MAX_FD 32
@@ -47,6 +48,7 @@ struct filesystem
     struct hlist_node fs_list;
     struct hstr fs_name;
     uint32_t types;
+    int fs_id; // can be used to detect fs type on partition
     int (*mount)(struct v_superblock* vsb, struct v_dnode* mount_point);
     int (*unmount)(struct v_superblock* vsb);
 };
@@ -55,7 +57,7 @@ struct v_superblock
 {
     struct llist_header sb_list;
     int fs_id;
-    bdev_t dev;
+    struct device* dev;
     struct v_dnode* root;
     struct filesystem* fs;
     uint32_t iobuf_size;
@@ -82,7 +84,6 @@ struct v_file_ops
     int (*read)(struct v_inode* inode, void* buffer, size_t len, size_t fpos);
     int (*readdir)(struct v_inode* inode, struct dir_context* dctx);
     int (*seek)(struct v_inode* inode, size_t offset);
-    int (*rename)(struct v_inode* inode, char* new_name);
     int (*close)(struct v_file* file);
     int (*sync)(struct v_inode* inode);
 };
@@ -93,7 +94,7 @@ struct v_file
     struct v_dnode* dnode;
     struct llist_header* f_list;
     uint32_t f_pos;
-    uint32_t ref_count;
+    atomic_ulong ref_count;
     struct v_file_ops ops;
 };
 
@@ -105,6 +106,8 @@ struct v_fd
 
 struct v_inode
 {
+    uint32_t id;
+    mutex_t lock;
     uint32_t itype;
     time_t ctime;
     time_t mtime;
@@ -114,26 +117,33 @@ struct v_inode
     uint32_t link_count;
     uint32_t lb_usage;
     uint32_t fsize;
+    struct hlist_node hash_list;
+    struct lru_node lru;
     struct pcache* pg_cache;
     void* data; // 允许底层FS绑定他的一些专有数据
     struct
     {
-        int (*create)(struct v_inode* this);
+        int (*create)(struct v_inode* this, struct v_dnode* dnode);
         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 (*rmdir)(struct v_inode* this, struct v_dnode* dir);
         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 (*set_symlink)(struct v_inode* this, const char* target);
         int (*dir_lookup)(struct v_inode* this, struct v_dnode* dnode);
+        int (*rename)(struct v_inode* from_inode,
+                      struct v_dnode* from_dnode,
+                      struct v_dnode* to_dnode);
     } ops;
     struct v_file_ops default_fops;
 };
 
 struct v_dnode
 {
+    mutex_t lock; // sync the path walking
+    struct lru_node lru;
     struct hstr name;
     struct v_inode* inode;
     struct v_dnode* parent;
@@ -141,11 +151,7 @@ struct v_dnode
     struct llist_header children;
     struct llist_header siblings;
     struct v_superblock* super_block;
-    uint32_t ref_count;
-    struct
-    {
-        void (*destruct)(struct v_dnode* dnode);
-    } ops;
+    atomic_ulong ref_count;
 };
 
 struct v_fdtable
@@ -153,16 +159,6 @@ struct v_fdtable
     struct v_fd* fds[VFS_MAX_FD];
 };
 
-struct pcache_pg
-{
-    struct llist_header pg_list;
-    struct llist_header dirty_list;
-    struct lru_node lru;
-    void* pg;
-    uint32_t flags;
-    uint32_t fpos;
-};
-
 struct pcache
 {
     struct v_inode* master;
@@ -173,6 +169,16 @@ struct pcache
     uint32_t n_pages;
 };
 
+struct pcache_pg
+{
+    struct llist_header pg_list;
+    struct llist_header dirty_list;
+    struct lru_node lru;
+    struct pcache* holder;
+    void* pg;
+    uint32_t flags;
+    uint32_t fpos;
+};
 /* --- file system manager --- */
 void
 fsm_init();
@@ -200,13 +206,15 @@ vfs_walk(struct v_dnode* start,
          int walk_options);
 
 int
-vfs_mount(const char* target, const char* fs_name, bdev_t device);
+vfs_mount(const char* target, const char* fs_name, struct device* device);
 
 int
 vfs_unmount(const char* target);
 
 int
-vfs_mount_at(const char* fs_name, bdev_t device, struct v_dnode* mnt_point);
+vfs_mount_at(const char* fs_name,
+             struct device* device,
+             struct v_dnode* mnt_point);
 
 int
 vfs_unmount_at(struct v_dnode* mnt_point);
@@ -223,6 +231,9 @@ vfs_close(struct v_file* file);
 int
 vfs_fsync(struct v_file* file);
 
+void
+vfs_assign_inode(struct v_dnode* assign_to, struct v_inode* inode);
+
 struct v_superblock*
 vfs_sb_alloc();
 
@@ -236,7 +247,7 @@ void
 vfs_d_free(struct v_dnode* dnode);
 
 struct v_inode*
-vfs_i_alloc();
+vfs_i_alloc(dev_t device_id, uint32_t inode_id);
 
 void
 vfs_i_free(struct v_inode* inode);