Mercurial > yaffs-ecoscentric-gpl
changeset 368:e7e8a0b17e28
Remove oldestDirtySequence from checkpoint
| author | charles <charles> |
|---|---|
| date | Fri, 05 Mar 2010 01:49:00 +0000 |
| parents | 7fb8c1aa623a |
| children | 4c13be92e208 |
| files | yaffs_guts.c yaffs_guts.h |
| diffstat | 2 files changed, 3 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- 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_DeviceToCheckpointDevi cp->nUnlinkedFiles = dev->nUnlinkedFiles; cp->nBackgroundDeletions = dev->nBackgroundDeletions; cp->sequenceNumber = dev->sequenceNumber; - cp->oldestDirtySequence = dev->oldestDirtySequence; } @@ -4331,7 +4330,6 @@ static void yaffs_CheckpointDeviceToDevi 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, l 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 *d 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 *d dev->nDeletedFiles = 0; dev->nUnlinkedFiles = 0; dev->nBackgroundDeletions = 0; - dev->oldestDirtySequence = 0; if (!init_failed && !yaffs_InitialiseBlocks(dev)) init_failed = 1;
--- 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;
