Merge branch 'master' into prog-loader

[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 5a5cb79514e51d66198a4f13e0ce040630b8f544..4b2888157d59003569801d30fbcf6d13c32565f6 100644 (file)
--- a/lunaix-os/includes/lunaix/fs.h
+++ b/lunaix-os/includes/lunaix/fs.h
@@ -9,7 +9,6 @@
 #include <lunaix/ds/llist.h>
 #include <lunaix/ds/lru.h>
 #include <lunaix/ds/mutex.h>
 #include <lunaix/ds/llist.h>
 #include <lunaix/ds/lru.h>
 #include <lunaix/ds/mutex.h>

-#include <lunaix/process.h>

 #include <lunaix/status.h>
 #include <stdatomic.h>
 
 #include <lunaix/status.h>
 #include <stdatomic.h>
 


@@ -36,9 +35,6 @@
 
 #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)                                                    \
 #define TEST_FD(fd) (fd >= 0 && fd < VFS_MAX_FD)
 
 #define VFS_VALID_CHAR(chr)                                                    \


@@ -95,7 +91,6 @@ struct v_superblock
     struct device* dev;
     struct v_dnode* root;
     struct filesystem* fs;
     struct device* dev;
     struct v_dnode* root;
     struct filesystem* fs;

-    u32_t iobuf_size;

     struct hbucket* i_cache;
     void* data;
     struct
     struct hbucket* i_cache;
     void* data;
     struct


@@ -401,6 +396,9 @@ vfs_get_dtype(int itype);
 void
 vfs_ref_dnode(struct v_dnode* dnode);
 
 void
 vfs_ref_dnode(struct v_dnode* dnode);
 

+void
+vfs_ref_file(struct v_file* file);
+

 void
 vfs_unref_dnode(struct v_dnode* dnode);
 
 void
 vfs_unref_dnode(struct v_dnode* dnode);