X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fdentry.h;h=0d3f89e3b0de54b4386ad7c18dfe62216d6cfc09;hb=5604fa76ebf1b5589425aa3864585975624b822d;hp=841c9ca935bda23c420bff4b841cb099b7e4a222;hpb=45c3ad86e44a05a169bfb1fa8ff318861bbf9fbf;p=wimlib

diff --git a/src/dentry.h b/src/dentry.h
index 841c9ca9..0d3f89e3 100644
--- a/src/dentry.h
+++ b/src/dentry.h
@@ -8,6 +8,10 @@
 #include "rbtree.h"
 #include <string.h>
 
+#ifdef WITH_FUSE
+#include <pthread.h>
+#endif
+
 struct stat;
 struct lookup_table;
 struct WIMStruct;
@@ -153,6 +157,8 @@ struct dentry {
 	u16 file_name_utf8_len;
 
 	u8 is_extracted : 1;
+	u8 visited : 1;
+	u8 canonical : 1;
 
 	/* Byte 40 */
 
@@ -161,13 +167,7 @@ struct dentry {
 
 	/* Byte 48 */
 
-	union {
-		struct list_head tmp_list;
-		struct {
-			void *tmp_ptr_1;
-			void *tmp_ptr_2;
-		};
-	};
+	struct list_head tmp_list;
 
 	/* Byte 64 */
 
@@ -197,7 +197,6 @@ struct dentry {
 	 */
 	u64 length;
 
-
 	/* The offset, from the start of the uncompressed WIM metadata resource
 	 * for this image, of this dentry's child dentries.  0 if the directory
 	 * entry has no children, which is the case for regular files or reparse
@@ -208,6 +207,8 @@ struct dentry {
 	 * WIMStructs */
 	u32 refcnt;
 
+	u32 full_path_utf8_len;
+
 	/* Pointer to the UTF-16 short filename (malloc()ed buffer) */
 	char *short_name;
 
@@ -216,7 +217,6 @@ struct dentry {
 
 	/* Full path (UTF-8) to this dentry (malloc()ed buffer). */
 	char *full_path_utf8;
-	u32   full_path_utf8_len;
 };
 
 #define rbnode_dentry(node) container_of(node, struct dentry, rb_node)
@@ -253,6 +253,9 @@ struct inode {
 	/* %true iff verify_inode() has run on this dentry. */
 	u8 verified : 1;
 
+	/* temporary flag */
+	u8 visited    : 1;
+
 	/* Number of alternate data streams associated with this inode */
 	u16 num_ads;
 
@@ -284,7 +287,11 @@ struct inode {
 	/* List of dentries that reference this inode (there should be
 	 * link_count of them) */
 	struct list_head dentry_list;
+
 	struct hlist_node hlist;
+
+	struct list_head lte_inode_list;
+
 	char *extracted_file;
 
 	/* Root of a red-black tree storing the children of this inode (if
@@ -300,6 +307,11 @@ struct inode {
 
 	/* Next alternate data stream ID to be assigned */
 	u32 next_stream_id;
+
+	/* This mutex protects the inode's file descriptors table during
+	 * read-only mounts.  Read-write mounts are still restricted to 1
+	 * thread. */
+	pthread_mutex_t i_mutex;
 #endif
 };
 
@@ -307,15 +319,7 @@ struct inode {
 		list_for_each_entry((dentry), &(inode)->dentry_list, inode_dentry_list)
 
 #define inode_add_dentry(dentry, inode) \
-	({								\
-	 	wimlib_assert((inode)->dentry_list.next != NULL);		\
-		list_add(&(dentry)->inode_dentry_list, &(inode)->dentry_list);	\
-	})
-
-static inline bool dentry_is_extracted(const struct dentry *dentry)
-{
-	return dentry->is_extracted;
-}
+		list_add_tail(&(dentry)->inode_dentry_list, &(inode)->dentry_list)
 
 static inline bool dentry_is_first_in_inode(const struct dentry *dentry)
 {
@@ -326,10 +330,6 @@ static inline bool dentry_is_first_in_inode(const struct dentry *dentry)
 
 extern u64 dentry_correct_total_length(const struct dentry *dentry);
 
-extern void stbuf_to_inode(const struct stat *stbuf, struct inode *inode);
-extern int inode_to_stbuf(const struct inode *inode,
-			  struct lookup_table_entry *lte, struct stat *stbuf);
-
 extern int for_dentry_in_tree(struct dentry *root,
 			      int (*visitor)(struct dentry*, void*),
 			      void *args);
@@ -358,7 +358,10 @@ extern struct dentry *get_parent_dentry(struct WIMStruct *w, const char *path);
 extern int print_dentry(struct dentry *dentry, void *lookup_table);
 extern int print_dentry_full_path(struct dentry *entry, void *ignore);
 
+#ifdef WITH_FUSE
 extern struct dentry *new_dentry(const char *name);
+#endif
+
 extern struct dentry *new_dentry_with_inode(const char *name);
 extern struct dentry *new_dentry_with_timeless_inode(const char *name);
 
@@ -374,9 +377,6 @@ extern void unlink_dentry(struct dentry *dentry);
 extern bool dentry_add_child(struct dentry * restrict parent,
 			     struct dentry * restrict child);
 
-extern int verify_dentry(struct dentry *dentry, void *wim);
-
-
 extern struct ads_entry *inode_get_ads_entry(struct inode *inode,
 					     const char *stream_name,
 					     u16 *idx_ret);
@@ -420,11 +420,6 @@ static inline bool inode_is_symlink(const struct inode *inode)
 		     inode->reparse_tag == WIM_IO_REPARSE_TAG_MOUNT_POINT);
 }
 
-static inline bool dentry_is_symlink(const struct dentry *dentry)
-{
-	return inode_is_symlink(dentry->d_inode);
-}
-
 static inline bool inode_is_regular_file(const struct inode *inode)
 {
 	return !inode_is_directory(inode) && !inode_is_symlink(inode);