X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_guts.c;fp=yaffs_guts.c;h=44b1805c2f0e2fba3b26713c702863d997caf985;hp=e95d87022f95d3f51cea961671eef476e410ef89;hb=c1422c27f5f17c68acf261209292c7489085df6b;hpb=b6a3ae56bbcd59fdc1769f69f445a5e43f8297bc

diff --git a/yaffs_guts.c b/yaffs_guts.c
index e95d870..44b1805 100644
--- a/yaffs_guts.c
+++ b/yaffs_guts.c
@@ -5158,8 +5158,9 @@ void yaffs_oh_size_load(struct yaffs_dev *dev,
 			loff_t fsize,
 			int do_endian)
 {
-	oh->file_size_low = (fsize & 0xFFFFFFFF);
-	oh->file_size_high = ((fsize >> 32) & 0xFFFFFFFF);
+	oh->file_size_low = FSIZE_LOW(fsize);
+
+	oh->file_size_high = FSIZE_HIGH(fsize);
 
 	if (do_endian) {
 		yaffs_do_endian_u32(dev, &oh->file_size_low);
@@ -5181,8 +5182,7 @@ loff_t yaffs_oh_to_size(struct yaffs_dev *dev, struct yaffs_obj_hdr *oh,
 			yaffs_do_endian_u32 (dev, &low);
 			yaffs_do_endian_u32 (dev, &high);
 		}
-		retval = (((loff_t) high) << 32) |
-			(((loff_t) low) & 0xFFFFFFFF);
+		retval = FSIZE_COMBINE(high, low);
 	} else {
 		u32 low = oh->file_size_low;