X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fhardlink.c;h=7603670df55c8083146c15d2090bbe9e8315ef7a;hb=b3d65ccab09cc7f33380cb5bf43709349d079087;hp=2fd3857018c19be0e21044ef37af1c7e8fcf2a99;hpb=7231431086332de22b2556477bcc5fc2c3e4bdcf;p=wimlib diff --git a/src/hardlink.c b/src/hardlink.c index 2fd38570..7603670d 100644 --- a/src/hardlink.c +++ b/src/hardlink.c @@ -51,8 +51,34 @@ * ----------------- */ +/* Hash table to find inodes, identified by their inode ID. + * */ +struct inode_table { + /* Fields for the hash table */ + struct hlist_head *array; + u64 num_entries; + u64 capacity; + + /* + * 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 + * ID with some other inode until assign_inode_numbers() is called. + */ + struct hlist_head extra_inodes; +}; + +static inline void destroy_inode_table(struct inode_table *table) +{ + FREE(table->array); +} -int init_inode_table(struct inode_table *table, size_t capacity) +static int init_inode_table(struct inode_table *table, size_t capacity) { table->array = CALLOC(capacity, sizeof(table->array[0])); if (!table->array) { @@ -65,8 +91,7 @@ int init_inode_table(struct inode_table *table, size_t capacity) return 0; } - -static size_t inode_link_count(const struct inode *inode) +static inline size_t inode_link_count(const struct inode *inode) { const struct list_head *cur; size_t size = 0; @@ -90,7 +115,7 @@ static size_t inode_link_count(const struct inode *inode) * we keep a linked list of the single dentries, and assign them inode * numbers later. */ -int inode_table_insert(struct dentry *dentry, void *__table) +static int inode_table_insert(struct dentry *dentry, void *__table) { struct inode_table *table = __table; struct inode *d_inode = dentry->d_inode; @@ -162,10 +187,12 @@ static void print_inode_dentries(const struct inode *inode) static void inconsistent_inode(const struct inode *inode) { - ERROR("An inconsistent hard link group that we cannot correct has been " - "detected"); + 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 } static bool ref_inodes_consistent(const struct inode * restrict ref_inode_1, @@ -277,8 +304,8 @@ static int fix_true_inode(struct inode *inode, struct hlist_head *inode_list) * inodes'. There will be just one `struct inode' for each hard link group * remaining. */ -static int -fix_nominal_inode(struct inode *inode, struct hlist_head *inode_list) +static int fix_nominal_inode(struct inode *inode, + struct hlist_head *inode_list) { struct dentry *dentry; struct hlist_node *cur, *tmp; @@ -411,7 +438,7 @@ next_dentry_2: * split inodes as well as the inodes that were good before, is returned in the * list @inode_list. */ -int fix_inodes(struct inode_table *table, struct hlist_head *inode_list) +static int fix_inodes(struct inode_table *table, struct hlist_head *inode_list) { struct inode *inode; struct hlist_node *cur, *tmp; @@ -428,3 +455,21 @@ int fix_inodes(struct inode_table *table, struct hlist_head *inode_list) hlist_add_head(cur, inode_list); return 0; } + +int dentry_tree_fix_inodes(struct dentry *root, struct hlist_head *inode_list) +{ + struct 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; +}