X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Flookup_table.h;h=305e637886b4264144eb87982eaa4733f94d4b6e;hb=868f9905359573d33f06c19106523535b309273b;hp=5e4d1f5836d444dc8bd41ca29db8ad50cc9ea25a;hpb=5c85ddd0c9dc90b43603317dcfb809bfc4d192bc;p=wimlib diff --git a/src/lookup_table.h b/src/lookup_table.h index 5e4d1f58..305e6378 100644 --- a/src/lookup_table.h +++ b/src/lookup_table.h @@ -36,21 +36,24 @@ struct ntfs_location { }; #endif -/* - * An entry in the lookup table in the WIM file. +/* + * An entry in the lookup table in the WIM file. * - * It is used to find data streams for files in the WIM. + * It is used to find data streams for files in the WIM. * * Metadata resources and reparse point data buffers will also have lookup table * entries associated with the data. * * The lookup_table_entry for a given dentry or alternate stream entry in the - * WIM is found using the SHA1 message digest field. + * WIM is found using the SHA1 message digest field. */ struct lookup_table_entry { /* List of lookup table entries in this hash bucket */ - struct hlist_node hash_list; + union { + struct hlist_node hash_list; + struct list_head list; + }; /* Location and size of the stream in the WIM, whether it is compressed * or not, and whether it's a metadata resource or not. This is an @@ -223,11 +226,11 @@ wim_resource_compression_type(const struct lookup_table_entry *lte) extern struct lookup_table *new_lookup_table(size_t capacity); -extern void lookup_table_insert(struct lookup_table *table, +extern void lookup_table_insert(struct lookup_table *table, struct lookup_table_entry *lte); /* Unlinks a lookup table entry from the table; does not free it. */ -static inline void lookup_table_unlink(struct lookup_table *table, +static inline void lookup_table_unlink(struct lookup_table *table, struct lookup_table_entry *lte) { hlist_del(<e->hash_list); @@ -236,8 +239,11 @@ static inline void lookup_table_unlink(struct lookup_table *table, extern struct lookup_table_entry *new_lookup_table_entry(); -extern int for_lookup_table_entry(struct lookup_table *table, - int (*visitor)(struct lookup_table_entry *, void *), +extern struct lookup_table_entry * +clone_lookup_table_entry(const struct lookup_table_entry *lte); + +extern int for_lookup_table_entry(struct lookup_table *table, + int (*visitor)(struct lookup_table_entry *, void *), void *arg); extern struct lookup_table_entry * @@ -250,8 +256,9 @@ extern int lookup_resource(WIMStruct *w, const char *path, extern void lte_decrement_refcnt(struct lookup_table_entry *lte, struct lookup_table *table); -extern void lte_decrement_num_opened_fds(struct lookup_table_entry *lte, - struct lookup_table *table); +#ifdef WITH_FUSE +extern void lte_decrement_num_opened_fds(struct lookup_table_entry *lte); +#endif extern int lte_zero_out_refcnt(struct lookup_table_entry *entry, void *ignore); extern int lte_zero_real_refcnt(struct lookup_table_entry *entry, void *ignore); @@ -268,6 +275,7 @@ extern int write_lookup_table_entry(struct lookup_table_entry *lte, void *__out) extern void free_lookup_table_entry(struct lookup_table_entry *lte); extern int dentry_resolve_ltes(struct dentry *dentry, void *__table); +extern int dentry_unresolve_ltes(struct dentry *dentry, void *ignore); /* Writes the lookup table to the output file. */ static inline int write_lookup_table(struct lookup_table *table, FILE *out) @@ -276,7 +284,7 @@ static inline int write_lookup_table(struct lookup_table *table, FILE *out) } /* Unlinks and frees an entry from a lookup table. */ -static inline void lookup_table_remove(struct lookup_table *table, +static inline void lookup_table_remove(struct lookup_table *table, struct lookup_table_entry *lte) { lookup_table_unlink(table, lte); @@ -315,7 +323,7 @@ inode_stream_lte_unresolved(const struct inode *inode, unsigned stream_idx, inode->ads_entries[ stream_idx - 1].hash); } -/* +/* * Returns the lookup table entry for stream @stream_idx of the inode, where * stream_idx = 0 means the default un-named file stream, and stream_idx >= 1 * corresponds to an alternate data stream. @@ -356,7 +364,7 @@ static inline const u8 *inode_stream_hash_resolved(const struct inode *inode, return zero_hash; } -/* +/* * Returns the hash for stream @stream_idx of the inode, where stream_idx = 0 * means the default un-named file stream, and stream_idx >= 1 corresponds to an * alternate data stream.