Cleanup WIM writing

[wimlib] / src / hardlink.c

diff --git a/src/hardlink.c b/src/hardlink.c
index 5012ab7eadae25e7cdbaac854eb8af1f3e8b3d92..b88f4555f237a605a9cfc480668b86d25c6a3e33 100644 (file)
--- a/src/hardlink.c
+++ b/src/hardlink.c
@@ -32,10 +32,10 @@
 
 /*                             NULL        NULL
  *                              ^           ^
- *         dentry               |           |                
- *        /     \          -----------  -----------           
+ *         dentry               |           |
+ *        /     \          -----------  -----------
  *        |      dentry<---|  struct  | |  struct  |---> dentry
- *        \     /          |  inode   | |  inode   |       
+ *        \     /          |  inode   | |  inode   |
  *         dentry          ------------ ------------
  *                              ^           ^
  *                              |           |
@@ -47,7 +47,7 @@
  *                              ^           ^
  *                              |           |
  *                            -----------------
- *        inode_table->array  | idx 0 | idx 1 | 
+ *        inode_table->array  | idx 0 | idx 1 |
  *                            -----------------
  */
 
@@ -75,7 +75,7 @@ static size_t inode_link_count(const struct inode *inode)
        return size;
 }
 
-/* 
+/*
  * Insert a dentry into the inode table based on its inode
  * ID.
  *
@@ -217,7 +217,7 @@ static bool inodes_consistent(const struct inode * restrict ref_inode,
 }
 
 /* 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;
@@ -239,6 +239,7 @@ static int fix_true_inode(struct inode *inode)
 
        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);
@@ -262,7 +263,7 @@ static int fix_true_inode(struct inode *inode)
        return 0;
 }
 
-/* 
+/*
  * Fixes up a nominal inode.
  *
  * By a nominal inode we mean a group of two or more dentries that share
@@ -322,8 +323,7 @@ fix_nominal_inode(struct inode *inode, struct hlist_head *inode_list)
                              "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
@@ -389,8 +389,7 @@ next_dentry_2:
        #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;
        }