fix_true_inode(): Add ref_inode to inode_list

diff --git a/src/dentry.c b/src/dentry.c
index fce2c07759fb0f5588f45472fd8d88ae7c646980..fa7ff56b2073dfa88f43f26f2c231c9899149d9e 100644 (file)
--- a/src/dentry.c
+++ b/src/dentry.c
@@ -703,6 +703,7 @@ void free_inode(struct inode *inode)
                wimlib_assert(inode->num_opened_fds == 0);
                FREE(inode->fds);
        #endif
                wimlib_assert(inode->num_opened_fds == 0);
                FREE(inode->fds);
        #endif

+               FREE(inode->extracted_file);

                FREE(inode);
        }
 }
                FREE(inode);
        }
 }

diff --git a/src/hardlink.c b/src/hardlink.c
index 5012ab7eadae25e7cdbaac854eb8af1f3e8b3d92..533a51379dd5bbf9938d32cf8f40d0bda220c481 100644 (file)
--- a/src/hardlink.c
+++ b/src/hardlink.c
@@ -217,7 +217,7 @@ static bool inodes_consistent(const struct inode * restrict ref_inode,
 }
 
 /* Fix up a "true" inode and check for inconsistencies */
 }
 
 /* Fix up a "true" inode and check for inconsistencies */

-static int fix_true_inode(struct inode *inode)
+static int fix_true_inode(struct inode *inode, struct hlist_head *inode_list)

 {
        struct dentry *dentry;
        struct dentry *ref_dentry = NULL;
 {
        struct dentry *dentry;
        struct dentry *ref_dentry = NULL;


@@ -239,6 +239,7 @@ static int fix_true_inode(struct inode *inode)
 
        ref_inode = ref_dentry->d_inode;
        ref_inode->link_count = 1;
 
        ref_inode = ref_dentry->d_inode;
        ref_inode->link_count = 1;

+       hlist_add_head(&ref_inode->hlist, inode_list);

 
        list_del(&inode->dentry_list);
        list_add(&ref_inode->dentry_list, &ref_dentry->inode_dentry_list);
 
        list_del(&inode->dentry_list);
        list_add(&ref_inode->dentry_list, &ref_dentry->inode_dentry_list);


@@ -322,8 +323,7 @@ fix_nominal_inode(struct inode *inode, struct hlist_head *inode_list)
                              "are consistent.");
                }
        #endif
                              "are consistent.");
                }
        #endif

-               hlist_add_head(&inode->hlist, inode_list);
-               return fix_true_inode(inode);
+               return fix_true_inode(inode, inode_list);

        }
 
         /* One or more dentries had data streams specified.  We check each of
        }
 
         /* One or more dentries had data streams specified.  We check each of


@@ -389,8 +389,7 @@ next_dentry_2:
        #endif
 
        hlist_for_each_entry_safe(inode, cur, tmp, &true_inodes, hlist) {
        #endif
 
        hlist_for_each_entry_safe(inode, cur, tmp, &true_inodes, hlist) {

-               hlist_add_head(&inode->hlist, inode_list);
-               ret = fix_true_inode(inode);
+               ret = fix_true_inode(inode, inode_list);

                if (ret != 0)
                        return ret;
        }
                if (ret != 0)
                        return ret;
        }