X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Finode_table.c;h=e9c92d6a0571fa13ace88029452e8455cbb25231;hb=e2f7bf9e5406b8784a2dd1e4947398c2ba9ddbe5;hp=49dd821776d3ba0815843d823fb6638ccfa71bda;hpb=b5fae0e5ddac332b25856e3df7556aa3ee7f69fb;p=wimlib

diff --git a/src/inode_table.c b/src/inode_table.c
index 49dd8217..e9c92d6a 100644
--- a/src/inode_table.c
+++ b/src/inode_table.c
@@ -37,9 +37,8 @@ init_inode_table(struct wim_inode_table *table, size_t capacity)
 	table->array = CALLOC(capacity, sizeof(table->array[0]));
 	if (!table->array)
 		return WIMLIB_ERR_NOMEM;
-	table->num_entries = 0;
 	table->capacity = capacity;
-	INIT_LIST_HEAD(&table->extra_inodes);
+	INIT_HLIST_HEAD(&table->extra_inodes);
 	return 0;
 }
 
@@ -91,50 +90,40 @@ inode_table_new_dentry(struct wim_inode_table *table, const tchar *name,
 {
 	struct wim_dentry *dentry;
 	struct wim_inode *inode;
+	struct hlist_head *list;
 	int ret;
 
 	if (noshare) {
-		/* File that cannot be hardlinked--- Return a new inode with its
-		 * inode and device numbers left at 0. */
-		ret = new_dentry_with_timeless_inode(name, &dentry);
-		if (ret)
-			return ret;
-		list_add_tail(&dentry->d_inode->i_list, &table->extra_inodes);
+		/* No hard link detection  */
+		list = &table->extra_inodes;
 	} else {
-		size_t pos;
-		struct hlist_node *cur;
-
-		/* File that can be hardlinked--- search the table for an
-		 * existing inode matching the inode number and device;
-		 * otherwise create a new inode. */
-		ret = new_dentry(name, &dentry);
-		if (ret)
-			return ret;
-
-		/* Search for an existing inode having the same inode number and
-		 * device number.  */
-		pos = hash_u64(hash_u64(ino) + hash_u64(devno)) % table->capacity;
-		hlist_for_each_entry(inode, cur, &table->array[pos], i_hlist) {
-			if (inode->i_ino == ino && inode->i_devno == devno) {
-				/* Found; use the existing inode.  */
-				inode_ref_streams(inode);
-				goto have_inode;
+		/* Hard link detection  */
+		list = &table->array[hash_u64(hash_u64(ino) + hash_u64(devno))
+				     % table->capacity];
+		hlist_for_each_entry(inode, list, i_hlist_node) {
+			if (inode->i_ino != ino || inode->i_devno != devno)
+				continue;
+			if (inode->i_attributes & FILE_ATTRIBUTE_DIRECTORY) {
+				WARNING("Not honoring directory hard link "
+					"of \"%"TS"\"",
+					inode_any_full_path(inode));
+				continue;
 			}
+			/* Inode found; use it.  */
+			return new_dentry_with_existing_inode(name, inode,
+							      dentry_ret);
 		}
 
-		/* Create a new inode and insert it into the table.  */
-		inode = new_timeless_inode();
-		if (!inode) {
-			free_dentry(dentry);
-			return WIMLIB_ERR_NOMEM;
-		}
-		inode->i_ino = ino;
-		inode->i_devno = devno;
-		hlist_add_head(&inode->i_hlist, &table->array[pos]);
-		table->num_entries++;
-	have_inode:
-		d_associate(dentry, inode);
+		/* Inode not found; create it.  */
 	}
+
+	ret = new_dentry_with_new_inode(name, false, &dentry);
+	if (ret)
+		return ret;
+	inode = dentry->d_inode;
+	hlist_add_head(&inode->i_hlist_node, list);
+	inode->i_ino = ino;
+	inode->i_devno = devno;
 	*dentry_ret = dentry;
 	return 0;
 }
@@ -147,33 +136,28 @@ inode_table_new_dentry(struct wim_inode_table *table, const tchar *name,
  */
 void
 inode_table_prepare_inode_list(struct wim_inode_table *table,
-			       struct list_head *head)
+			       struct hlist_head *head)
 {
-	struct wim_inode *inode, *tmp_inode;
-	struct hlist_node *cur, *tmp;
+	struct wim_inode *inode;
+	struct hlist_node *tmp;
 	u64 cur_ino = 1;
 
 	/* Re-assign inode numbers in the existing list to avoid duplicates. */
-	list_for_each_entry(inode, head, i_list)
+	hlist_for_each_entry(inode, head, i_hlist_node)
 		inode->i_ino = cur_ino++;
 
 	/* Assign inode numbers to the new inodes and move them to the image's
 	 * inode list. */
 	for (size_t i = 0; i < table->capacity; i++) {
-		hlist_for_each_entry_safe(inode, cur, tmp, &table->array[i], i_hlist)
-		{
+		hlist_for_each_entry_safe(inode, tmp, &table->array[i], i_hlist_node) {
 			inode->i_ino = cur_ino++;
-			inode->i_devno = 0;
-			list_add_tail(&inode->i_list, head);
+			hlist_add_head(&inode->i_hlist_node, head);
 		}
 		INIT_HLIST_HEAD(&table->array[i]);
 	}
-	list_for_each_entry_safe(inode, tmp_inode, &table->extra_inodes, i_list)
-	{
+	hlist_for_each_entry_safe(inode, tmp, &table->extra_inodes, i_hlist_node) {
 		inode->i_ino = cur_ino++;
-		inode->i_devno = 0;
-		list_add_tail(&inode->i_list, head);
+		hlist_add_head(&inode->i_hlist_node, head);
 	}
-	INIT_LIST_HEAD(&table->extra_inodes);
-	table->num_entries = 0;
+	INIT_HLIST_HEAD(&table->extra_inodes);
 }