X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fmetadata_resource.c;h=91b1121f92ef7efc7b346e68ae3e5d4cd7c656c6;hp=a9e2e386f2d4609f08880b1af2c42c2c9dd658bf;hb=062465170ddb4520ca6fbc64a0f6e27e786de101;hpb=13c6ce3160fce7c40008d1d182325c8b42450d1e

diff --git a/src/metadata_resource.c b/src/metadata_resource.c
index a9e2e386..91b1121f 100644
--- a/src/metadata_resource.c
+++ b/src/metadata_resource.c
@@ -51,7 +51,6 @@ read_metadata_resource(WIMStruct *w, struct wim_image_metadata *imd)
 	struct wim_dentry *dentry;
 	const struct wim_lookup_table_entry *metadata_lte;
 	u64 metadata_len;
-	struct hlist_head inode_list;
 
 	metadata_lte = imd->metadata_lte;
 	metadata_len = wim_resource_size(metadata_lte);
@@ -151,7 +150,7 @@ read_metadata_resource(WIMStruct *w, struct wim_image_metadata *imd)
 		goto out_free_dentry_tree;
 
 	/* Build hash table that maps hard link group IDs to dentry sets */
-	ret = dentry_tree_fix_inodes(dentry, &inode_list);
+	ret = dentry_tree_fix_inodes(dentry, &imd->inode_list);
 	if (ret)
 		goto out_free_dentry_tree;
 
@@ -159,16 +158,13 @@ read_metadata_resource(WIMStruct *w, struct wim_image_metadata *imd)
 		DEBUG("Running miscellaneous verifications on the dentry tree");
 		for_lookup_table_entry(w->lookup_table, lte_zero_real_refcnt, NULL);
 		ret = for_dentry_in_tree(dentry, verify_dentry, w);
-		if (ret != 0)
+		if (ret)
 			goto out_free_dentry_tree;
 	}
 
 	DEBUG("Done reading image metadata");
 
 	imd->root_dentry = dentry;
-	imd->inode_list  = inode_list;
-	if (imd->inode_list.first)
-		imd->inode_list.first->pprev = &imd->inode_list.first;
 	INIT_LIST_HEAD(&imd->unhashed_streams);
 	goto out_free_buf;
 out_free_dentry_tree:
@@ -203,16 +199,15 @@ write_wim_resource_from_buffer(const void *buf, u64 buf_size,
 	 * write_wim_resource(). */
 	struct wim_lookup_table_entry lte;
 	int ret;
-	lte.resource_entry.original_size = buf_size;
 	lte.resource_location            = RESOURCE_IN_ATTACHED_BUFFER;
 	lte.attached_buffer              = (void*)buf;
+	lte.resource_entry.original_size = buf_size;
+	lte.resource_entry.flags         = 0;
 	lte.unhashed                     = 1;
-	zero_out_hash(lte.hash);
 	ret = write_wim_resource(&lte, out_fp, out_ctype, out_res_entry, 0);
-	if (ret)
-		return ret;
-	copy_hash(hash, lte.hash);
-	return 0;
+	if (ret == 0)
+		copy_hash(hash, lte.hash);
+	return ret;
 }
 
 /* Write the metadata resource for the current WIM image. */