From: charles <charles>
Date: Fri, 5 Mar 2010 01:49:00 +0000 (+0000)
Subject: Remove oldestDirtySequence from checkpoint
X-Git-Tag: pre-name-change~119
X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=commitdiff_plain;h=9dc68bf9810613883954fc50d26ed6f9c2c87ac0

Remove oldestDirtySequence from checkpoint
---

diff --git a/yaffs_guts.c b/yaffs_guts.c
index ff6e993..e9cda9c 100644
--- a/yaffs_guts.c
+++ b/yaffs_guts.c
@@ -12,7 +12,7 @@
  */
 
 const char *yaffs_guts_c_version =
-    "$Id: yaffs_guts.c,v 1.111 2010-03-02 02:29:21 charles Exp $";
+    "$Id: yaffs_guts.c,v 1.112 2010-03-05 01:49:00 charles Exp $";
 
 #include "yportenv.h"
 #include "yaffs_trace.h"
@@ -4315,7 +4315,6 @@ static void yaffs_DeviceToCheckpointDevice(yaffs_CheckpointDevice *cp,
 	cp->nUnlinkedFiles = dev->nUnlinkedFiles;
 	cp->nBackgroundDeletions = dev->nBackgroundDeletions;
 	cp->sequenceNumber = dev->sequenceNumber;
-	cp->oldestDirtySequence = dev->oldestDirtySequence;
 
 }
 
@@ -4331,7 +4330,6 @@ static void yaffs_CheckpointDeviceToDevice(yaffs_Device *dev,
 	dev->nUnlinkedFiles = cp->nUnlinkedFiles;
 	dev->nBackgroundDeletions = cp->nBackgroundDeletions;
 	dev->sequenceNumber = cp->sequenceNumber;
-	dev->oldestDirtySequence = cp->oldestDirtySequence;
 }
 
 
@@ -5207,7 +5205,6 @@ int yaffs_ResizeFile(yaffs_Object *in, loff_t newSize)
 		in->variant.fileVariant.fileSize = newSize;
 	}
 
-
 	/* Write a new object header to reflect the resize.
 	 * show we've shrunk the file, if need be
 	 * Do this only if the file is not in the deleted directories
@@ -7603,6 +7600,7 @@ int yaffs_GutsInitialise(yaffs_Device *dev)
 	dev->nErasedBlocks = 0;
 	dev->isDoingGC = 0;
 	dev->hasPendingPrioritisedGCs = 1; /* Assume the worst for now, will get fixed on first GC */
+	dev->oldestDirtySequence = 0;
 
 	/* Initialise temporary buffers and caches. */
 	if (!yaffs_InitialiseTempBuffers(dev))
@@ -7685,7 +7683,6 @@ int yaffs_GutsInitialise(yaffs_Device *dev)
 				dev->nDeletedFiles = 0;
 				dev->nUnlinkedFiles = 0;
 				dev->nBackgroundDeletions = 0;
-				dev->oldestDirtySequence = 0;
 
 				if (!init_failed && !yaffs_InitialiseBlocks(dev))
 					init_failed = 1;
diff --git a/yaffs_guts.h b/yaffs_guts.h
index 0563597..3bae979 100644
--- a/yaffs_guts.h
+++ b/yaffs_guts.h
@@ -63,7 +63,7 @@
 
 #define YAFFS_OBJECT_SPACE		0x40000
 
-#define YAFFS_CHECKPOINT_VERSION 	3
+#define YAFFS_CHECKPOINT_VERSION 	4
 
 #ifdef CONFIG_YAFFS_UNICODE
 #define YAFFS_MAX_NAME_LENGTH		127
@@ -794,7 +794,6 @@ typedef struct {
 
 	/* yaffs2 runtime stuff */
 	unsigned sequenceNumber;	/* Sequence number of currently allocating block */
-	unsigned oldestDirtySequence;
 
 } yaffs_CheckpointDevice;