X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fdentry.h;h=afa6aaa4f5747e0cdbb6b017ea40cd899af3f290;hp=a68f07530930f321999f015b7c572a5c6a3cad1f;hb=9b9a502863318d6208da2818b1d522346e5eee9e;hpb=4f54dd3f9aa8f5c30d0ae013da0e8ab7a67816e5

diff --git a/src/dentry.h b/src/dentry.h
index a68f0753..afa6aaa4 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 */
 
@@ -208,6 +208,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 +218,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 +254,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 +288,13 @@ 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 tmp_list;
+
+	struct list_head lte_inode_list;
+
 	char *extracted_file;
 
 	/* Root of a red-black tree storing the children of this inode (if
@@ -300,6 +310,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
 };
 
@@ -312,11 +327,6 @@ struct inode {
 		list_add(&(dentry)->inode_dentry_list, &(inode)->dentry_list);	\
 	})
 
-static inline bool dentry_is_extracted(const struct dentry *dentry)
-{
-	return dentry->is_extracted;
-}
-
 static inline bool dentry_is_first_in_inode(const struct dentry *dentry)
 {
 	return container_of(dentry->d_inode->dentry_list.next,
@@ -326,7 +336,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);
 
@@ -374,9 +383,6 @@ extern void unlink_dentry(struct dentry *dentry);
 extern bool dentry_add_child(struct dentry * restrict parent,
 			     struct dentry * restrict child);
 
-// XXX
-#define link_dentry(child, parent) dentry_add_child(parent, child)
-
 extern int verify_dentry(struct dentry *dentry, void *wim);