X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_guts.h;h=3bae979134dfcd3fc7bb66f12d4bb6c78f65c39f;hp=53ab280aa67173d3dec74dba29b42805b34c77ca;hb=9dc68bf9810613883954fc50d26ed6f9c2c87ac0;hpb=30ab3ff5e311e8e2b488c3f62f30e7450dc6bee9

diff --git a/yaffs_guts.h b/yaffs_guts.h
index 53ab280..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
@@ -557,6 +557,8 @@ struct yaffs_DeviceParamStruct {
 
 	int emptyLostAndFound;  /* Auto-empty lost+found directory on mount */
 
+	int refreshPeriod;	/* How often we should check to do a block refresh */
+
 	/* Checkpoint control. Can be set before or after initialisation */
 	__u8 skipCheckpointRead;
 	__u8 skipCheckpointWrite;
@@ -601,10 +603,6 @@ struct yaffs_DeviceParamStruct {
 	int disableLazyLoad;	/* Disable lazy loading on this device */
 	int wideTnodesDisabled; /* Set to disable wide tnodes */
 
-	YCHAR *pathDividers;	/* String of legal path dividers */
-
-	
-
 	/* End of stuff that must be set before initialisation. */
 };
 
@@ -698,6 +696,7 @@ struct yaffs_DeviceStruct {
 	yaffs_ObjectList *allocatedObjectList;
 
 	yaffs_ObjectBucket objectBucket[YAFFS_NOBJECT_BUCKETS];
+	__u32 bucketFinder;
 
 	int nFreeChunks;
 
@@ -723,8 +722,6 @@ struct yaffs_DeviceStruct {
 	yaffs_ChunkCache *srCache;
 	int srLastUse;
 
-	int cacheHits;
-
 	/* Stuff for background deletion and unlinked files.*/
 	yaffs_Object *unlinkedDir;	/* Directory where unlinked and deleted files live. */
 	yaffs_Object *deletedDir;	/* Directory where deleted objects are sent to disappear. */
@@ -733,7 +730,6 @@ struct yaffs_DeviceStruct {
 	int nUnlinkedFiles;		/* Count of unlinked files. */
 	int nBackgroundDeletions;	/* Count of background deletions. */
 
-
 	/* Temporary buffer management */
 	yaffs_TempBuffer tempBuffer[YAFFS_N_TEMP_BUFFERS];
 	int maxTemp;
@@ -744,7 +740,9 @@ struct yaffs_DeviceStruct {
 	/* yaffs2 runtime stuff */
 	unsigned sequenceNumber;	/* Sequence number of currently allocating block */
 	unsigned oldestDirtySequence;
-	
+
+	/* Block refreshing */
+	int refreshSkip;	/* A skip down counter. Refresh happens when this gets to zero. */
 
 	/* Statistcs */
 	int nPageWrites;
@@ -762,6 +760,9 @@ struct yaffs_DeviceStruct {
 	int tagsEccUnfixed;
 	int nDeletions;
 	int nUnmarkedDeletions;
+	int refreshCount;
+	int cacheHits;
+
 };
 
 typedef struct yaffs_DeviceStruct yaffs_Device;
@@ -793,7 +794,6 @@ typedef struct {
 
 	/* yaffs2 runtime stuff */
 	unsigned sequenceNumber;	/* Sequence number of currently allocating block */
-	unsigned oldestDirtySequence;
 
 } yaffs_CheckpointDevice;