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);
- DEBUG("Reading metadata resource: length = %"PRIu64", "
- "offset = %"PRIu64"", metadata_len,
+ DEBUG("Reading metadata resource: original_size = %"PRIu64", "
+ "size = %"PRIu64", offset = %"PRIu64"",
+ metadata_lte->resource_entry.original_size,
+ metadata_lte->resource_entry.size,
metadata_lte->resource_entry.offset);
/* There is no way the metadata resource could possibly be less than (8
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;
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:
* 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(<e, 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. */
wimlib_get_compression_type(w),
<e->output_resource_entry,
lte->hash);
- if (ret)
- goto out_free_buf;
-
/* Note that although the SHA1 message digest of the metadata resource
* is very likely to have changed, the corresponding lookup table entry
* is not actually located in the hash table, so it need not be
* re-inserted in the hash table. */
- lte->out_refcnt = 1;
- lte->output_resource_entry.flags |= WIM_RESHDR_FLAG_METADATA;
-out_free_buf:
+
/* All the data has been written to the new WIM; no need for the buffer
* anymore */
FREE(buf);