X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fhardlink.c;h=5a0b62058eab337b8cd892efc333d97bfd707730;hp=f5d3e1c59d91f31115843d2b649dcc2b81c10bc8;hb=c7af42d3d894338bbd1cb7f4b77948f746485482;hpb=491079f27a268fb9e5bc7f54a7cbe3fbb9fa2d94 diff --git a/src/hardlink.c b/src/hardlink.c index f5d3e1c5..5a0b6205 100644 --- a/src/hardlink.c +++ b/src/hardlink.c @@ -1,9 +1,7 @@ /* * hardlink.c * - * Code to deal with hard links in WIMs. Essentially, the WIM dentries are put - * into a hash table indexed by the hard link group ID field, then for each hard - * link group, a linked list is made to connect the dentries. + * Code to deal with hard links in WIMs. */ /* @@ -12,16 +10,16 @@ * This file is part of wimlib, a library for working with WIM files. * * wimlib is free software; you can redistribute it and/or modify it under the - * terms of the GNU Lesser General Public License as published by the Free - * Software Foundation; either version 2.1 of the License, or (at your option) + * terms of the GNU General Public License as published by the Free + * Software Foundation; either version 3 of the License, or (at your option) * any later version. * * wimlib is distributed in the hope that it will be useful, but WITHOUT ANY * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more + * A PARTICULAR PURPOSE. See the GNU General Public License for more * details. * - * You should have received a copy of the GNU Lesser General Public License + * You should have received a copy of the GNU General Public License * along with wimlib; if not, see http://www.gnu.org/licenses/. */ @@ -30,107 +28,116 @@ #include "list.h" #include "lookup_table.h" -/* Hard link group; it's identified by its hard link group ID and consists of a - * circularly linked list of dentries. */ -struct link_group { - u64 link_group_id; - struct link_group *next; - struct list_head *dentry_list; -}; +/* NULL NULL + * ^ ^ + * dentry | | + * / \ ----------- ----------- + * | dentry<---| struct | | struct |---> dentry + * \ / | wim_inode| | wim_inode| + * dentry ------------ ------------ + * ^ ^ + * | | + * | | dentry + * ----------- ----------- / \ + * dentry<---| struct | | struct |---> dentry dentry + * / | wim_inode| | wim_inode| \ / + * dentry ------------ ------------ dentry + * ^ ^ + * | | + * ----------------- + * wim_inode_table->array | idx 0 | idx 1 | + * ----------------- + */ -/* Hash table to find hard link groups, identified by their hard link group ID. +/* Hash table to find inodes, identified by their inode ID. * */ -struct link_group_table { - struct link_group **array; +struct wim_inode_table { + /* Fields for the hash table */ + struct hlist_head *array; u64 num_entries; u64 capacity; - struct link_group *singles; + + /* + * Linked list of "extra" inodes. These may be: + * + * - inodes with link count 1, which are all allowed to have 0 for their + * inode number, meaning we cannot insert them into the hash table + * before calling assign_inode_numbers(). + * + * - Groups we create ourselves by splitting a nominal inode due to + * inconsistencies in the dentries. These inodes will share a inode + * number with some other inode until assign_inode_numbers() is + * called. + */ + struct hlist_head extra_inodes; }; -/* Returns pointer to a new link group table having the specified capacity */ -struct link_group_table *new_link_group_table(u64 capacity) +static inline void destroy_inode_table(struct wim_inode_table *table) +{ + FREE(table->array); +} + +static int init_inode_table(struct wim_inode_table *table, size_t capacity) { - struct link_group_table *table; - struct link_group **array; - - table = MALLOC(sizeof(struct link_group_table)); - if (!table) - goto err; - array = CALLOC(capacity, sizeof(array[0])); - if (!array) { - FREE(table); - goto err; + table->array = CALLOC(capacity, sizeof(table->array[0])); + if (!table->array) { + ERROR("Cannot initalize inode table: out of memory"); + return WIMLIB_ERR_NOMEM; } - table->num_entries = 0; - table->capacity = capacity; - table->array = array; - table->singles = NULL; - return table; -err: - ERROR("Failed to allocate memory for link group table with capacity %zu", - capacity); - return NULL; + table->num_entries = 0; + table->capacity = capacity; + INIT_HLIST_HEAD(&table->extra_inodes); + return 0; } -/* - * Insert a dentry into the hard link group table based on its hard link group - * ID. - * - * If there is already a dentry in the table having the same hard link group ID, - * we link the dentries together in a circular list. - * - * If the hard link group ID is 0, this indicates a dentry that's in a hard link - * group by itself (has a link count of 1). We can't insert it into the hash - * table itself because we don't know what hard link group IDs are available to - * give it (this could be kept track of but would be more difficult). Instead - * we keep a linked list of the single dentries, and assign them hard link group - * IDs later. - */ -int link_group_table_insert(struct dentry *dentry, void *__table) +static inline size_t inode_link_count(const struct wim_inode *inode) { - struct link_group_table *table = __table; - size_t pos; - struct link_group *group; - - if (dentry->hard_link == 0) { - /* Single group--- Add to the singles list (we can't put it in - * the table itself because all the singles have a link group ID - * of 0) */ - group = MALLOC(sizeof(struct link_group)); - if (!group) - return WIMLIB_ERR_NOMEM; - group->link_group_id = 0; - group->next = table->singles; - table->singles = group; - INIT_LIST_HEAD(&dentry->link_group_list); - group->dentry_list = &dentry->link_group_list; + const struct list_head *cur; + size_t size = 0; + list_for_each(cur, &inode->i_dentry) + size++; + return size; +} + +/* Insert a dentry into the inode table based on the inode number of the + * attached inode (which came from the hard link group ID field of the on-disk + * WIM dentry) */ +static int inode_table_insert(struct wim_dentry *dentry, void *__table) +{ + struct wim_inode_table *table = __table; + struct wim_inode *d_inode = dentry->d_inode; + + if (d_inode->i_ino == 0) { + /* A dentry with a hard link group ID of 0 indicates that it's + * in a hard link group by itself. Add it to the list of extra + * inodes rather than inserting it into the hash lists. */ + hlist_add_head(&d_inode->i_hlist, &table->extra_inodes); + + wimlib_assert(d_inode->i_dentry.next == &dentry->d_alias); + wimlib_assert(d_inode->i_dentry.prev == &dentry->d_alias); + wimlib_assert(d_inode->i_nlink == 1); } else { - /* Hard link group that may should multiple dentries (the code - * will work even if the group actually contains only 1 dentry - * though) */ - - /* Try adding to existing hard link group */ - pos = dentry->hard_link % table->capacity; - group = table->array[pos]; - while (group) { - if (group->link_group_id == dentry->hard_link) { - list_add(&dentry->link_group_list, - group->dentry_list); + size_t pos; + struct wim_inode *inode; + struct hlist_node *cur; + + /* Try adding this dentry to an existing inode */ + pos = d_inode->i_ino % table->capacity; + hlist_for_each_entry(inode, cur, &table->array[pos], i_hlist) { + if (inode->i_ino == d_inode->i_ino) { + inode_add_dentry(dentry, inode); + inode->i_nlink++; return 0; } - group = group->next; } - /* Add new hard link group to the table */ + /* No inode in the table has the same number as this one, so add + * it to the table. */ + hlist_add_head(&d_inode->i_hlist, &table->array[pos]); - group = MALLOC(sizeof(struct link_group)); - if (!group) - return WIMLIB_ERR_NOMEM; - group->link_group_id = dentry->hard_link; - group->next = table->array[pos]; - INIT_LIST_HEAD(&dentry->link_group_list); - group->dentry_list = &dentry->link_group_list; - table->array[pos] = group; + wimlib_assert(d_inode->i_dentry.next == &dentry->d_alias); + wimlib_assert(d_inode->i_dentry.prev == &dentry->d_alias); + wimlib_assert(d_inode->i_nlink == 1); /* XXX Make the table grow when too many entries have been * inserted. */ @@ -139,245 +146,329 @@ int link_group_table_insert(struct dentry *dentry, void *__table) return 0; } -/* Frees a link group table. */ -void free_link_group_table(struct link_group_table *table) +static void print_inode_dentries(const struct wim_inode *inode) { - struct link_group *single, *next; - - if (!table) - return; - if (table->array) { - for (u64 i = 0; i < table->capacity; i++) { - struct link_group *group = table->array[i]; - struct link_group *next; - while (group) { - next = group->next; - FREE(group); - group = next; - } - } - FREE(table->array); - } - single = table->singles; - while (single) { - next = single->next; - FREE(single); - single = next; - } - - FREE(table); + struct wim_dentry *dentry; + inode_for_each_dentry(dentry, inode) + printf("`%s'\n", dentry->full_path_utf8); } -/* Assign the link group IDs to dentries in a link group table, and return the - * next available link group ID. */ -u64 assign_link_groups(struct link_group_table *table) +static void inconsistent_inode(const struct wim_inode *inode) { - DEBUG("Assigning link groups"); - - /* Assign consecutive link group IDs to each link group in the hash - * table */ - u64 id = 1; - for (u64 i = 0; i < table->capacity; i++) { - struct link_group *group = table->array[i]; - struct link_group *next_group; - struct dentry *dentry; - struct list_head *cur; - while (group) { - cur = group->dentry_list; - do { - dentry = container_of(cur, - struct dentry, - link_group_list); - dentry->hard_link = id; - cur = cur->next; - } while (cur != group->dentry_list); - id++; - group = group->next; - } - } - /* Assign link group IDs to the link groups that previously had link - * group IDs of 0, and insert them into the hash table */ - struct link_group *single = table->singles; - while (single) { - struct dentry *dentry; - struct link_group *next_single; - size_t pos; - - next_single = single->next; + ERROR("An inconsistent hard link group that cannot be corrected has " + "been detected"); + ERROR("The dentries are located at the following paths:"); +#ifdef ENABLE_ERROR_MESSAGES + print_inode_dentries(inode); +#endif +} - dentry = container_of(single->dentry_list, struct dentry, - link_group_list); - dentry->hard_link = id; +static bool ref_inodes_consistent(const struct wim_inode * restrict ref_inode_1, + const struct wim_inode * restrict ref_inode_2) +{ + wimlib_assert(ref_inode_1 != ref_inode_2); - pos = id % table->capacity; - single->next = table->array[pos]; - table->array[pos] = single; + if (ref_inode_1->i_num_ads != ref_inode_2->i_num_ads) + return false; + if (ref_inode_1->i_security_id != ref_inode_2->i_security_id + || ref_inode_1->i_attributes != ref_inode_2->i_attributes) + return false; + for (unsigned i = 0; i <= ref_inode_1->i_num_ads; i++) { + const u8 *ref_1_hash, *ref_2_hash; + ref_1_hash = inode_stream_hash(ref_inode_1, i); + ref_2_hash = inode_stream_hash(ref_inode_2, i); + if (!hashes_equal(ref_1_hash, ref_2_hash)) + return false; + if (i && !ads_entries_have_same_name(&ref_inode_1->i_ads_entries[i - 1], + &ref_inode_2->i_ads_entries[i - 1])) + return false; - single = next_single; - id++; } - table->singles = NULL; - return id; + return true; } -static bool dentries_have_same_ads(const struct dentry *d1, - const struct dentry *d2) +static bool inodes_consistent(const struct wim_inode * restrict ref_inode, + const struct wim_inode * restrict inode) { - /* Verify stream names and hashes are the same */ - for (u16 i = 0; i < d1->num_ads; i++) { - if (strcmp(d1->ads_entries[i].stream_name_utf8, - d2->ads_entries[i].stream_name_utf8) != 0) + wimlib_assert(ref_inode != inode); + + if (ref_inode->i_num_ads != inode->i_num_ads && + inode->i_num_ads != 0) + return false; + if (ref_inode->i_security_id != inode->i_security_id + || ref_inode->i_attributes != inode->i_attributes) + return false; + for (unsigned i = 0; i <= min(ref_inode->i_num_ads, inode->i_num_ads); i++) { + const u8 *ref_hash, *hash; + ref_hash = inode_stream_hash(ref_inode, i); + hash = inode_stream_hash(inode, i); + if (!hashes_equal(ref_hash, hash) && !is_zero_hash(hash)) return false; - if (!hashes_equal(d1->ads_entries[i].hash, - d2->ads_entries[i].hash)) + if (i && !ads_entries_have_same_name(&ref_inode->i_ads_entries[i - 1], + &inode->i_ads_entries[i - 1])) return false; } return true; } -/* - * Share the alternate stream entries between hard-linked dentries. +/* Fix up a "true" inode and check for inconsistencies */ +static int fix_true_inode(struct wim_inode *inode, struct hlist_head *inode_list) +{ + struct wim_dentry *dentry; + struct wim_dentry *ref_dentry = NULL; + struct wim_inode *ref_inode; + u64 last_ctime = 0; + u64 last_mtime = 0; + u64 last_atime = 0; + + inode_for_each_dentry(dentry, inode) { + if (!ref_dentry || dentry->d_inode->i_num_ads > ref_dentry->d_inode->i_num_ads) + ref_dentry = dentry; + if (dentry->d_inode->i_creation_time > last_ctime) + last_ctime = dentry->d_inode->i_creation_time; + if (dentry->d_inode->i_last_write_time > last_mtime) + last_mtime = dentry->d_inode->i_last_write_time; + if (dentry->d_inode->i_last_access_time > last_atime) + last_atime = dentry->d_inode->i_last_access_time; + } + + ref_inode = ref_dentry->d_inode; + ref_inode->i_nlink = 1; + hlist_add_head(&ref_inode->i_hlist, inode_list); + + list_del(&inode->i_dentry); + list_add(&ref_inode->i_dentry, &ref_dentry->d_alias); + + inode_for_each_dentry(dentry, ref_inode) { + if (dentry != ref_dentry) { + if (!inodes_consistent(ref_inode, dentry->d_inode)) { + inconsistent_inode(ref_inode); + return WIMLIB_ERR_INVALID_DENTRY; + } + /* Free the unneeded `struct wim_inode'. */ + dentry->d_inode->i_hlist.next = NULL; + dentry->d_inode->i_hlist.pprev = NULL; + free_inode(dentry->d_inode); + dentry->d_inode = ref_inode; + ref_inode->i_nlink++; + } + } + ref_inode->i_creation_time = last_ctime; + ref_inode->i_last_write_time = last_mtime; + ref_inode->i_last_access_time = last_atime; + wimlib_assert(inode_link_count(ref_inode) == ref_inode->i_nlink); + return 0; +} + +/* + * Fixes up a nominal inode. * - * Notes: - * - If you use 'imagex.exe' (version 6.1.7600.16385) to create a WIM containing - * hard-linked files, only one dentry in the hard link set will refer to data - * streams, including all alternate data streams. The rest of the dentries in - * the hard link set will be marked as having 0 alternate data streams and - * will not refer to any main file stream (the SHA1 message digest will be all - * 0's). + * By a nominal inode we mean a group of two or more dentries that share the + * same hard link group ID. * - * - However, if you look at the WIM's that Microsoft actually distributes (e.g. - * Windows 7/8 boot.wim, install.wim), it's not the same as above. The - * dentries in hard link sets will have stream information duplicated. I - * can't say anything about the alternate data streams because these WIMs do - * not contain alternate data streams. + * If dentries in the inode are found to be inconsistent, we may split the inode + * into several "true" inodes. * - * - Windows 7 'install.wim' contains hard link sets containing dentries with - * inconsistent streams and other inconsistent information such as security - * ID. The only way I can think to handle these is to treat the hard link - * grouping as erroneous and split up the hard link group. + * After splitting up each nominal inode into the "true" inodes we will + * canonicalize the link group by getting rid of all the unnecessary `struct + * wim_inode's. There will be just one `struct wim_inode' for each hard link + * group remaining. */ -static int share_dentry_ads(struct dentry *owner, struct dentry *user) +static int fix_nominal_inode(struct wim_inode *inode, + struct hlist_head *inode_list) { - const char *mismatch_type; - bool data_streams_shared = true; - wimlib_assert(owner->num_ads == 0 || - owner->ads_entries != user->ads_entries); - if (owner->attributes != user->attributes) { - mismatch_type = "attributes"; - goto mismatch; + struct wim_dentry *dentry; + struct hlist_node *cur, *tmp; + int ret; + size_t num_true_inodes; + + wimlib_assert(inode->i_nlink == inode_link_count(inode)); + + LIST_HEAD(dentries_with_data_streams); + LIST_HEAD(dentries_with_no_data_streams); + HLIST_HEAD(true_inodes); + + /* Create a list of dentries in the nominal inode that have at + * least one data stream with a non-zero hash, and another list that + * contains the dentries that have a zero hash for all data streams. */ + inode_for_each_dentry(dentry, inode) { + for (unsigned i = 0; i <= dentry->d_inode->i_num_ads; i++) { + const u8 *hash; + hash = inode_stream_hash(dentry->d_inode, i); + if (!is_zero_hash(hash)) { + list_add(&dentry->tmp_list, + &dentries_with_data_streams); + goto next_dentry; + } + } + list_add(&dentry->tmp_list, + &dentries_with_no_data_streams); + next_dentry: + ; } - if (owner->attributes & FILE_ATTRIBUTE_DIRECTORY) { - WARNING("`%s' is hard-linked to `%s', which is a directory ", - user->full_path_utf8, owner->full_path_utf8); - return WIMLIB_ERR_INVALID_DENTRY; + + /* If there are no dentries with data streams, we require the nominal + * inode to be a true inode */ + if (list_empty(&dentries_with_data_streams)) { + #ifdef ENABLE_DEBUG + if (inode->i_nlink > 1) { + DEBUG("Found link group of size %u without " + "any data streams:", inode->i_nlink); + print_inode_dentries(inode); + DEBUG("We are going to interpret it as true " + "link group, provided that the dentries " + "are consistent."); + } + #endif + return fix_true_inode(inode, inode_list); } - if (owner->security_id != user->security_id) { - mismatch_type = "security ID"; - goto mismatch; + + /* One or more dentries had data streams specified. We check each of + * these dentries for consistency with the others to form a set of true + * inodes. */ + num_true_inodes = 0; + list_for_each_entry(dentry, &dentries_with_data_streams, tmp_list) { + /* Look for a true inode that is consistent with this dentry and + * add this dentry to it. Or, if none of the true inodes are + * consistent with this dentry, add a new one (if that happens, + * we have split the hard link group). */ + hlist_for_each_entry(inode, cur, &true_inodes, i_hlist) { + if (ref_inodes_consistent(inode, dentry->d_inode)) { + inode_add_dentry(dentry, inode); + goto next_dentry_2; + } + } + num_true_inodes++; + INIT_LIST_HEAD(&dentry->d_inode->i_dentry); + inode_add_dentry(dentry, dentry->d_inode); + hlist_add_head(&dentry->d_inode->i_hlist, &true_inodes); +next_dentry_2: + ; } - if (!hashes_equal(owner->hash, user->hash)) { - if (is_zero_hash(user->hash)) { - data_streams_shared = false; - copy_hash(user->hash, owner->hash); - } else { - mismatch_type = "main file resource"; - goto mismatch; + + wimlib_assert(num_true_inodes != 0); + + /* If there were dentries with no data streams, we require there to only + * be one true inode so that we know which inode to assign the + * streamless dentries to. */ + if (!list_empty(&dentries_with_no_data_streams)) { + if (num_true_inodes != 1) { + ERROR("Hard inode ambiguity detected!"); + ERROR("We split up inode 0x%"PRIx64" due to " + "inconsistencies,", inode->i_ino); + ERROR("but dentries with no stream information remained. " + "We don't know which inode"); + ERROR("to assign them to."); + return WIMLIB_ERR_INVALID_DENTRY; } + inode = container_of(true_inodes.first, struct wim_inode, i_hlist); + /* Assign the streamless dentries to the one and only true + * inode. */ + list_for_each_entry(dentry, &dentries_with_no_data_streams, tmp_list) + inode_add_dentry(dentry, inode); } - if (data_streams_shared) { - if (!dentries_have_same_ads(owner, user)) { - mismatch_type = "Alternate Stream Entries"; - goto mismatch; + #ifdef ENABLE_DEBUG + if (num_true_inodes != 1) { + inode = container_of(true_inodes.first, struct wim_inode, i_hlist); + + printf("Split nominal inode 0x%"PRIx64" into %zu " + "inodes:\n", + inode->i_ino, num_true_inodes); + puts("------------------------------------------------------------------------------"); + size_t i = 1; + hlist_for_each_entry(inode, cur, &true_inodes, i_hlist) { + printf("[Split inode %zu]\n", i++); + print_inode_dentries(inode); + putchar('\n'); } + puts("------------------------------------------------------------------------------"); + } + #endif + + hlist_for_each_entry_safe(inode, cur, tmp, &true_inodes, i_hlist) { + ret = fix_true_inode(inode, inode_list); + if (ret != 0) + return ret; } - dentry_free_ads_entries(user); - user->ads_entries = owner->ads_entries; - user->ads_entries_status = ADS_ENTRIES_USER; return 0; -mismatch: - WARNING("Dentries `%s' and `%s' in the same hard-link group but " - "do not share the same %s", - owner->full_path_utf8, user->full_path_utf8, - mismatch_type); - return WIMLIB_ERR_INVALID_DENTRY; } -static int link_group_free_duplicate_data(struct link_group *group, - struct link_group **bad_links) +static int fix_inodes(struct wim_inode_table *table, + struct hlist_head *inode_list) { - struct dentry *owner, *user, *tmp; - - /* Find a dentry with non-zero hash to use as a possible link group - * owner (see comments above the share_dentry_ads() function */ - owner = container_of(group->dentry_list, struct dentry, - link_group_list); - do { - /* imagex.exe may move the un-named data stream from the dentry - * itself to the first alternate data stream, if there are - * other alternate data streams */ - if (!is_zero_hash(owner->hash) || - (owner->num_ads && !is_zero_hash(owner->ads_entries[0].hash))) - goto found_owner; - owner = container_of(owner->link_group_list.next, - struct dentry, - link_group_list); - } while (&owner->link_group_list != group->dentry_list); - - ERROR("Could not find owner of data streams in hard link group"); - return WIMLIB_ERR_INVALID_DENTRY; -found_owner: - owner->ads_entries_status = ADS_ENTRIES_OWNER; - list_for_each_entry_safe(user, tmp, &owner->link_group_list, - link_group_list) - { - /* I would like it to be an error if two dentries are in the - * same hard link group but have irreconcilable differences such - * as different file permissions, but unfortunately some of M$'s - * WIMs contain many instances of this error. This problem is - * worked around here by splitting each offending dentry off - * into its own hard link group. */ - if (share_dentry_ads(owner, user) != 0) { - struct link_group *single; - single = MALLOC(sizeof(struct link_group)); - if (!single) - return WIMLIB_ERR_NOMEM; - list_del(&user->link_group_list); - INIT_LIST_HEAD(&user->link_group_list); - single->link_group_id = 0; - single->next = *bad_links; - single->dentry_list = &user->link_group_list; - *bad_links = single; - user->ads_entries_status = ADS_ENTRIES_OWNER; + struct wim_inode *inode; + struct hlist_node *cur, *tmp; + int ret; + INIT_HLIST_HEAD(inode_list); + for (u64 i = 0; i < table->capacity; i++) { + hlist_for_each_entry_safe(inode, cur, tmp, &table->array[i], i_hlist) { + ret = fix_nominal_inode(inode, inode_list); + if (ret != 0) + return ret; } } + hlist_for_each_safe(cur, tmp, &table->extra_inodes) + hlist_add_head(cur, inode_list); return 0; } /* - * Goes through each link group and shares the ads_entries (Alternate Data - * Stream entries) field of each dentry between members of a hard link group. + * dentry_tree_fix_inodes(): + * + * This function takes as input a tree of WIM dentries that initially has a + * different inode associated with each dentry. Sets of dentries that should + * share the same inode (a.k.a. hard link groups) are built using the i_ino + * field of each inode, then the link count and alias list for one inode in each + * set is set correctly and the unnecessary struct wim_inode's freed. The + * effect is to correctly associate exactly one struct wim_inode with each + * original inode, regardless of how many dentries are aliases for that inode. + * + * The special inode number of 0 indicates that the dentry is in a hard link + * group by itself, and therefore has a 'struct wim_inode' with i_nlink=1 to + * itself. * - * In the process, the dentries in each link group are checked for consistency. - * If they contain data features that indicate they cannot really be in the same - * hard link group, this should be an error, but in reality this case needs to - * be handled, so we split the dentries into different hard link groups. + * This function also checks the dentries in each hard link group for + * consistency. In some WIMs, such as install.wim for some versions of Windows + * 7, dentries can share the same hard link group ID but not actually be hard + * linked to each other (based on conflicting information, such as file + * contents). This should be an error, but this case needs be handled. So, + * each "nominal" inode (the inode based on the inode numbers provided in the + * WIM) is examined for consistency and may be split into multiple "true" inodes + * that are maximally sized consistent sets of dentries. * - * One of the dentries in the group is arbitrarily assigned the role of "owner" - * (ADS_ENTRIES_OWNER), while the others are "users" (ADS_ENTRIES_USER). + * Return 0 on success; WIMLIB_ERR_NOMEM or WIMLIB_ERR_INVALID_DENTRY on + * failure. On success, the list of "true" inodes, linked by the i_hlist field, + * is returned in the hlist @inode_list. */ -int link_groups_free_duplicate_data(struct link_group_table *table) +int dentry_tree_fix_inodes(struct wim_dentry *root, struct hlist_head *inode_list) { - for (u64 i = 0; i < table->capacity; i++) { - struct link_group *group = table->array[i]; - while (group) { - int ret; - ret = link_group_free_duplicate_data(group, - &table->singles); - if (ret != 0) - return ret; - group = group->next; - } + struct wim_inode_table inode_tab; + int ret; + + DEBUG("Inserting dentries into inode table"); + ret = init_inode_table(&inode_tab, 9001); + if (ret != 0) + return ret; + + for_dentry_in_tree(root, inode_table_insert, &inode_tab); + + DEBUG("Cleaning up the hard link groups"); + ret = fix_inodes(&inode_tab, inode_list); + destroy_inode_table(&inode_tab); + return ret; +} + +/* Assign inode numbers to a list of inodes and return the next available + * number. */ +u64 assign_inode_numbers(struct hlist_head *inode_list) +{ + DEBUG("Assigning inode numbers"); + struct wim_inode *inode; + struct hlist_node *cur; + u64 cur_ino = 1; + hlist_for_each_entry(inode, cur, inode_list, i_hlist) { + inode->i_ino = cur_ino; + cur_ino++; } - return 0; + return cur_ino; }