X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Flookup_table.h;h=dbcf55543254fc18ca48e78d7b18ff11a493b87e;hp=0017320c5e4a82f439005c05249346f20a0a1e14;hb=6cca349b45e66a2b2b82aa5dcd269a4bf61c50db;hpb=89198eafbaf6afac99dc74f77753466f9c1bc7f0

diff --git a/src/lookup_table.h b/src/lookup_table.h
index 0017320c..dbcf5554 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
@@ -177,7 +180,10 @@ struct lookup_table_entry {
 	 * 	- The stream may have a different compressed size in the
 	 * 	new WIM if the compression type changed
 	 */
-	struct resource_entry output_resource_entry;
+	union {
+		struct resource_entry output_resource_entry;
+		struct list_head msg_list;
+	};
 
 	/* This field is used for the special hardlink or symlink image
 	 * extraction mode.   In these mode, all identical files are linked
@@ -201,6 +207,11 @@ static inline u64 wim_resource_size(const struct lookup_table_entry *lte)
 	return lte->resource_entry.original_size;
 }
 
+static inline u64 wim_resource_chunks(const struct lookup_table_entry *lte)
+{
+	return (wim_resource_size(lte) + WIM_CHUNK_SIZE - 1) / WIM_CHUNK_SIZE;
+}
+
 static inline u64
 wim_resource_compressed_size(const struct lookup_table_entry *lte)
 {
@@ -223,11 +234,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(&lte->hash_list);
@@ -236,8 +247,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 +264,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 +283,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 +292,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);
@@ -302,7 +318,7 @@ inode_stream_lte_resolved(const struct inode *inode, unsigned stream_idx)
 
 static inline struct lookup_table_entry *
 inode_stream_lte_unresolved(const struct inode *inode, unsigned stream_idx,
-			     const struct lookup_table *table)
+			    const struct lookup_table *table)
 {
 	wimlib_assert(!inode->resolved);
 	wimlib_assert(stream_idx <= inode->num_ads);
@@ -315,7 +331,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 +372,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.