X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Finode.c;h=a181e885753efde4b5a054b38166c0c0f8b90cd5;hp=4b1b1d3eee8e108b3934ce5c6ba6f026cba7ac32;hb=7be4c8e5488e0a1d32918339fa80f3ea33bf48c6;hpb=0b52336c9e67aa31c04af59867c2541384141a3d

diff --git a/src/inode.c b/src/inode.c
index 4b1b1d3e..a181e885 100644
--- a/src/inode.c
+++ b/src/inode.c
@@ -56,9 +56,8 @@ new_inode(struct wim_dentry *dentry, bool set_timestamps)
 
 	inode->i_security_id = -1;
 	/*inode->i_nlink = 0;*/
-	inode->i_not_rpfixed = 1;
-	INIT_LIST_HEAD(&inode->i_list);
-	INIT_LIST_HEAD(&inode->i_dentry);
+	inode->i_rp_flags = WIM_RP_FLAG_NOT_FIXED;
+	INIT_HLIST_HEAD(&inode->i_dentry);
 	inode->i_streams = inode->i_embedded_streams;
 	if (set_timestamps) {
 		u64 now = now_as_wim_timestamp();
@@ -86,8 +85,6 @@ free_inode(struct wim_inode *inode)
 		FREE(inode->i_streams);
 	if (inode->i_extra)
 		FREE(inode->i_extra);
-	/* HACK: This may instead delete the inode from i_list, but hlist_del()
-	 * behaves the same as list_del(). */
 	if (!hlist_unhashed(&inode->i_hlist))
 		hlist_del(&inode->i_hlist);
 	FREE(inode);
@@ -111,7 +108,7 @@ d_associate(struct wim_dentry *dentry, struct wim_inode *inode)
 {
 	wimlib_assert(!dentry->d_inode);
 
-	list_add_tail(&dentry->d_alias, &inode->i_dentry);
+	hlist_add_head(&dentry->d_alias, &inode->i_dentry);
 	dentry->d_inode = inode;
 	inode->i_nlink++;
 }
@@ -128,7 +125,7 @@ d_disassociate(struct wim_dentry *dentry)
 
 	wimlib_assert(inode->i_nlink > 0);
 
-	list_del(&dentry->d_alias);
+	hlist_del(&dentry->d_alias);
 	dentry->d_inode = NULL;
 	inode->i_nlink--;
 
@@ -345,11 +342,13 @@ inode_replace_stream_data(struct wim_inode *inode,
 			  const void *data, size_t size,
 			  struct blob_table *blob_table)
 {
-	struct blob_descriptor *new_blob;
+	struct blob_descriptor *new_blob = NULL;
 
-	new_blob = new_blob_from_data_buffer(data, size, blob_table);
-	if (!new_blob)
-		return false;
+	if (size) {
+		new_blob = new_blob_from_data_buffer(data, size, blob_table);
+		if (!new_blob)
+			return false;
+	}
 
 	inode_replace_stream_blob(inode, strm, new_blob, blob_table);
 	return true;
@@ -381,16 +380,18 @@ inode_add_stream_with_data(struct wim_inode *inode,
 			   struct blob_table *blob_table)
 {
 	struct wim_inode_stream *strm;
-	struct blob_descriptor *blob;
+	struct blob_descriptor *blob = NULL;
 
 	strm = inode_add_stream(inode, stream_type, stream_name, NULL);
 	if (!strm)
 		return false;
 
-	blob = new_blob_from_data_buffer(data, size, blob_table);
-	if (!blob) {
-		inode_remove_stream(inode, strm, blob_table);
-		return false;
+	if (size) {
+		blob = new_blob_from_data_buffer(data, size, blob_table);
+		if (unlikely(!blob)) {
+			inode_remove_stream(inode, strm, blob_table);
+			return false;
+		}
 	}
 
 	inode_set_stream_blob(inode, strm, blob);
@@ -480,21 +481,6 @@ inode_resolve_streams(struct wim_inode *inode, struct blob_table *table,
 	return 0;
 }
 
-/* Undo the effects of inode_resolve_streams().  */
-void
-inode_unresolve_streams(struct wim_inode *inode)
-{
-	for (unsigned i = 0; i < inode->i_num_streams; i++) {
-
-		if (!inode->i_streams[i].stream_resolved)
-			continue;
-
-		copy_hash(inode->i_streams[i]._stream_hash,
-			  stream_hash(&inode->i_streams[i]));
-		inode->i_streams[i].stream_resolved = 0;
-	}
-}
-
 int
 blob_not_found_error(const struct wim_inode *inode, const u8 *hash)
 {
@@ -512,8 +498,8 @@ blob_not_found_error(const struct wim_inode *inode, const u8 *hash)
 }
 
 /*
- * Return the blob descriptor for the specified stream, or NULL if the blob for
- * the stream is empty or not available.
+ * Return the blob descriptor for the specified stream, or NULL if the stream is
+ * empty or its blob is not available in @table.
  */
 struct blob_descriptor *
 stream_blob(const struct wim_inode_stream *strm, const struct blob_table *table)
@@ -537,9 +523,9 @@ stream_hash(const struct wim_inode_stream *strm)
 
 /*
  * Return the blob descriptor for the unnamed data stream of the inode, or NULL
- * if the inode does not have an unnamed data stream, the blob for the inode's
- * unnamed data stream is empty, or the blob for the inode's unnamed data stream
- * is not available in @blob_table.
+ * if the inode does not have an unnamed data stream, the inode's unnamed data
+ * stream is empty, or the blob for the inode's unnamed data stream is not
+ * available in @blob_table.
  */
 struct blob_descriptor *
 inode_get_blob_for_unnamed_data_stream(const struct wim_inode *inode,