struct link_group **array;
u64 num_entries;
u64 capacity;
+ struct link_group *singles;
};
#include <sys/mman.h>
struct link_group_table *new_link_group_table(u64 capacity)
{
- return (struct link_group_table*)new_lookup_table(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->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;
}
/* Insert a dentry into the hard link group table based on its hard link group
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;
return 0;
}
* next available link group ID. */
u64 assign_link_groups(struct link_group_table *table)
{
- struct link_group *remaining_groups = NULL;
+ DEBUG("Assigning link groups");
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) {
- next_group = group->next;
- u64 cur_id;
- struct list_head *dentry_list = group->dentry_list;
- if (dentry_list->next == dentry_list) {
- /* Hard link group of size 1. Change the hard
- * link ID to 0 and discard the link_group */
- cur_id = 0;
- FREE(group);
- } else {
- /* Hard link group of size > 1. Assign the
- * dentries in the group the next available hard
- * link IDs and queue the group to be
- * re-inserted into the table. */
- cur_id = id++;
- group->next = remaining_groups;
- remaining_groups = group;
- }
- struct list_head *cur = dentry_list;
+ cur = group->dentry_list;
do {
dentry = container_of(cur,
struct dentry,
link_group_list);
- dentry->hard_link = cur_id;
+ dentry->hard_link = id;
cur = cur->next;
- } while (cur != dentry_list);
- group = next_group;
+ } while (cur != group->dentry_list);
+ id++;
+ group = group->next;
}
}
- memset(table->array, 0, table->capacity * sizeof(table->array[0]));
- table->num_entries = 0;
- while (remaining_groups) {
- struct link_group *group = remaining_groups;
- size_t pos = group->link_group_id % table->capacity;
-
- table->num_entries++;
- group->next = table->array[pos];
- table->array[pos] = group;
- remaining_groups = remaining_groups->next;
+ /* Singles */
+ struct link_group *single = table->singles;
+ while (single) {
+ struct dentry *dentry;
+ struct link_group *next_single;
+ size_t pos;
+
+ next_single = single->next;
+
+ dentry = container_of(single->dentry_list, struct dentry,
+ link_group_list);
+ dentry->hard_link = id;
+
+ pos = id % table->capacity;
+ single->next = table->array[pos];
+ table->array[pos] = single;
+
+ single = next_single;
+ id++;
}
+ table->singles = NULL;
return id;
}
-static int link_group_free_duplicate_data(struct link_group *group)
+static int link_group_free_duplicate_data(struct link_group *group,
+ struct link_group **bad_links)
{
- struct list_head *head;
- struct dentry *master;
+ struct dentry *master, *slave, *tmp;
- head = group->dentry_list;
- master = container_of(head, struct dentry, link_group_list);
- head = head->next;
+ master = container_of(group->dentry_list, struct dentry,
+ link_group_list);
master->link_group_master_status = GROUP_MASTER;
- while (head != group->dentry_list) {
- int ret = share_dentry_ads(master,
- container_of(head, struct dentry,
- link_group_list));
- if (ret != 0)
- return ret;
- head = head->next;
+
+ list_for_each_entry_safe(slave, tmp, group->dentry_list,
+ link_group_list)
+ {
+ /* I would it to be an error if two dentries are 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(master, slave) != 0) {
+ struct link_group *single;
+ single = MALLOC(sizeof(struct link_group));
+ if (!single)
+ return WIMLIB_ERR_NOMEM;
+ list_del(&slave->link_group_list);
+ INIT_LIST_HEAD(&slave->link_group_list);
+ single->link_group_id = 0;
+ single->next = *bad_links;
+ single->dentry_list = &slave->link_group_list;
+ *bad_links = single;
+ slave->link_group_master_status = GROUP_INDEPENDENT;
+ }
}
return 0;
}
for (u64 i = 0; i < table->capacity; i++) {
struct link_group *group = table->array[i];
while (group) {
- int ret = link_group_free_duplicate_data(group);
+ int ret;
+ ret = link_group_free_duplicate_data(group,
+ &table->singles);
if (ret != 0)
return ret;
group = group->next;