X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Finode_fixup.c;h=8e1579db014617ac94bad6778d83ce3409453d9b;hb=afd591fa8c7528169234d15e3c71fc26b2b34575;hp=03df7c796cc589d200cbbba8f6463cd17a134c89;hpb=6460a27c606eed49e900c73a3316ac12d77a3a2e;p=wimlib diff --git a/src/inode_fixup.c b/src/inode_fixup.c index 03df7c79..8e1579db 100644 --- a/src/inode_fixup.c +++ b/src/inode_fixup.c @@ -72,7 +72,7 @@ inode_table_insert(struct wim_dentry *dentry, void *_params) } /* Try adding this dentry to an existing inode. */ - pos = d_inode->i_ino % table->capacity; + pos = hash_inode(table, d_inode->i_ino, 0); hlist_for_each_entry(inode, &table->array[pos], i_hlist_node) { if (inode->i_ino != d_inode->i_ino) { continue; @@ -91,7 +91,7 @@ inode_table_insert(struct wim_dentry *dentry, void *_params) WARNING("Unsupported directory hard link " "\"%"TS"\" <=> \"%"TS"\"", dentry_full_path(dentry), - inode_first_full_path(inode)); + inode_any_full_path(inode)); } else if (params->num_dir_hard_links == MAX_DIR_HARD_LINK_WARNINGS + 1) { @@ -108,6 +108,8 @@ inode_table_insert(struct wim_dentry *dentry, void *_params) /* Keep this dentry's inode. */ hlist_add_head(&d_inode->i_hlist_node, &table->array[pos]); + if (++table->filled > table->capacity) + enlarge_inode_table(table); return 0; } @@ -175,7 +177,7 @@ dentry_tree_fix_inodes(struct wim_dentry *root, struct hlist_head *inode_list) /* We use a hash table to map inode numbers to inodes. */ - ret = init_inode_table(¶ms.inode_table, 9001); + ret = init_inode_table(¶ms.inode_table, 64); if (ret) return ret; @@ -189,10 +191,6 @@ dentry_tree_fix_inodes(struct wim_dentry *root, struct hlist_head *inode_list) build_inode_list(¶ms.inode_table, inode_list); destroy_inode_table(¶ms.inode_table); - if (unlikely(params.num_inconsistent_inodes)) - WARNING("Fixed %lu invalid hard links in WIM image", - params.num_inconsistent_inodes); - if (unlikely(params.num_dir_hard_links)) WARNING("Ignoring %lu directory hard links", params.num_dir_hard_links);