X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Flookup_table.c;h=3a1e2d25fa6b7060504115f6d9d2876d19938d2e;hb=89198eafbaf6afac99dc74f77753466f9c1bc7f0;hp=776ad94b41a72769768e161971208ffd903435ac;hpb=9b1647d673092a6c53a90c1d89831a5131660b9d;p=wimlib diff --git a/src/lookup_table.c b/src/lookup_table.c index 776ad94b..3a1e2d25 100644 --- a/src/lookup_table.c +++ b/src/lookup_table.c @@ -76,10 +76,6 @@ struct lookup_table_entry *new_lookup_table_entry() void free_lookup_table_entry(struct lookup_table_entry *lte) { if (lte) { -#ifdef WITH_FUSE - if (lte->staging_list.next) - list_del(<e->staging_list); -#endif switch (lte->resource_location) { case RESOURCE_IN_STAGING_FILE: case RESOURCE_IN_ATTACHED_BUFFER: @@ -148,8 +144,12 @@ void lookup_table_insert(struct lookup_table *table, static void finalize_lte(struct lookup_table_entry *lte) { #ifdef WITH_FUSE - if (lte->resource_location == RESOURCE_IN_STAGING_FILE) + if (lte->resource_location == RESOURCE_IN_STAGING_FILE) { unlink(lte->staging_file_name); + wimlib_assert(lte->staging_list.next); + wimlib_assert(lte->staging_list.prev); + list_del(<e->staging_list); + } #endif free_lookup_table_entry(lte); } @@ -158,39 +158,28 @@ static void finalize_lte(struct lookup_table_entry *lte) * reference count reaches 0, it is unlinked from the lookup table. If, * furthermore, the entry has no opened file descriptors associated with it, the * entry is freed. */ -struct lookup_table_entry * -lte_decrement_refcnt(struct lookup_table_entry *lte, struct lookup_table *table) +void lte_decrement_refcnt(struct lookup_table_entry *lte, + struct lookup_table *table) { - if (lte) { - wimlib_assert(lte->refcnt); - if (--lte->refcnt == 0) { - lookup_table_unlink(table, lte); - #ifdef WITH_FUSE - if (lte->num_opened_fds == 0) - #endif - { - finalize_lte(lte); - lte = NULL; - } - } + wimlib_assert(lte); + wimlib_assert(lte->refcnt); + if (--lte->refcnt == 0) { + lookup_table_unlink(table, lte); + #ifdef WITH_FUSE + if (lte->num_opened_fds == 0) + #endif + finalize_lte(lte); } - return lte; } #ifdef WITH_FUSE -struct lookup_table_entry * -lte_decrement_num_opened_fds(struct lookup_table_entry *lte, - struct lookup_table *table) +void lte_decrement_num_opened_fds(struct lookup_table_entry *lte, + struct lookup_table *table) { - if (lte) { - wimlib_assert(lte->num_opened_fds); - if (--lte->num_opened_fds == 0 && lte->refcnt == 0) { - lookup_table_unlink(table, lte); - finalize_lte(lte); - lte = NULL; - } - } - return lte; + wimlib_assert(lte); + wimlib_assert(lte->num_opened_fds); + if (--lte->num_opened_fds == 0 && lte->refcnt == 0) + finalize_lte(lte); } #endif @@ -358,10 +347,22 @@ int write_lookup_table_entry(struct lookup_table_entry *lte, void *__out) } +int lte_zero_real_refcnt(struct lookup_table_entry *lte, void *ignore) +{ + lte->real_refcnt = 0; + return 0; +} -int zero_out_refcnts(struct lookup_table_entry *entry, void *ignore) +int lte_zero_out_refcnt(struct lookup_table_entry *lte, void *ignore) { - entry->out_refcnt = 0; + lte->out_refcnt = 0; + return 0; +} + +int lte_free_extracted_file(struct lookup_table_entry *lte, void *ignone) +{ + FREE(lte->extracted_file); + lte->extracted_file = NULL; return 0; } @@ -439,6 +440,8 @@ __lookup_resource(const struct lookup_table *table, const u8 hash[]) struct lookup_table_entry *lte; struct hlist_node *pos; + wimlib_assert(table); + i = *(size_t*)hash % table->capacity; hlist_for_each_entry(lte, pos, &table->array[i], hash_list) if (hashes_equal(hash, lte->hash)) @@ -446,6 +449,7 @@ __lookup_resource(const struct lookup_table *table, const u8 hash[]) return NULL; } +#ifdef WITH_FUSE /* * Finds the dentry, lookup table entry, and stream index for a WIM file stream, * given a path name. @@ -479,7 +483,7 @@ int lookup_resource(WIMStruct *w, const char *path, if (!dentry) return -ENOENT; - inode = dentry->inode; + inode = dentry->d_inode; wimlib_assert(inode->resolved); @@ -512,8 +516,9 @@ out: *stream_idx_ret = stream_idx; return 0; } +#endif -static int inode_resolve_ltes(struct inode *inode, struct lookup_table *table) +static void inode_resolve_ltes(struct inode *inode, struct lookup_table *table) { struct lookup_table_entry *lte; @@ -524,12 +529,10 @@ static int inode_resolve_ltes(struct inode *inode, struct lookup_table *table) /* Resolve the alternate data streams */ for (u16 i = 0; i < inode->num_ads; i++) { - struct ads_entry *cur_entry = inode->ads_entries[i]; - + struct ads_entry *cur_entry = &inode->ads_entries[i]; lte = __lookup_resource(table, cur_entry->hash); cur_entry->lte = lte; } - return 0; } /* Resolve a dentry's lookup table entries @@ -543,25 +546,21 @@ static int inode_resolve_ltes(struct inode *inode, struct lookup_table *table) */ int dentry_resolve_ltes(struct dentry *dentry, void *table) { - if (dentry->inode->resolved) - return 0; - else - return inode_resolve_ltes(dentry->inode, table); + if (!dentry->d_inode->resolved) + inode_resolve_ltes(dentry->d_inode, table); + return 0; } - - - -/* Return the lookup table entry for the unnamed data stream of a inode, or +/* Return the lookup table entry for the unnamed data stream of an inode, or * NULL if there is none. * * You'd think this would be easier than it actually is, since the unnamed data * stream should be the one referenced from the inode itself. Alas, if there * are named data streams, Microsoft's "imagex.exe" program will put the unnamed - * data stream in one of the alternate data streams instead of inside the - * inode. So we need to check the alternate data streams too. + * data stream in one of the alternate data streams instead of inside the WIM + * dentry itself. So we need to check the alternate data streams too. * - * Also, note that a inode may appear to have than one unnamed stream, but if + * Also, note that a dentry may appear to have than one unnamed stream, but if * the SHA1 message digest is all 0's then the corresponding stream does not * really "count" (this is the case for the inode's own file stream when the * file stream that should be there is actually in one of the alternate stream