X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fhardlink.c;h=7c82f4bae09487aae4638c58ce9e738d999db610;hb=55491147fce2bc03ffb602a3985e7fd4e32169a3;hp=f6752ff4603ef37d8d07f388d383f0b6dd22cffd;hpb=ff556d243953bd6df1399466c452f327feae2ed9;p=wimlib

diff --git a/src/hardlink.c b/src/hardlink.c
index f6752ff4..7c82f4ba 100644
--- a/src/hardlink.c
+++ b/src/hardlink.c
@@ -23,10 +23,14 @@
  * along with wimlib; if not, see http://www.gnu.org/licenses/.
  */
 
-#include "wimlib_internal.h"
-#include "dentry.h"
-#include "list.h"
-#include "lookup_table.h"
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
+#include "wimlib/capture.h"
+#include "wimlib/dentry.h"
+#include "wimlib/error.h"
+#include "wimlib/lookup_table.h"
 
 /*                             NULL        NULL
  *                              ^           ^
@@ -305,8 +309,6 @@ fix_true_inode(struct wim_inode *inode, struct list_head *inode_list)
 				return WIMLIB_ERR_INVALID_DENTRY;
 			}
 			/* Free the unneeded `struct wim_inode'. */
-			dentry->d_inode->i_hlist.next = NULL;
-			dentry->d_inode->i_hlist.pprev = NULL;
 			free_inode(dentry->d_inode);
 			dentry->d_inode = ref_inode;
 			ref_inode->i_nlink++;
@@ -465,6 +467,7 @@ fix_inodes(struct wim_inode_table *table, struct list_head *inode_list,
 	INIT_LIST_HEAD(inode_list);
 	for (u64 i = 0; i < table->capacity; i++) {
 		hlist_for_each_entry_safe(inode, cur, tmp, &table->array[i], i_hlist) {
+			INIT_LIST_HEAD(&inode->i_list);
 			ret = fix_nominal_inode(inode, inode_list, ino_changes_needed);
 			if (ret)
 				return ret;
@@ -546,7 +549,13 @@ inode_table_prepare_inode_list(struct wim_inode_table *table,
 	struct hlist_node *cur, *tmp;
 	u64 cur_ino = 1;
 
-	INIT_LIST_HEAD(head);
+	list_for_each_entry(inode, head, i_list) {
+		if (inode->i_nlink > 1)
+			inode->i_ino = cur_ino++;
+		else
+			inode->i_ino = 0;
+	}
+
 	for (size_t i = 0; i < table->capacity; i++) {
 		hlist_for_each_entry_safe(inode, cur, tmp, &table->array[i], i_hlist)
 		{