fix: ext2 directory insertion; racing on inode create

[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 6feb2aa0447769b7f5d68fda278936774036d8a8..3369ae36466e47dd713fb39c0975339b9ed9cd29 100644 (file)
--- a/lunaix-os/includes/lunaix/fs.h
+++ b/lunaix-os/includes/lunaix/fs.h
@@ -13,6 +13,7 @@
 #include <lunaix/status.h>
 #include <lunaix/spike.h>
 #include <lunaix/bcache.h>
 #include <lunaix/status.h>
 #include <lunaix/spike.h>
 #include <lunaix/bcache.h>

+#include <lunaix/fs_acl.h>

 
 #include <usr/lunaix/fstypes.h>
 
 
 #include <usr/lunaix/fstypes.h>
 


@@ -61,17 +62,17 @@
      ('0' <= (chr) && (chr) <= '9') || (chr) == '.' || (chr) == '_' ||         \
      (chr) == '-' || (chr) == ':')
 
      ('0' <= (chr) && (chr) <= '9') || (chr) == '.' || (chr) == '_' ||         \
      (chr) == '-' || (chr) == ':')
 

-#define unlock_inode(inode) mutex_unlock(&inode->lock)
+#define unlock_inode(inode) mutex_unlock_nested(&inode->lock)

 #define lock_inode(inode)                                                      \
     ({                                                                         \
 #define lock_inode(inode)                                                      \
     ({                                                                         \

-        mutex_lock(&inode->lock);                                              \
+        mutex_lock_nested(&inode->lock);                                       \

         lru_use_one(inode_lru, &inode->lru);                                   \
     })
 
         lru_use_one(inode_lru, &inode->lru);                                   \
     })
 

-#define unlock_dnode(dnode) mutex_unlock(&dnode->lock)
+#define unlock_dnode(dnode) mutex_unlock_nested(&dnode->lock)

 #define lock_dnode(dnode)                                                      \
     ({                                                                         \
 #define lock_dnode(dnode)                                                      \
     ({                                                                         \

-        mutex_lock(&dnode->lock);                                              \
+        mutex_lock_nested(&dnode->lock);                                       \

         lru_use_one(dnode_lru, &dnode->lru);                                   \
     })
 
         lru_use_one(dnode_lru, &dnode->lru);                                   \
     })
 


@@ -248,6 +249,11 @@ struct v_inode
     u32_t link_count;
     u32_t lb_usage;
     u32_t fsize;
     u32_t link_count;
     u32_t lb_usage;
     u32_t fsize;

+
+    u32_t acl;
+    uid_t uid;
+    gid_t gid;
+

     void* data; // 允许底层FS绑定他的一些专有数据
     struct llist_header aka_dnodes;
     struct llist_header xattrs;
     void* data; // 允许底层FS绑定他的一些专有数据
     struct llist_header aka_dnodes;
     struct llist_header xattrs;


@@ -389,6 +395,10 @@ vfs_walk_proc(const char* path,
               struct hstr* component,
               int options);
 
               struct hstr* component,
               int options);
 

+int
+vfs_walkat(int fd, const char* path, int at_opts, 
+           struct v_dnode** dnode_out);
+

 int
 vfs_mount(const char* target,
           const char* fs_name,
 int
 vfs_mount(const char* target,
           const char* fs_name,


@@ -707,4 +717,28 @@ check_symlink_node(struct v_inode* inode)
     return check_itype(inode->itype, VFS_IFSYMLINK);
 }
 
     return check_itype(inode->itype, VFS_IFSYMLINK);
 }
 

+static inline bool
+check_allow_ops(struct v_inode* inode, unsigned int perm)
+{
+    return fsacl_allow_ops(perm, inode->acl, inode->uid, inode->gid);
+}
+
+static inline bool
+check_allow_read(struct v_inode* inode)
+{
+    return check_allow_ops(inode, FSACL_aR);
+}
+
+static inline bool
+check_allow_write(struct v_inode* inode)
+{
+    return check_allow_ops(inode, FSACL_aW);
+}
+
+static inline bool
+check_allow_execute(struct v_inode* inode)
+{
+    return check_allow_ops(inode, FSACL_aX);
+}
+

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