X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_guts.c;h=c52ff842d77285417eba7579ae437e2ae539a7b9;hp=e95d87022f95d3f51cea961671eef476e410ef89;hb=9a6f486e56f927eeb8dc7e4e0d84f6bb95eeaa0f;hpb=b4d5215f18486403d16f2e776000e43eba052f40

diff --git a/yaffs_guts.c b/yaffs_guts.c
index e95d870..c52ff84 100644
--- a/yaffs_guts.c
+++ b/yaffs_guts.c
@@ -1,8 +1,7 @@
 /*
  * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
  *
- * Copyright (C) 2002-2011 Aleph One Ltd.
- *   for Toby Churchill Ltd and Brightstar Engineering
+ * Copyright (C) 2002-2018 Aleph One Ltd.
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
  *
@@ -4535,13 +4534,11 @@ int yaffs_get_obj_name(struct yaffs_obj *obj, YCHAR *name, int buffer_size)
 
 		if (obj->hdr_chunk > 0) {
 			result = yaffs_rd_chunk_tags_nand(obj->my_dev,
-							  obj->hdr_chunk,
-							  buffer, NULL);
+				obj->hdr_chunk, buffer, NULL);
+			if (result == YAFFS_OK)
+				yaffs_load_name_from_oh(obj->my_dev, name,
+					oh->name, buffer_size);
 		}
-		if (result == YAFFS_OK)
-			yaffs_load_name_from_oh(obj->my_dev, name, oh->name,
-					buffer_size);
-
 		yaffs_release_temp_buffer(obj->my_dev, buffer);
 	}
 
@@ -4802,6 +4799,18 @@ int yaffs_guts_format_dev(struct yaffs_dev *dev)
 	return YAFFS_OK;
 }
 
+/*
+ * If the dev is mounted r/w then the cleanup will happen during
+ * yaffs_guts_initialise. However if the dev is mounted ro then
+ * the cleanup will be dfered until yaffs is remounted r/w.
+ */
+void yaffs_guts_cleanup(struct yaffs_dev *dev)
+{
+	yaffs_strip_deleted_objs(dev);
+	yaffs_fix_hanging_objs(dev);
+	if (dev->param.empty_lost_n_found)
+			yaffs_empty_l_n_f(dev);
+}
 
 int yaffs_guts_initialise(struct yaffs_dev *dev)
 {
@@ -5015,10 +5024,7 @@ int yaffs_guts_initialise(struct yaffs_dev *dev)
 			init_failed = 1;
 		}
 
-		yaffs_strip_deleted_objs(dev);
-		yaffs_fix_hanging_objs(dev);
-		if (dev->param.empty_lost_n_found)
-			yaffs_empty_l_n_f(dev);
+		yaffs_guts_cleanup(dev);
 	}
 
 	if (init_failed) {
@@ -5158,8 +5164,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 +5188,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;