finish_write(): Reorganize

[wimlib] / src / lookup_table.h

diff --git a/src/lookup_table.h b/src/lookup_table.h
index 62d02d6900cab7906d2e672f3226fbcd9a72b887..c1716088f590206e802e4f71dda46552b1b374b2 100644 (file)
--- a/src/lookup_table.h
+++ b/src/lookup_table.h
@@ -40,7 +40,7 @@ struct ntfs_location {
        tchar *path;
        utf16lechar *stream_name;
        u16 stream_name_nchars;
-       struct _ntfs_volume **ntfs_vol_p;
+       struct _ntfs_volume *ntfs_vol;
        bool is_reparse_point;
 };
 #endif
@@ -139,7 +139,6 @@ struct wim_lookup_table_entry {
        u16 resource_location : 5;
        u8 unique_size : 1;
        u8 unhashed : 1;
-       u8 is_ads : 1;
 
        /* (On-disk field)
         * Number of times this lookup table entry is referenced by dentries.
@@ -160,7 +159,14 @@ struct wim_lookup_table_entry {
                 * table. */
                size_t hash_short;
 
-               struct wim_lookup_table_entry **my_ptr;
+               /* Unhashed entries only (unhashed == 1): these variables make
+                * it possible to find the to the pointer to this 'struct
+                * wim_lookup_table_entry' contained in a 'struct wim_ads_entry'
+                * or 'struct wim_inode'.  */
+               struct {
+                       struct wim_inode *back_inode;
+                       u32 back_stream_id;
+               };
        };
 
        /* When a WIM file is written, out_refcnt starts at 0 and is incremented
@@ -173,26 +179,24 @@ struct wim_lookup_table_entry {
        /* Pointers to somewhere where the stream is actually located.  See the
         * comments for the @resource_location field above. */
        union {
+               void *resource_loc_private;
                WIMStruct *wim;
                tchar *file_on_disk;
-               tchar *staging_file_name;
                void *attached_buffer;
+       #ifdef WITH_FUSE
+               tchar *staging_file_name;
+       #endif
        #ifdef WITH_NTFS_3G
                struct ntfs_location *ntfs_loc;
        #endif
        };
 
-       /* Pointer to inode that contains the opened file descriptors to
-        * this stream (valid iff resource_location ==
-        * RESOURCE_IN_STAGING_FILE) */
-       struct wim_inode *lte_inode;
-
        u32 real_refcnt;
 
        union {
-               #ifdef WITH_FUSE
+       #ifdef WITH_FUSE
                u16 num_opened_fds;
-               #endif
+       #endif
 
                /* This field is used for the special hardlink or symlink image
                 * extraction mode.   In these mode, all identical files are linked
@@ -216,17 +220,18 @@ struct wim_lookup_table_entry {
 
                struct {
                        struct hlist_node hash_list_2;
+
                        struct list_head write_streams_list;
                };
        };
 
-       /* List of lookup table entries that correspond to streams that have
-        * been extracted to the staging directory when modifying a read-write
-        * mounted WIM.
-        *
-        * This field is also used to make other lists of lookup table entries.
-        * */
-       struct list_head staging_list;
+       /* Temporary list fields */
+       union {
+               struct list_head unhashed_list;
+               struct list_head swm_stream_list;
+               struct list_head extraction_list;
+               struct list_head export_stream_list;
+       };
 };
 
 static inline u64
@@ -293,6 +298,7 @@ lookup_table_insert(struct wim_lookup_table *table, struct wim_lookup_table_entr
 static inline void
 lookup_table_unlink(struct wim_lookup_table *table, struct wim_lookup_table_entry *lte)
 {
+       wimlib_assert(!lte->unhashed);
        hlist_del(&lte->hash_list);
        wimlib_assert(table->num_entries != 0);
        table->num_entries--;
@@ -317,7 +323,7 @@ for_lookup_table_entry(struct wim_lookup_table *table,
                       void *arg);
 
 extern int
-sort_stream_list_by_wim_position(struct list_head *stream_list);
+cmp_streams_by_wim_position(const void *p1, const void *p2);
 
 extern int
 for_lookup_table_entry_pos_sorted(struct wim_lookup_table *table,
@@ -478,15 +484,21 @@ lookup_table_total_stream_size(struct wim_lookup_table *table);
 static inline void
 lookup_table_insert_unhashed(struct wim_lookup_table *table,
                             struct wim_lookup_table_entry *lte,
-                            struct wim_lookup_table_entry **my_ptr)
+                            struct wim_inode *back_inode,
+                            u32 back_stream_id)
 {
        lte->unhashed = 1;
-       list_add_tail(&lte->staging_list, table->unhashed_streams);
-       lte->my_ptr = my_ptr;
-       *my_ptr = lte;
+       lte->back_inode = back_inode;
+       lte->back_stream_id = back_stream_id;
+       list_add_tail(&lte->unhashed_list, table->unhashed_streams);
 }
 
-extern void
-free_lte_list(struct list_head *list);
+extern int
+hash_unhashed_stream(struct wim_lookup_table_entry *lte,
+                    struct wim_lookup_table *lookup_table,
+                    struct wim_lookup_table_entry **lte_ret);
+
+extern struct wim_lookup_table_entry **
+retrieve_lte_pointer(struct wim_lookup_table_entry *lte);
 
 #endif