Version 1.0.2

[wimlib] / src / lookup_table.h

diff --git a/src/lookup_table.h b/src/lookup_table.h
index d99f4b750ae5b1687daa204b27a55f3a07ce169e..0017320c5e4a82f439005c05249346f20a0a1e14 100644 (file)
--- a/src/lookup_table.h
+++ b/src/lookup_table.h
@@ -142,16 +142,20 @@ struct lookup_table_entry {
        #endif
        };
        union {
-               /* Temporary field for creating a singly linked list.  Shouldn't
-                * really be here */
-               struct lookup_table_entry *next_lte_in_swm;
-
                /* @file_on_disk_fp and @attr are both used to cache file/stream
                 * handles so we don't have re-open them on every read */
+
+               /* Valid iff resource_location == RESOURCE_IN_FILE_ON_DISK */
                FILE *file_on_disk_fp;
        #ifdef WITH_NTFS_3G
+               /* Valid iff resource_location == RESOURCE_IN_NTFS_VOLUME */
                struct _ntfs_attr *attr;
        #endif
+
+               /* Pointer to inode that contains the opened file descriptors to
+                * this stream (valid iff resource_location ==
+                * RESOURCE_IN_STAGING_FILE) */
+               struct inode *lte_inode;
        };
 #ifdef WITH_FUSE
        u16 num_opened_fds;
@@ -164,6 +168,8 @@ struct lookup_table_entry {
         * dentries. */
        u32 out_refcnt;
 
+       u32 real_refcnt;
+
        /* When a WIM file is written, @output_resource_entry is filled
         * in with the resource entry for the output WIM.  This will not
         * necessarily be the same as the @resource_entry since:
@@ -174,16 +180,20 @@ struct lookup_table_entry {
        struct resource_entry output_resource_entry;
 
        /* This field is used for the special hardlink or symlink image
-        * application mode.   In these mode, all identical files are
-        * linked together, and @extracted_file will be set to the
-        * filename of the first extracted file containing this stream.
-        * */
+        * extraction mode.   In these mode, all identical files are linked
+        * together, and @extracted_file will be set to the filename of the
+        * first extracted file containing this stream.  */
        char *extracted_file;
 
-       /* List of lookup table entries that correspond to streams that have
-        * been extracted to the staging directory when modifying a read-write
-        * mounted WIM. */
-       struct list_head staging_list;
+       union {
+               /* List of lookup table entries that correspond to streams that have
+                * been extracted to the staging directory when modifying a read-write
+                * mounted WIM. */
+               struct list_head staging_list;
+
+               /* Temporary field for creating a singly linked list. */
+               struct lookup_table_entry *next_lte_in_swm;
+       };
 };
 
 static inline u64 wim_resource_size(const struct lookup_table_entry *lte)
@@ -224,21 +234,6 @@ static inline void lookup_table_unlink(struct lookup_table *table,
        table->num_entries--;
 }
 
-
-extern struct lookup_table_entry *
-lookup_table_decrement_refcnt(struct lookup_table* table, const u8 hash[]);
-
-#ifdef WITH_FUSE
-extern struct lookup_table_entry *
-lte_decrement_num_opened_fds(struct lookup_table_entry *lte,
-                            struct lookup_table *table);
-#endif
-
-extern struct lookup_table_entry *
-lte_decrement_refcnt(struct lookup_table_entry *lte,
-                    struct lookup_table *table);
-
-
 extern struct lookup_table_entry *new_lookup_table_entry();
 
 extern int for_lookup_table_entry(struct lookup_table *table, 
@@ -253,7 +248,14 @@ extern int lookup_resource(WIMStruct *w, const char *path,
                           struct lookup_table_entry **lte_ret,
                           u16 *stream_idx_ret);
 
-extern int zero_out_refcnts(struct lookup_table_entry *entry, void *ignore);
+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);
+
+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);
+extern int lte_free_extracted_file(struct lookup_table_entry *lte, void *ignone);
 
 extern void print_lookup_table_entry(const struct lookup_table_entry *entry);
 
@@ -295,7 +297,7 @@ inode_stream_lte_resolved(const struct inode *inode, unsigned stream_idx)
        if (stream_idx == 0)
                return inode->lte;
        else
-               return inode->ads_entries[stream_idx - 1]->lte;
+               return inode->ads_entries[stream_idx - 1].lte;
 }
 
 static inline struct lookup_table_entry *
@@ -311,7 +313,7 @@ inode_stream_lte_unresolved(const struct inode *inode, unsigned stream_idx,
        else
                return __lookup_resource(table,
                                         inode->ads_entries[
-                                               stream_idx - 1]->hash);
+                                               stream_idx - 1].hash);
 }
 /* 
  * Returns the lookup table entry for stream @stream_idx of the inode, where
@@ -339,7 +341,7 @@ static inline const u8 *inode_stream_hash_unresolved(const struct inode *inode,
        if (stream_idx == 0)
                return inode->hash;
        else
-               return inode->ads_entries[stream_idx - 1]->hash;
+               return inode->ads_entries[stream_idx - 1].hash;
 }
 
 
@@ -377,7 +379,7 @@ static inline u16 inode_stream_name_len(const struct inode *inode,
        if (stream_idx == 0)
                return 0;
        else
-               return inode->ads_entries[stream_idx - 1]->stream_name_len;
+               return inode->ads_entries[stream_idx - 1].stream_name_len;
 }
 
 static inline struct lookup_table_entry *