X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fntfs-capture.c;h=b47f437e19e392bd8e21ac9b206dfb9b868d5136;hb=9b25b1a8e4c01e57f2872fe9e825f0dc81329008;hp=bc7bc954c66ba6767de9871ce676a2767bf55c51;hpb=50670821723291959a6f35442c523800d369c934;p=wimlib

diff --git a/src/ntfs-capture.c b/src/ntfs-capture.c
index bc7bc954..b47f437e 100644
--- a/src/ntfs-capture.c
+++ b/src/ntfs-capture.c
@@ -87,12 +87,12 @@ static void insert_sd_node(struct sd_node *new, struct sd_node *root)
 	if (cmp < 0) {
 		if (root->left)
 			insert_sd_node(new, root->left);
-		else 
+		else
 			root->left = new;
 	} else if (cmp > 0) {
 		if (root->right)
 			insert_sd_node(new, root->right);
-		else 
+		else
 			root->right = new;
 	} else {
 		wimlib_assert(0);
@@ -100,7 +100,7 @@ static void insert_sd_node(struct sd_node *new, struct sd_node *root)
 }
 
 /* Returns the security ID of the security data having a SHA1 message digest of
- * @hash in the security descriptor index tree rooted at @root. 
+ * @hash in the security descriptor index tree rooted at @root.
  *
  * If not found, return -1. */
 static int lookup_sd(const u8 hash[SHA1_HASH_SIZE], struct sd_node *root)
@@ -191,7 +191,7 @@ static inline ntfschar *attr_record_name(ATTR_RECORD *ar)
 	return (ntfschar*)((u8*)ar + le16_to_cpu(ar->name_offset));
 }
 
-/* Calculates the SHA1 message digest of a NTFS attribute. 
+/* Calculates the SHA1 message digest of a NTFS attribute.
  *
  * @ni:  The NTFS inode containing the attribute.
  * @ar:	 The ATTR_RECORD describing the attribute.
@@ -271,12 +271,11 @@ static int capture_ntfs_streams(struct dentry *dentry, ntfs_inode *ni,
 				 CASE_SENSITIVE, 0, NULL, 0, actx))
 	{
 		char *stream_name_utf8;
-		size_t stream_name_utf16_len;
 		u32 reparse_tag;
 		u64 data_size = ntfs_get_attribute_value_length(actx->attr);
 		u64 name_length = actx->attr->name_length;
 
-		if (data_size == 0) { 
+		if (data_size == 0) {
 			if (errno != 0) {
 				ERROR_WITH_ERRNO("Failed to get size of attribute of "
 						 "`%s'", path);
@@ -328,7 +327,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->inode->reparse_tag = reparse_tag;
+					dentry->d_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;
@@ -348,13 +347,13 @@ 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's inode. */
-			if (dentry->inode->lte) {
+			if (dentry->d_inode->lte) {
 				ERROR("Found two un-named data streams for "
 				      "`%s'", path);
 				ret = WIMLIB_ERR_NTFS_3G;
 				goto out_free_lte;
 			}
-			dentry->inode->lte = lte;
+			dentry->d_inode->lte = lte;
 		} else {
 			/* Named data stream.  Put the reference to it in the
 			 * alternate data stream entries */
@@ -365,13 +364,13 @@ 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 = inode_add_ads(dentry->inode, stream_name_utf8);
+			new_ads_entry = inode_add_ads(dentry->d_inode, stream_name_utf8);
 			FREE(stream_name_utf8);
 			if (!new_ads_entry)
 				goto out_free_lte;
 
 			wimlib_assert(new_ads_entry->stream_name_len == name_length * 2);
-				
+
 			new_ads_entry->lte = lte;
 		}
 	}
@@ -464,7 +463,7 @@ static int wim_ntfs_capture_filldir(void *dirent, const ntfschar *name,
 					       ctx->flags);
 
 	if (child)
-		link_dentry(child, ctx->parent);
+		dentry_add_child(ctx->parent, child);
 
 	ntfs_inode_close(ni);
 out_free_utf8_name:
@@ -508,7 +507,6 @@ static int build_dentry_tree_ntfs_recursive(struct dentry **root_p,
 {
 	u32 attributes;
 	int mrec_flags;
-	u32 sd_size = 0;
 	int ret;
 	char dos_name_utf8[64];
 	struct dentry *root;
@@ -570,12 +568,12 @@ static int build_dentry_tree_ntfs_recursive(struct dentry **root_p,
 		}
 	}
 
-	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;
+	root->d_inode->creation_time    = le64_to_cpu(ni->creation_time);
+	root->d_inode->last_write_time  = le64_to_cpu(ni->last_data_change_time);
+	root->d_inode->last_access_time = le64_to_cpu(ni->last_access_time);
+	root->d_inode->attributes       = le32_to_cpu(attributes);
+	root->d_inode->ino              = ni->mft_no;
+	root->d_inode->resolved         = true;
 
 	if (attributes & FILE_ATTR_REPARSE_POINT) {
 		/* Junction point, symbolic link, or other reparse point */
@@ -623,20 +621,20 @@ static int build_dentry_tree_ntfs_recursive(struct dentry **root_p,
 						 ni, dir_ni, sd, ret);
 	}
 	if (ret > 0) {
-		root->inode->security_id = sd_set_add_sd(sd_set, sd, ret);
-		if (root->inode->security_id == -1) {
+		root->d_inode->security_id = sd_set_add_sd(sd_set, sd, ret);
+		if (root->d_inode->security_id == -1) {
 			ERROR("Out of memory");
 			return WIMLIB_ERR_NOMEM;
 		}
 		DEBUG("Added security ID = %u for `%s'",
-		      root->inode->security_id, path);
+		      root->d_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->inode->security_id = -1;
+		root->d_inode->security_id = -1;
 		DEBUG("No security ID for `%s'", path);
 	}
 	return ret;
@@ -660,7 +658,7 @@ static int build_dentry_tree_ntfs(struct dentry **root_p,
 	ntfs_volume **ntfs_vol_p = extra_arg;
 
 	DEBUG("Mounting NTFS volume `%s' read-only", device);
-	
+
 	vol = ntfs_mount(device, MS_RDONLY);
 	if (!vol) {
 		ERROR_WITH_ERRNO("Failed to mount NTFS volume `%s' read-only",