X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fdentry.h;h=86a1912da48b90f10433f41aa74ecbcae02c80f7;hb=f15a63ac3f4a9be0e4989363814502e85bdaf495;hp=e1051321ea499ae3f45fc38a79ec6fad77ac81c9;hpb=8191ca50a47773d20e94ffb85bedefe199166484;p=wimlib

diff --git a/src/dentry.h b/src/dentry.h
index e1051321..86a1912d 100644
--- a/src/dentry.h
+++ b/src/dentry.h
@@ -22,8 +22,8 @@ struct dentry;
  * including the stream length field (see below). */
 #define WIM_ADS_ENTRY_DISK_SIZE 38
 
-/* 
- * Reparse tags documented at 
+/*
+ * Reparse tags documented at
  * http://msdn.microsoft.com/en-us/library/dd541667(v=prot.10).aspx
  */
 #define WIM_IO_REPARSE_TAG_RESERVED_ZERO	0x00000000
@@ -83,6 +83,8 @@ struct ads_entry {
 	char *stream_name_utf8;
 
 #ifdef WITH_FUSE
+	/* Number to identify an alternate data stream even after it's possibly
+	 * been moved or renamed. */
 	u32 stream_id;
 #endif
 };
@@ -97,9 +99,9 @@ static inline bool ads_entries_have_same_name(const struct ads_entry *entry_1,
 		      entry_1->stream_name_len) == 0;
 }
 
