struct blob_descriptor;
struct blob_table;
struct wim_dentry;
+struct wim_inode_extra;
struct wim_security_data;
struct wimfs_fd;
u32 i_attributes;
/* Root of a balanced binary search tree storing the child directory
- * entries of this inode, if any. Keyed by wim_dentry->file_name, case
+ * entries of this inode, if any. Keyed by wim_dentry->d_name, case
* sensitively. If this inode is not a directory or if it has no
* children then this will be an empty tree (NULL). */
struct avl_tree_node *i_children;
/* Root of a balanced binary search tree storing the child directory
- * entries of this inode, if any. Keyed by wim_dentry->file_name, case
+ * entries of this inode, if any. Keyed by wim_dentry->d_name, case
* insensitively. If this inode is not a directory or if it has no
* children then this will be an empty tree (NULL). */
struct avl_tree_node *i_children_ci;
/* List of dentries that are aliases for this inode. There will be
* i_nlink dentries in this list. */
- struct hlist_head i_dentry;
+ struct hlist_head i_alias_list;
/* Field to place this inode into a list. While reading a WIM image or
* adding files to a WIM image this is owned by the inode table;
* otherwise this links the inodes for the WIM image. */
- struct hlist_node i_hlist;
+ struct hlist_node i_hlist_node;
/* Number of dentries that are aliases for this inode. */
u32 i_nlink : 30;
- /* Flag used to mark this inode as visited; this is used when visiting
- * all the inodes in a dentry tree exactly once. It will be 0 by
- * default and must be cleared following the tree traversal, even in
- * error paths. */
+ /* Flag used by some code to mark this inode as visited. It will be 0
+ * by default, and it always must be cleared after use. */
u32 i_visited : 1;
/* Cached value */
* dentry. This should be a series of tagged items, each of which
* represents a bit of extra metadata, such as the file's object ID.
* See tagged_items.c for more information. */
- void *i_extra;
-
- /* Size of @i_extra buffer in bytes. If 0, there is no extra data. */
- size_t i_extra_size;
+ struct wim_inode_extra *i_extra;
/* Creation time, last access time, and last write time for this inode,
* in 100-nanosecond intervals since 12:00 a.m UTC January 1, 1601.
/* Device number, used only during image capture, so we can
* identify hard linked files by the combination of inode number
* and device number (rather than just inode number, which could
- * be ambigious if the captured tree spans a mountpoint). Set
+ * be ambiguous if the captured tree spans a mountpoint). Set
* to 0 otherwise. */
u64 i_devno;
/* Fields used only during extraction */
struct {
- /* List of aliases of this dentry that are being
- * extracted in the current extraction operation. This
- * will be a (possibly nonproper) subset of the dentries
- * in the i_dentry list. This list will be constructed
+ /* A singly linked list of aliases of this inode that
+ * are being extracted in the current extraction
+ * operation. This list may be shorter than the inode's
+ * full alias list. This list will be constructed
* regardless of whether the extraction backend supports
* hard links or not. */
- struct list_head i_extraction_aliases;
+ struct wim_dentry *i_first_extraction_alias;
#ifdef WITH_NTFS_3G
/* In NTFS-3g extraction mode, this is set to the Master
* WIMLIB_WRITE_FLAG_SEND_DONE_WITH_FILE_MESSAGES: the number
* of streams this inode has that have not yet been fully read.
* */
- u32 num_remaining_streams;
+ u32 i_num_remaining_streams;
#ifdef WITH_FUSE
struct {
u32 i_next_stream_id;
};
+/* Optional extra data for a WIM inode */
+struct wim_inode_extra {
+ size_t size; /* Size of the extra data in bytes */
+ u8 data[]; /* The extra data */
+};
+
/*
* The available reparse tags are documented at
* http://msdn.microsoft.com/en-us/library/dd541667(v=prot.10).aspx.
/* Iterate through each alias of the specified inode. */
#define inode_for_each_dentry(dentry, inode) \
- hlist_for_each_entry((dentry), &(inode)->i_dentry, d_alias)
+ hlist_for_each_entry((dentry), &(inode)->i_alias_list, d_alias_node)
/* Return an alias of the specified inode. */
-#define inode_first_dentry(inode) \
- hlist_entry(inode->i_dentry.first, struct wim_dentry, d_alias)
+#define inode_any_dentry(inode) \
+ hlist_entry(inode->i_alias_list.first, struct wim_dentry, d_alias_node)
/* Return the full path of an alias of the specified inode, or NULL if a full
* path could not be determined. */
-#define inode_first_full_path(inode) \
- dentry_full_path(inode_first_dentry(inode))
+#define inode_any_full_path(inode) \
+ dentry_full_path(inode_any_dentry(inode))
extern void
d_associate(struct wim_dentry *dentry, struct wim_inode *inode);
struct blob_table *blob_table);
extern bool
-inode_add_stream_with_data(struct wim_inode *inode, int stream_type,
- const utf16lechar *stream_name,
+inode_add_stream_with_data(struct wim_inode *inode,
+ int stream_type, const utf16lechar *stream_name,
const void *data, size_t size,
struct blob_table *blob_table);
inode_has_named_data_stream(const struct wim_inode *inode);
extern int
-inode_resolve_streams(struct wim_inode *inode,
- struct blob_table *table, bool force);
+inode_resolve_streams(struct wim_inode *inode, struct blob_table *table,
+ bool force);
extern int
blob_not_found_error(const struct wim_inode *inode, const u8 *hash);
git://wimlib.net / wimlib / blobdiff