# HG changeset patch
# User Ross Younger <wry@ecoscentric.com>
# Date 1258453672 0
# Node ID 68aafa1d2927925a146828aa9f99e9f3da53e514
# Parent  fa7270d25c51bb38cd0440dc2b20946cb3eab2c5
yaffs_guts tweak from last merge

diff --git a/packages/fs/yaffs/current/ChangeLog b/packages/fs/yaffs/current/ChangeLog
--- a/packages/fs/yaffs/current/ChangeLog
+++ b/packages/fs/yaffs/current/ChangeLog
@@ -1,3 +1,7 @@
+2009-11-17  Ross Younger  <wry@ecoscentric.com>
+
+	* yaffs_guts.c: Tweak last upstream merge.
+
 2009-11-13  Ross Younger  <wry@ecoscentric.com>
 
 	* tests: yaffs1-6 NA unless CYGPKG_KERNEL is present.
diff --git a/packages/fs/yaffs/current/src/yaffs_guts.c b/packages/fs/yaffs/current/src/yaffs_guts.c
--- a/packages/fs/yaffs/current/src/yaffs_guts.c
+++ b/packages/fs/yaffs/current/src/yaffs_guts.c
@@ -5482,7 +5482,6 @@ struct yaffs_ShadowFixerStruct {
 };
 
 
-#ifndef CONFIG_YAFFS_NO_YAFFS1
 static void yaffs_StripDeletedObjects(yaffs_Device *dev)
 {
 	/*
@@ -5630,6 +5629,7 @@ static void yaffs_EmptyLostAndFound(yaff
 	yaffs_DeleteDirectoryContents(dev->lostNFoundDir);
 }
 
+#ifndef CONFIG_YAFFS_NO_YAFFS1
 static int yaffs_Scan(yaffs_Device *dev)
 {
 	yaffs_ExtendedTags tags;
@@ -7602,12 +7602,13 @@ int yaffs_GutsInitialise(yaffs_Device *d
 #else
             if (!yaffs_Scan(dev))
                 init_failed = 1;
-
-            yaffs_StripDeletedObjects(dev);
+#endif
+        }
+
+        yaffs_StripDeletedObjects(dev);
 		yaffs_FixHangingObjects(dev);
 		if(dev->emptyLostAndFound)
 			yaffs_EmptyLostAndFound(dev);
-#endif
 	}
 
 	if (init_failed) {