refactor: mount system reworked

[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 fcca8abaa513c4caee6917d04432c56521186ba2..e95fbaddc21edb5f66302737a0965c7660c6fd21 100644 (file)
--- a/lunaix-os/includes/lunaix/fs.h
+++ b/lunaix-os/includes/lunaix/fs.h
@@ -26,6 +26,11 @@
 #define VFS_WALK_PARENT 0x4
 #define VFS_WALK_NOFOLLOW 0x4
 
 #define VFS_WALK_PARENT 0x4
 #define VFS_WALK_NOFOLLOW 0x4
 

+#define VFS_HASHTABLE_BITS 10
+#define VFS_HASHTABLE_SIZE (1 << VFS_HASHTABLE_BITS)
+#define VFS_HASH_MASK (VFS_HASHTABLE_SIZE - 1)
+#define VFS_HASHBITS (32 - VFS_HASHTABLE_BITS)
+

 #define FSTYPE_ROFS 0x1
 
 #define VFS_VALID_CHAR(chr)                                                    \
 #define FSTYPE_ROFS 0x1
 
 #define VFS_VALID_CHAR(chr)                                                    \


@@ -36,6 +41,8 @@
 extern struct hstr vfs_ddot;
 extern struct hstr vfs_dot;
 
 extern struct hstr vfs_ddot;
 extern struct hstr vfs_dot;
 

+typedef uint32_t inode_t;
+

 struct v_dnode;
 struct v_inode;
 struct v_superblock;
 struct v_dnode;
 struct v_inode;
 struct v_superblock;


@@ -48,6 +55,7 @@ struct filesystem
     struct hlist_node fs_list;
     struct hstr fs_name;
     uint32_t types;
     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);
 };
     int (*mount)(struct v_superblock* vsb, struct v_dnode* mount_point);
     int (*unmount)(struct v_superblock* vsb);
 };


@@ -55,11 +63,11 @@ struct filesystem
 struct v_superblock
 {
     struct llist_header sb_list;
 struct v_superblock
 {
     struct llist_header sb_list;

-    int fs_id;

     struct device* dev;
     struct v_dnode* root;
     struct filesystem* fs;
     uint32_t iobuf_size;
     struct device* dev;
     struct v_dnode* root;
     struct filesystem* fs;
     uint32_t iobuf_size;

+    struct hbucket* i_cache;

     struct
     {
         uint32_t (*read_capacity)(struct v_superblock* vsb);
     struct
     {
         uint32_t (*read_capacity)(struct v_superblock* vsb);


@@ -105,7 +113,7 @@ struct v_fd
 
 struct v_inode
 {
 
 struct v_inode
 {

-    uint32_t id;
+    inode_t id;

     mutex_t lock;
     uint32_t itype;
     time_t ctime;
     mutex_t lock;
     uint32_t itype;
     time_t ctime;


@@ -116,6 +124,8 @@ struct v_inode
     uint32_t link_count;
     uint32_t lb_usage;
     uint32_t fsize;
     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
     struct pcache* pg_cache;
     void* data; // 允许底层FS绑定他的一些专有数据
     struct


@@ -124,11 +134,11 @@ struct v_inode
         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 (*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 (*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,
         int (*dir_lookup)(struct v_inode* this, struct v_dnode* dnode);
         int (*rename)(struct v_inode* from_inode,
                       struct v_dnode* from_dnode,


@@ -137,9 +147,22 @@ struct v_inode
     struct v_file_ops default_fops;
 };
 
     struct v_file_ops default_fops;
 };
 

+struct v_mount
+{
+    mutex_t lock;
+    struct llist_header list;
+    struct llist_header submnts;
+    struct llist_header sibmnts;
+    struct v_mount* parent;
+    struct v_dnode* mnt_point;
+    struct v_superblock* super_block;
+    uint32_t busy_counter;
+};
+

 struct v_dnode
 {
     mutex_t lock; // sync the path walking
 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;
     struct hstr name;
     struct v_inode* inode;
     struct v_dnode* parent;


@@ -147,7 +170,10 @@ struct v_dnode
     struct llist_header children;
     struct llist_header siblings;
     struct v_superblock* super_block;
     struct llist_header children;
     struct llist_header siblings;
     struct v_superblock* super_block;

+    struct v_mount* mnt;

     atomic_ulong ref_count;
     atomic_ulong ref_count;

+
+    void* data;

 };
 
 struct v_fdtable
 };
 
 struct v_fdtable


@@ -155,16 +181,6 @@ struct v_fdtable
     struct v_fd* fds[VFS_MAX_FD];
 };
 
     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;
 struct pcache
 {
     struct v_inode* master;


@@ -175,6 +191,16 @@ struct pcache
     uint32_t n_pages;
 };
 
     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();
 /* --- file system manager --- */
 void
 fsm_init();


@@ -227,6 +253,9 @@ vfs_close(struct v_file* file);
 int
 vfs_fsync(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();
 
 struct v_superblock*
 vfs_sb_alloc();
 


@@ -240,7 +269,10 @@ void
 vfs_d_free(struct v_dnode* dnode);
 
 struct v_inode*
 vfs_d_free(struct v_dnode* dnode);
 
 struct v_inode*

-vfs_i_alloc();
+vfs_i_alloc(struct v_superblock* sb,
+            uint32_t inode_id,
+            void (*init)(struct v_inode* inode, void* data),
+            void* data);

 
 void
 vfs_i_free(struct v_inode* inode);
 
 void
 vfs_i_free(struct v_inode* inode);


@@ -283,4 +315,23 @@ pcache_commit_all(struct v_inode* inode);
 
 void
 pcache_invalidate(struct pcache* pcache, struct pcache_pg* page);
 
 void
 pcache_invalidate(struct pcache* pcache, struct pcache_pg* page);

+
+/**
+ * @brief 将挂载点标记为繁忙
+ *
+ * @param mnt
+ */
+void
+mnt_mkbusy(struct v_mount* mnt);
+
+/**
+ * @brief 将挂载点标记为清闲
+ *
+ * @param mnt
+ */
+void
+mnt_chillax(struct v_mount* mnt);
+
+struct v_mount*
+vfs_create_mount(struct v_mount* parent, struct v_dnode* mnt_point);

 #endif /* __LUNAIX_VFS_H */
 #endif /* __LUNAIX_VFS_H */