X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fntfs-capture.c;h=6751754782e8a1782985930f7df3defe25f17e1e;hp=9a8991ec0587e05cbe93a67989499d5be64293ce;hb=63a5804943519281f206ca0fefacfe2b99fc9958;hpb=cdda846b47fae4633ba1084472c982766592ac10

diff --git a/src/ntfs-capture.c b/src/ntfs-capture.c
index 9a8991ec..67517547 100644
--- a/src/ntfs-capture.c
+++ b/src/ntfs-capture.c
@@ -336,7 +336,7 @@ static int capture_ntfs_streams(struct dentry *dentry, ntfs_inode *ni,
 				lte->ntfs_loc = ntfs_loc;
 				lte->resource_location = RESOURCE_IN_NTFS_VOLUME;
 				if (type == AT_REPARSE_POINT) {
-					dentry->reparse_tag = reparse_tag;
+					dentry->inode->reparse_tag = reparse_tag;
 					ntfs_loc->is_reparse_point = true;
 					lte->resource_entry.original_size = data_size - 8;
 					lte->resource_entry.size = data_size - 8;
@@ -355,14 +355,14 @@ static int capture_ntfs_streams(struct dentry *dentry, ntfs_inode *ni,
 		}
 		if (name_length == 0) {
 			/* Unnamed data stream.  Put the reference to it in the
-			 * dentry. */
-			if (dentry->lte) {
+			 * dentry's inode. */
+			if (dentry->inode->lte) {
 				ERROR("Found two un-named data streams for "
 				      "`%s'", path);
 				ret = WIMLIB_ERR_NTFS_3G;
 				goto out_free_lte;
 			}
-			dentry->lte = lte;
+			dentry->inode->lte = lte;
 		} else {
 			/* Named data stream.  Put the reference to it in the
 			 * alternate data stream entries */
@@ -373,7 +373,7 @@ static int capture_ntfs_streams(struct dentry *dentry, ntfs_inode *ni,
 							 &stream_name_utf8_len);
 			if (!stream_name_utf8)
 				goto out_free_lte;
-			new_ads_entry = dentry_add_ads(dentry, stream_name_utf8);
+			new_ads_entry = inode_add_ads(dentry->inode, stream_name_utf8);
 			FREE(stream_name_utf8);
 			if (!new_ads_entry)
 				goto out_free_lte;
@@ -557,7 +557,7 @@ static int build_dentry_tree_ntfs_recursive(struct dentry **root_p,
 	if (flags & WIMLIB_ADD_IMAGE_FLAG_VERBOSE)
 		printf("Scanning `%s'\n", path);
 
-	root = new_dentry(path_basename(path));
+	root = new_dentry_with_inode(path_basename(path));
 	if (!root)
 		return WIMLIB_ERR_NOMEM;
 	*root_p = root;
@@ -584,12 +584,12 @@ static int build_dentry_tree_ntfs_recursive(struct dentry **root_p,
 		}
 	}
 
-	root->creation_time    = le64_to_cpu(ni->creation_time);
-	root->last_write_time  = le64_to_cpu(ni->last_data_change_time);
-	root->last_access_time = le64_to_cpu(ni->last_access_time);
-	root->attributes       = le32_to_cpu(attributes);
-	root->link_group_id    = ni->mft_no;
-	root->resolved         = true;
+	root->inode->creation_time    = le64_to_cpu(ni->creation_time);
+	root->inode->last_write_time  = le64_to_cpu(ni->last_data_change_time);
+	root->inode->last_access_time = le64_to_cpu(ni->last_access_time);
+	root->inode->attributes       = le32_to_cpu(attributes);
+	root->inode->ino              = ni->mft_no;
+	root->inode->resolved         = true;
 
 	if (attributes & FILE_ATTR_REPARSE_POINT) {
 		/* Junction point, symbolic link, or other reparse point */
@@ -672,20 +672,20 @@ static int build_dentry_tree_ntfs_recursive(struct dentry **root_p,
 						 ni, dir_ni, sd, ret);
 	}
 	if (ret > 0) {
-		root->security_id = sd_set_add_sd(sd_set, sd, ret);
-		if (root->security_id == -1) {
+		root->inode->security_id = sd_set_add_sd(sd_set, sd, ret);
+		if (root->inode->security_id == -1) {
 			ERROR("Out of memory");
 			return WIMLIB_ERR_NOMEM;
 		}
 		DEBUG("Added security ID = %u for `%s'",
-		      root->security_id, path);
+		      root->inode->security_id, path);
 		ret = 0;
 	} else if (ret < 0) {
 		ERROR_WITH_ERRNO("Failed to get security information from "
 				 "`%s'", path);
 		ret = WIMLIB_ERR_NTFS_3G;
 	} else {
-		root->security_id = -1;
+		root->inode->security_id = -1;
 		DEBUG("No security ID for `%s'", path);
 	}
 #endif