X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Finode_table.c;h=86e3155fdc82f995a2b2a1d034449e270cdae7f3;hb=ab63d9f11eae3b930f0f75fe0edb6b6df1cdb280;hp=6e1c143b3c33336d4767627b98aff8893b717fba;hpb=7251c7d0afac3b738dda1c4f45e6d3d3090f2622;p=wimlib

diff --git a/src/inode_table.c b/src/inode_table.c
index 6e1c143b..86e3155f 100644
--- a/src/inode_table.c
+++ b/src/inode_table.c
@@ -39,7 +39,7 @@ init_inode_table(struct wim_inode_table *table, size_t capacity)
 		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;
 }
 
@@ -50,35 +50,6 @@ destroy_inode_table(struct wim_inode_table *table)
 	FREE(table->array);
 }
 
-static struct wim_inode *
-inode_table_get_inode(struct wim_inode_table *table, u64 ino, u64 devno)
-{
-	size_t pos;
-	struct wim_inode *inode;
-	struct hlist_node *cur;
-
-	/* 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->i_nlink++;
-			return inode;
-		}
-	}
-
-	/* Create a new inode and insert it into the table.  */
-	inode = new_timeless_inode();
-	if (inode) {
-		inode->i_ino = ino;
-		inode->i_devno = devno;
-		hlist_add_head(&inode->i_hlist, &table->array[pos]);
-		table->num_entries++;
-	}
-	return inode;
-}
-
 /*
  * Allocate a new dentry, with hard link detection.
  *
@@ -125,28 +96,33 @@ inode_table_new_dentry(struct wim_inode_table *table, const tchar *name,
 	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);
+		ret = new_dentry_with_new_inode(name, false, &dentry);
 		if (ret)
 			return ret;
-		list_add_tail(&dentry->d_inode->i_list, &table->extra_inodes);
+		hlist_add_head(&dentry->d_inode->i_hlist, &table->extra_inodes);
 	} else {
+		size_t pos;
+
 		/* 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);
+		 * existing inode matching the inode number and device.  */
+		pos = hash_u64(hash_u64(ino) + hash_u64(devno)) % table->capacity;
+		hlist_for_each_entry(inode, &table->array[pos], i_hlist) {
+			if (inode->i_ino == ino && inode->i_devno == devno) {
+				/* Found; use the existing inode.  */
+				return new_dentry_with_existing_inode(name, inode,
+								      dentry_ret);
+			}
+		}
+
+		/* Not found; create a new inode and add it to the table.  */
+		ret = new_dentry_with_new_inode(name, false, &dentry);
 		if (ret)
 			return ret;
-		inode = inode_table_get_inode(table, ino, devno);
-		if (!inode) {
-			free_dentry(dentry);
-			return WIMLIB_ERR_NOMEM;
-		}
-		/* If using an existing inode, we need to gain a reference to
-		 * each of its streams. */
-		if (inode->i_nlink > 1)
-			inode_ref_streams(inode);
-		dentry->d_inode = inode;
-		inode_add_dentry(dentry, inode);
+		inode = dentry->d_inode;
+		inode->i_ino = ino;
+		inode->i_devno = devno;
+		hlist_add_head(&inode->i_hlist, &table->array[pos]);
+		table->num_entries++;
 	}
 	*dentry_ret = dentry;
 	return 0;
@@ -160,33 +136,31 @@ 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)
 		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) {
 			inode->i_ino = cur_ino++;
 			inode->i_devno = 0;
-			list_add_tail(&inode->i_list, head);
+			hlist_add_head(&inode->i_hlist, 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) {
 		inode->i_ino = cur_ino++;
 		inode->i_devno = 0;
-		list_add_tail(&inode->i_list, head);
+		hlist_add_head(&inode->i_hlist, head);
 	}
-	INIT_LIST_HEAD(&table->extra_inodes);
+	INIT_HLIST_HEAD(&table->extra_inodes);
 	table->num_entries = 0;
 }