refactor: add a simple ramfs for rootfs. Twifs should have more specific job in future.

[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 e95fbaddc21edb5f66302737a0965c7660c6fd21..d43293be06075be91f99f368c1205480bb87f263 100644 (file)
--- a/lunaix-os/includes/lunaix/fs.h
+++ b/lunaix-os/includes/lunaix/fs.h
@@ -24,7 +24,7 @@
 #define VFS_WALK_MKPARENT 0x1
 #define VFS_WALK_FSRELATIVE 0x2
 #define VFS_WALK_PARENT 0x4
 #define VFS_WALK_MKPARENT 0x1
 #define VFS_WALK_FSRELATIVE 0x2
 #define VFS_WALK_PARENT 0x4

-#define VFS_WALK_NOFOLLOW 0x4
+#define VFS_WALK_NOFOLLOW 0x8

 
 #define VFS_HASHTABLE_BITS 10
 #define VFS_HASHTABLE_SIZE (1 << VFS_HASHTABLE_BITS)
 
 #define VFS_HASHTABLE_BITS 10
 #define VFS_HASHTABLE_SIZE (1 << VFS_HASHTABLE_BITS)


@@ -33,29 +33,40 @@
 
 #define FSTYPE_ROFS 0x1
 
 
 #define FSTYPE_ROFS 0x1
 

+#define DO_STATUS(errno) SYSCALL_ESTATUS(__current->k_status = errno)
+#define DO_STATUS_OR_RETURN(errno) ({ errno < 0 ? DO_STATUS(errno) : errno; })
+
+#define TEST_FD(fd) (fd >= 0 && fd < VFS_MAX_FD)
+

 #define VFS_VALID_CHAR(chr)                                                    \
     (('A' <= (chr) && (chr) <= 'Z') || ('a' <= (chr) && (chr) <= 'z') ||       \
      ('0' <= (chr) && (chr) <= '9') || (chr) == '.' || (chr) == '_' ||         \
      (chr) == '-')
 
 #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;
-

 typedef uint32_t inode_t;
 
 struct v_dnode;
 struct v_inode;
 struct v_superblock;
 struct v_file;
 typedef uint32_t inode_t;
 
 struct v_dnode;
 struct v_inode;
 struct v_superblock;
 struct v_file;

+struct v_file_ops;
+struct v_inode_ops;

 struct v_fd;
 struct pcache;
 
 struct v_fd;
 struct pcache;
 

+extern struct v_file_ops default_file_ops;
+extern struct v_inode_ops default_inode_ops;
+
+extern struct hstr vfs_ddot;
+extern struct hstr vfs_dot;
+extern struct v_dnode* vfs_sysroot;
+

 struct filesystem
 {
     struct hlist_node fs_list;
     struct hstr fs_name;
     uint32_t types;
 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 fs_id;

     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);
 };


@@ -72,6 +83,7 @@ struct v_superblock
     {
         uint32_t (*read_capacity)(struct v_superblock* vsb);
         uint32_t (*read_usage)(struct v_superblock* vsb);
     {
         uint32_t (*read_capacity)(struct v_superblock* vsb);
         uint32_t (*read_usage)(struct v_superblock* vsb);

+        void (*init_inode)(struct v_superblock* vsb, struct v_inode* inode);

     } ops;
 };
 
     } ops;
 };
 


@@ -89,10 +101,27 @@ struct v_file_ops
 {
     int (*write)(struct v_inode* inode, void* buffer, size_t len, size_t fpos);
     int (*read)(struct v_inode* inode, void* buffer, size_t len, size_t fpos);
 {
     int (*write)(struct v_inode* inode, void* buffer, size_t len, size_t fpos);
     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 (*readdir)(struct v_file* file, struct dir_context* dctx);

     int (*seek)(struct v_inode* inode, size_t offset);
     int (*close)(struct v_file* file);
     int (*seek)(struct v_inode* inode, size_t offset);
     int (*close)(struct v_file* file);

-    int (*sync)(struct v_inode* inode);
+    int (*sync)(struct v_file* file);
+};
+
+struct v_inode_ops
+{
+    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, 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 (*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);

 };
 
 struct v_file
 };
 
 struct v_file


@@ -102,7 +131,7 @@ struct v_file
     struct llist_header* f_list;
     uint32_t f_pos;
     atomic_ulong ref_count;
     struct llist_header* f_list;
     uint32_t f_pos;
     atomic_ulong ref_count;

-    struct v_file_ops ops;
+    struct v_file_ops* ops; // for caching

 };
 
 struct v_fd
 };
 
 struct v_fd


@@ -124,27 +153,13 @@ 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 v_superblock* sb;

     struct hlist_node hash_list;
     struct lru_node lru;
     struct pcache* pg_cache;
     void* data; // 允许底层FS绑定他的一些专有数据
     struct hlist_node hash_list;
     struct lru_node lru;
     struct pcache* pg_cache;
     void* data; // 允许底层FS绑定他的一些专有数据

-    struct
-    {
-        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, 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 (*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_inode_ops* ops;
+    struct v_file_ops* default_fops;

 };
 
 struct v_mount
 };
 
 struct v_mount


@@ -205,6 +220,12 @@ struct pcache_pg
 void
 fsm_init();
 
 void
 fsm_init();
 

+void
+fsm_register_all();
+
+struct filesystem*
+fsm_new_fs(char* name, size_t name_len);
+

 void
 fsm_register(struct filesystem* fs);
 
 void
 fsm_register(struct filesystem* fs);
 


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

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

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


@@ -332,6 +356,45 @@ mnt_mkbusy(struct v_mount* mnt);
 void
 mnt_chillax(struct v_mount* mnt);
 
 void
 mnt_chillax(struct v_mount* mnt);
 

+int
+vfs_mount_root(const char* fs_name, struct device* device);
+

 struct v_mount*
 vfs_create_mount(struct v_mount* parent, struct v_dnode* mnt_point);
 struct v_mount*
 vfs_create_mount(struct v_mount* parent, struct v_dnode* mnt_point);

+
+int
+default_file_read(struct v_inode* inode, void* buffer, size_t len, size_t fpos);
+
+int
+default_file_write(struct v_inode* inode,
+                   void* buffer,
+                   size_t len,
+                   size_t fpos);
+
+int
+default_file_readdir(struct v_file* file, struct dir_context* dctx);
+
+int
+default_inode_dirlookup(struct v_inode* this, struct v_dnode* dnode);
+
+int
+default_inode_rename(struct v_inode* from_inode,
+                     struct v_dnode* from_dnode,
+                     struct v_dnode* to_dnode);
+
+int
+default_file_close(struct v_file* file);
+
+int
+default_file_seek(struct v_inode* inode, size_t offset);
+
+int
+default_inode_open(struct v_inode* this, struct v_file* file);
+
+int
+default_inode_rmdir(struct v_inode* this, struct v_dnode* dir);
+
+int
+default_inode_mkdir(struct v_inode* this, struct v_dnode* dir);
+

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