-/* 
+/*
  * In-memory structure for a WIM directory entry (dentry).  There is a directory
- * tree for each image in the WIM. 
+ * 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 a NTFS inode to correspond to multiple WIM dentries.
@@ -126,7 +128,7 @@ static inline bool ads_entries_have_same_name(const struct ads_entry *entry_1,
  */
 struct dentry {
 	/* The inode for this dentry */
-	struct inode *inode;
+	struct inode *d_inode;
 
 	/* The parent of this directory entry. */
 	struct dentry *parent;
@@ -135,7 +137,7 @@ struct dentry {
 	struct dentry *next;
 	struct dentry *prev;
 
-	/* 
+	/*
 	 * Size of directory entry on disk, in bytes.  Typical size is around
 	 * 104 to 120 bytes.
 	 *
@@ -223,7 +225,7 @@ struct inode {
 	int32_t security_id;
 
 	/* %true iff the inode's lookup table entries has been resolved (i.e.
-	 * the @lte field is valid, but the @hash field is not valid) 
+	 * the @lte field is valid, but the @hash field is not valid)
 	 *
 	 * (This is not an on-disk field.) */
 	u8 resolved : 1;
@@ -294,6 +296,12 @@ static inline bool dentry_is_extracted(const struct dentry *dentry)
 	return dentry->is_extracted;
 }
 
+static inline bool dentry_is_first_in_inode(const struct dentry *dentry)
+{
+	return container_of(dentry->d_inode->dentry_list.next,
+			    struct dentry,
+			    inode_dentry_list) == dentry;
+}
 
 extern u64 dentry_correct_total_length(const struct dentry *dentry);
 
@@ -301,12 +309,12 @@ extern void stbuf_to_inode(const struct stat *stbuf, struct inode *inode);
 extern int inode_to_stbuf(const struct inode *inode,
 			  struct lookup_table_entry *lte, struct stat *stbuf);
 
-extern int for_dentry_in_tree(struct dentry *root, 
-			      int (*visitor)(struct dentry*, void*), 
+extern int for_dentry_in_tree(struct dentry *root,
+			      int (*visitor)(struct dentry*, void*),
 			      void *args);
 
-extern int for_dentry_in_tree_depth(struct dentry *root, 
-				    int (*visitor)(struct dentry*, void*), 
+extern int for_dentry_in_tree_depth(struct dentry *root,
+				    int (*visitor)(struct dentry*, void*),
 				    void *args);
 
 extern int calculate_dentry_full_path(struct dentry *dentry, void *ignore);
@@ -318,7 +326,7 @@ extern int get_names(char **name_utf16_ret, char **name_utf8_ret,
 extern struct dentry *get_dentry(struct WIMStruct *w, const char *path);
 extern struct inode *wim_pathname_to_inode(struct WIMStruct *w,
 					   const char *path);
-extern struct dentry *get_dentry_child_with_name(const struct dentry *dentry, 
+extern struct dentry *get_dentry_child_with_name(const struct dentry *dentry,
 						 const char *name);
 extern struct dentry *get_parent_dentry(struct WIMStruct *w, const char *path);
 
@@ -340,32 +348,23 @@ extern int increment_dentry_refcnt(struct dentry *dentry, void *ignore);
 extern void unlink_dentry(struct dentry *dentry);
 extern void link_dentry(struct dentry *dentry, struct dentry *parent);
 
-extern void calculate_dir_tree_statistics(struct dentry *root, 
-					  struct lookup_table *table, 
-					  u64 *dir_count_ret, 
-					  u64 *file_count_ret, 
-					  u64 *total_bytes_ret, 
-					  u64 *hard_link_bytes_ret);
-
 extern int verify_dentry(struct dentry *dentry, void *wim);
 
 
 extern struct ads_entry *inode_get_ads_entry(struct inode *inode,
 					     const char *stream_name,
 					     u16 *idx_ret);
-extern void inode_free_ads_entries(struct inode *inode);
-
 extern struct ads_entry *inode_add_ads(struct inode *dentry,
 				       const char *stream_name);
 
 extern void inode_remove_ads(struct inode *inode, u16 idx,
 			     struct lookup_table *lookup_table);
 
-extern int read_dentry(const u8 metadata_resource[], u64 metadata_resource_len, 
+extern int read_dentry(const u8 metadata_resource[], u64 metadata_resource_len,
 		       u64 offset, struct dentry *dentry);
 
 
-extern int read_dentry_tree(const u8 metadata_resource[], 
+extern int read_dentry_tree(const u8 metadata_resource[],
 			    u64 metadata_resource_len, struct dentry *dentry);
 
 extern u8 *write_dentry_tree(const struct dentry *tree, u8 *p);
@@ -377,7 +376,7 @@ static inline bool dentry_is_root(const struct dentry *dentry)
 
 static inline bool dentry_is_first_sibling(const struct dentry *dentry)
 {
-	return dentry_is_root(dentry) || dentry->parent->inode->children == dentry;
+	return dentry_is_root(dentry) || dentry->parent->d_inode->children == dentry;
 }
 
 static inline bool dentry_is_only_child(const struct dentry *dentry)
@@ -393,7 +392,7 @@ static inline bool inode_is_directory(const struct inode *inode)
 
 static inline bool dentry_is_directory(const struct dentry *dentry)
 {
-	return inode_is_directory(dentry->inode);
+	return inode_is_directory(dentry->d_inode);
 }
 
 /* For our purposes, we consider "real" symlinks and "junction points" to both
@@ -407,7 +406,7 @@ static inline bool inode_is_symlink(const struct inode *inode)
 
 static inline bool dentry_is_symlink(const struct dentry *dentry)
 {
-	return inode_is_symlink(dentry->inode);
+	return inode_is_symlink(dentry->d_inode);
 }
 
 static inline bool inode_is_regular_file(const struct inode *inode)
@@ -417,12 +416,12 @@ static inline bool inode_is_regular_file(const struct inode *inode)
 
 static inline bool dentry_is_regular_file(const struct dentry *dentry)
 {
-	return inode_is_regular_file(dentry->inode);
+	return inode_is_regular_file(dentry->d_inode);
 }
 
 static inline bool dentry_is_empty_directory(const struct dentry *dentry)
 {
-	return dentry_is_directory(dentry) && dentry->inode->children == NULL;
+	return dentry_is_directory(dentry) && dentry->d_inode->children == NULL;
 }
 
 #endif