* tree for each image in the WIM.
*
* Note that this is a directory entry and not an inode. Since NTFS allows hard
- * links, it's possible for an NTFS inode to correspond to multiple WIM dentries.
- * The hard link group ID field of the on-disk WIM dentry tells us the number of
- * the NTFS inode that the dentry corresponds to (and this gets placed in
- * d_inode->i_ino).
+ * links, it's possible for an NTFS inode to correspond to multiple WIM
+ * dentries. The hard link group ID field of the on-disk WIM dentry tells us
+ * the number of the NTFS inode that the dentry corresponds to (and this gets
+ * placed in d_inode->i_ino).
*
* Unfortunately, WIM files do not have an analogue to an inode; instead certain
- * information, such as file attributes, the security descriptor, and file
- * streams is replicated in each hard-linked dentry, even though this
- * information really is associated with an inode. In-memory, we fix up this
- * flaw by allocating a `struct wim_inode' for each dentry that contains some of
- * this duplicated information, then combining the inodes for each hard link
- * group together.
- *
- * Confusingly, it's possible for stream information to be missing from a dentry
- * in a hard link set, in which case the stream information needs to be gotten
- * from one of the other dentries in the hard link set. In addition, it is
- * possible for dentries to have inconsistent security IDs, file attributes, or
- * file streams when they share the same hard link ID (don't even ask. I hope
- * that Microsoft may have fixed this problem, since I've only noticed it in the
- * 'install.wim' for Windows 7). For those dentries, we have to use the
- * conflicting fields to split up the hard link groups. (See
- * dentry_tree_fix_inodes() in inode_fixup.c.)
+ * information, such as file attributes, the security descriptor, and streams is
+ * replicated in each hard-linked dentry, even though this information really is
+ * associated with an inode. In-memory, we fix up this flaw by allocating a
+ * `struct wim_inode' for each dentry that contains some of this duplicated
+ * information, then combining the inodes for each hard link group together.
+ * (See dentry_tree_fix_inodes().)
*/
struct wim_dentry {
/* Pointer to the inode for this dentry. This will contain some
/* Linked list node that places this dentry in the list of aliases for
* its inode (d_inode) */
- struct list_head d_alias;
-
- /* Pointer to the UTF-16LE short filename (malloc()ed buffer), or NULL
- * if this dentry has no short name. */
- utf16lechar *short_name;
+ struct hlist_node d_alias_node;
/* Pointer to the UTF-16LE filename (malloc()ed buffer), or NULL if this
* dentry has no filename. */
- utf16lechar *file_name;
+ utf16lechar *d_name;
- /* Length of UTF-16LE encoded short filename, in bytes, not including
- * the terminating zero wide-character. */
- u16 short_name_nbytes;
+ /* Pointer to the UTF-16LE short filename (malloc()ed buffer), or NULL
+ * if this dentry has no short name. */
+ utf16lechar *d_short_name;
- /* Length of UTF-16LE encoded "long" file name, in bytes, not including
- * the terminating null character. */
- u16 file_name_nbytes;
+ /* Length of 'd_name' in bytes, excluding the terminating null */
+ u16 d_name_nbytes;
+
+ /* Length of 'd_short_name' in bytes, excluding the terminating null */
+ u16 d_short_name_nbytes;
/* When capturing from an NTFS volume using NTFS-3g, this flag is set on
* dentries that were created from a filename in the WIN32 or WIN32+DOS
/* (Extraction only) Actual name to extract this dentry as. This may be
* either in 'tchars' or in 'utf16lechars', depending on what encoding
- * the extraction backend needs. This may alias 'file_name'. If it
+ * the extraction backend needs. This may alias 'd_name'. If it
* doesn't, it is an allocated buffer which must be freed. */
void *d_extraction_name;
* extracted as part of the current extraction operation. */
struct list_head d_extraction_list_node;
- /* (Extraction only) Linked list node that connects all dentries being
- * extracted as aliases of the same inode as part of the current
- * extraction operation. */
- struct list_head d_extraction_alias_node;
+ /* (Extraction only) Pointer to the next alias for this dentry's inode
+ * that needs to be extracted as part of the current extraction
+ * operation, or NULL if this is the last alias. */
+ struct wim_dentry *d_next_extraction_alias;
};
-static inline bool
-dentry_is_first_in_inode(const struct wim_dentry *dentry)
-{
- return inode_first_dentry(dentry->d_inode) == dentry;
-}
-
static inline bool
will_extract_dentry(const struct wim_dentry *dentry)
{
}
static inline bool
-dentry_has_short_name(const struct wim_dentry *dentry)
+dentry_has_long_name(const struct wim_dentry *dentry)
{
- return dentry->short_name_nbytes != 0;
+ return dentry->d_name_nbytes != 0;
}
static inline bool
-dentry_has_long_name(const struct wim_dentry *dentry)
+dentry_has_short_name(const struct wim_dentry *dentry)
{
- return dentry->file_name_nbytes != 0;
+ return dentry->d_short_name_nbytes != 0;
}
#endif /* _WIMLIB_DENTRY_H */