X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fhardlink.c;h=007e744dff5b719b3c1f7e3056a254aecd4416f2;hb=3ad1560f7040accb19afb4b31730d0820076b80b;hp=d9f0640d2982ca3db1a9583b3ce27d5aa76a24af;hpb=31f38a9a7a9ed5dc2c32bbb5fecd4050809a561c;p=wimlib diff --git a/src/hardlink.c b/src/hardlink.c index d9f0640d..007e744d 100644 --- a/src/hardlink.c +++ b/src/hardlink.c @@ -32,22 +32,22 @@ /* NULL NULL * ^ ^ - * dentry | | - * / \ ----------- ----------- + * dentry | | + * / \ ----------- ----------- * | dentry<---| struct | | struct |---> dentry - * \ / |inode| |inode| + * \ / | inode | | inode | * dentry ------------ ------------ * ^ ^ * | | * | | dentry * ----------- ----------- / \ * dentry<---| struct | | struct |---> dentry dentry - * / |inode| |inode| \ / + * / | inode | | inode | \ / * dentry ------------ ------------ dentry * ^ ^ * | | * ----------------- - * inode_table->array | idx 0 | idx 1 | + * inode_table->array | idx 0 | idx 1 | * ----------------- */ @@ -66,7 +66,7 @@ int init_inode_table(struct inode_table *table, size_t capacity) } -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; @@ -75,7 +75,7 @@ static size_t inode_link_count(const struct inode *inode) return size; } -/* +/* * Insert a dentry into the inode table based on its inode * ID. * @@ -93,7 +93,7 @@ static size_t inode_link_count(const struct inode *inode) int inode_table_insert(struct dentry *dentry, void *__table) { struct inode_table *table = __table; - struct inode *d_inode = dentry->inode; + struct inode *d_inode = dentry->d_inode; if (d_inode->ino == 0) { /* Single inode--- Add to the list of extra inodes (we can't put @@ -184,8 +184,8 @@ static bool ref_inodes_consistent(const struct inode * restrict ref_inode_1, 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->ads_entries[i - 1], - ref_inode_2->ads_entries[i - 1])) + if (i && !ads_entries_have_same_name(&ref_inode_1->ads_entries[i - 1], + &ref_inode_2->ads_entries[i - 1])) return false; } @@ -209,15 +209,15 @@ static bool inodes_consistent(const struct inode * restrict ref_inode, hash = inode_stream_hash(inode, i); if (!hashes_equal(ref_hash, hash) && !is_zero_hash(hash)) return false; - if (i && !ads_entries_have_same_name(ref_inode->ads_entries[i - 1], - inode->ads_entries[i - 1])) + if (i && !ads_entries_have_same_name(&ref_inode->ads_entries[i - 1], + &inode->ads_entries[i - 1])) return false; } return true; } /* Fix up a "true" inode and check for inconsistencies */ -static int fix_true_inode(struct inode *inode) +static int fix_true_inode(struct inode *inode, struct hlist_head *inode_list) { struct dentry *dentry; struct dentry *ref_dentry = NULL; @@ -227,31 +227,32 @@ static int fix_true_inode(struct inode *inode) u64 last_atime = 0; inode_for_each_dentry(dentry, inode) { - if (!ref_dentry || dentry->inode->num_ads > ref_dentry->inode->num_ads) + if (!ref_dentry || dentry->d_inode->num_ads > ref_dentry->d_inode->num_ads) ref_dentry = dentry; - if (dentry->inode->creation_time > last_ctime) - last_ctime = dentry->inode->creation_time; - if (dentry->inode->last_write_time > last_mtime) - last_mtime = dentry->inode->last_write_time; - if (dentry->inode->last_access_time > last_atime) - last_atime = dentry->inode->last_access_time; + if (dentry->d_inode->creation_time > last_ctime) + last_ctime = dentry->d_inode->creation_time; + if (dentry->d_inode->last_write_time > last_mtime) + last_mtime = dentry->d_inode->last_write_time; + if (dentry->d_inode->last_access_time > last_atime) + last_atime = dentry->d_inode->last_access_time; } - ref_inode = ref_dentry->inode; + ref_inode = ref_dentry->d_inode; ref_inode->link_count = 1; + hlist_add_head(&ref_inode->hlist, inode_list); list_del(&inode->dentry_list); list_add(&ref_inode->dentry_list, &ref_dentry->inode_dentry_list); inode_for_each_dentry(dentry, ref_inode) { if (dentry != ref_dentry) { - if (!inodes_consistent(ref_inode, dentry->inode)) { + if (!inodes_consistent(ref_inode, dentry->d_inode)) { inconsistent_inode(ref_inode); return WIMLIB_ERR_INVALID_DENTRY; } /* Free the unneeded `struct inode'. */ - free_inode(dentry->inode); - dentry->inode = ref_inode; + free_inode(dentry->d_inode); + dentry->d_inode = ref_inode; ref_inode->link_count++; } } @@ -262,7 +263,7 @@ static int fix_true_inode(struct inode *inode) return 0; } -/* +/* * Fixes up a nominal inode. * * By a nominal inode we mean a group of two or more dentries that share @@ -279,7 +280,7 @@ static int fix_true_inode(struct inode *inode) static int fix_nominal_inode(struct inode *inode, struct hlist_head *inode_list) { - struct dentry *dentry, *ref_dentry; + struct dentry *dentry; struct hlist_node *cur, *tmp; int ret; size_t num_true_inodes; @@ -294,9 +295,9 @@ fix_nominal_inode(struct inode *inode, struct hlist_head *inode_list) * 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->inode->num_ads; i++) { + for (unsigned i = 0; i <= dentry->d_inode->num_ads; i++) { const u8 *hash; - hash = inode_stream_hash(dentry->inode, i); + hash = inode_stream_hash(dentry->d_inode, i); if (!is_zero_hash(hash)) { list_add(&dentry->tmp_list, &dentries_with_data_streams); @@ -314,7 +315,7 @@ fix_nominal_inode(struct inode *inode, struct hlist_head *inode_list) if (list_empty(&dentries_with_data_streams)) { #ifdef ENABLE_DEBUG if (inode->link_count > 1) { - DEBUG("Found link group of size %zu without " + DEBUG("Found link group of size %u without " "any data streams:", inode->link_count); print_inode_dentries(inode); DEBUG("We are going to interpret it as true " @@ -322,8 +323,7 @@ fix_nominal_inode(struct inode *inode, struct hlist_head *inode_list) "are consistent."); } #endif - hlist_add_head(&inode->hlist, inode_list); - return fix_true_inode(inode); + return fix_true_inode(inode, inode_list); } /* One or more dentries had data streams specified. We check each of @@ -336,15 +336,15 @@ fix_nominal_inode(struct inode *inode, struct hlist_head *inode_list) * 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, hlist) { - if (ref_inodes_consistent(inode, dentry->inode)) { + if (ref_inodes_consistent(inode, dentry->d_inode)) { inode_add_dentry(dentry, inode); goto next_dentry_2; } } num_true_inodes++; - INIT_LIST_HEAD(&dentry->inode->dentry_list); - inode_add_dentry(dentry, dentry->inode); - hlist_add_head(&dentry->inode->hlist, &true_inodes); + INIT_LIST_HEAD(&dentry->d_inode->dentry_list); + inode_add_dentry(dentry, dentry->d_inode); + hlist_add_head(&dentry->d_inode->hlist, &true_inodes); next_dentry_2: ; } @@ -389,8 +389,7 @@ next_dentry_2: #endif hlist_for_each_entry_safe(inode, cur, tmp, &true_inodes, hlist) { - hlist_add_head(&inode->hlist, inode_list); - ret = fix_true_inode(inode); + ret = fix_true_inode(inode, inode_list); if (ret != 0) return ret; }