Lots of changes

[wimlib] / src / dentry.h

diff --git a/src/dentry.h b/src/dentry.h
index d30cb15985632af4746431375f6f79e0a9a69516..afa6aaa4f5747e0cdbb6b017ea40cd899af3f290 100644 (file)
--- a/src/dentry.h
+++ b/src/dentry.h
@@ -157,6 +157,8 @@ struct dentry {
        u16 file_name_utf8_len;
 
        u8 is_extracted : 1;
+       u8 visited : 1;
+       u8 canonical : 1;
 
        /* Byte 40 */
 
@@ -252,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;
 
@@ -283,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
@@ -316,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,
@@ -330,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);