From c55aea3ad4da031c3ae0ebb53ec8c2e3990c5e02 Mon Sep 17 00:00:00 2001
From: uvman <uvman>
Date: Wed, 25 Oct 2006 16:49:00 +0000
Subject: [PATCH] Use le32 conversion macros for u32 variables of INDEX_HEADER.
 (zhanglinbao2000, Yuval)

---
 ChangeLog       |  2 ++
 libntfs/index.c | 12 ++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 37c8b63b..c781019c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -52,6 +52,8 @@ xx/xx/2006 - x.xx.x - .
 	- Allow ntfscp to create the destination file if it does not already
 	  exists by calling ntfs_create().  (Hil)
 	- Fix GUID to string conversion.  (Anton)
+	- Fix some byte-order conversion for u32 variables that used le16
+	  conversion macros. (zhanglinbao, Yuval)
 
 21/06/2006 - 1.13.1 - Various fixes.
 
diff --git a/libntfs/index.c b/libntfs/index.c
index 700bcf20..dde8763b 100644
--- a/libntfs/index.c
+++ b/libntfs/index.c
@@ -1145,7 +1145,7 @@ static int ntfs_ir_truncate(ntfs_index_context *icx, int data_size)
 		if (!icx->ir)
 			return STATUS_ERROR;
 	
-		icx->ir->index.allocated_size = cpu_to_le16(data_size);
+		icx->ir->index.allocated_size = cpu_to_le32(data_size);
 
 		ntfs_attr_put_search_ctx(ctx);
 	} else {
@@ -1246,7 +1246,7 @@ static int ntfs_ir_insert_median(ntfs_index_context *icx, INDEX_ENTRY *median,
 	
 	ntfs_log_trace("Entering.\n");
 	
-	new_size = le16_to_cpu(icx->ir->index.index_length) + median->length;
+	new_size = le32_to_cpu(icx->ir->index.index_length) + median->length;
 	if (!(median->flags & INDEX_ENTRY_NODE))
 		new_size += sizeof(VCN);
 
@@ -1284,8 +1284,8 @@ static int ntfs_ib_insert(ntfs_index_context *icx, INDEX_ENTRY *ie, VCN new_vcn)
 	if (ntfs_ib_read(icx, old_vcn, ib))
 		goto err_out;
 
-	idx_size       = le16_to_cpu(ib->index.index_length);
-	allocated_size = le16_to_cpu(ib->index.allocated_size);
+	idx_size       = le32_to_cpu(ib->index.index_length);
+	allocated_size = le32_to_cpu(ib->index.allocated_size);
 	/* FIXME: sizeof(VCN) should be included only if ie has no VCN */
 	if (idx_size + ie->length + sizeof(VCN) > allocated_size) {
 		err = ntfs_ib_split(icx, ib);
@@ -1385,8 +1385,8 @@ static int ntfs_ie_add(ntfs_index_context *icx, INDEX_ENTRY *ie)
 		else
 			ih = &icx->ib->index;
 		
-		allocated_size = le16_to_cpu(ih->allocated_size);
-		new_size = le16_to_cpu(ih->index_length) +
+		allocated_size = le32_to_cpu(ih->allocated_size);
+		new_size = le32_to_cpu(ih->index_length) +
 			le16_to_cpu(ie->length);
 	
 		if (new_size <= allocated_size)