X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_guts.c;h=feade2aff1044b208adf2647a924f374d79b52b4;hp=5aca0d2a3350897727ce7c6d4314a81129ea0689;hb=e22bd0c9f6ff5759ae63d2f28b5dc4e000e9def7;hpb=c08b679b72f025165c2fb570fdfbbf17a7f756f0 diff --git a/yaffs_guts.c b/yaffs_guts.c index 5aca0d2..feade2a 100644 --- a/yaffs_guts.c +++ b/yaffs_guts.c @@ -12,9 +12,10 @@ */ const char *yaffs_guts_c_version = - "$Id: yaffs_guts.c,v 1.71 2009-01-12 00:53:47 charles Exp $"; + "$Id: yaffs_guts.c,v 1.120 2010-03-15 23:10:34 charles Exp $"; #include "yportenv.h" +#include "yaffs_trace.h" #include "yaffsinterface.h" #include "yaffs_guts.h" @@ -22,7 +23,7 @@ const char *yaffs_guts_c_version = #include "yaffs_getblockinfo.h" #include "yaffs_tagscompat.h" -#ifndef CONFIG_YAFFS_USE_OWN_SORT +#ifndef CONFIG_YAFFS_USE_OWN_SORT #include "yaffs_qsort.h" #endif #include "yaffs_nand.h" @@ -33,113 +34,114 @@ const char *yaffs_guts_c_version = #include "yaffs_packedtags2.h" -#ifdef CONFIG_YAFFS_WINCE -void yfsd_LockYAFFS(BOOL fsLockOnly); -void yfsd_UnlockYAFFS(BOOL fsLockOnly); -#endif - #define YAFFS_PASSIVE_GC_CHUNKS 2 +#define YAFFS_SMALL_HOLE_THRESHOLD 3 #include "yaffs_ecc.h" /* Robustification (if it ever comes about...) */ -static void yaffs_RetireBlock(yaffs_Device * dev, int blockInNAND); -static void yaffs_HandleWriteChunkError(yaffs_Device * dev, int chunkInNAND, int erasedOk); -static void yaffs_HandleWriteChunkOk(yaffs_Device * dev, int chunkInNAND, - const __u8 * data, - const yaffs_ExtendedTags * tags); -static void yaffs_HandleUpdateChunk(yaffs_Device * dev, int chunkInNAND, - const yaffs_ExtendedTags * tags); +static void yaffs_RetireBlock(yaffs_Device *dev, int blockInNAND); +static void yaffs_HandleWriteChunkError(yaffs_Device *dev, int chunkInNAND, + int erasedOk); +static void yaffs_HandleWriteChunkOk(yaffs_Device *dev, int chunkInNAND, + const __u8 *data, + const yaffs_ExtendedTags *tags); +static void yaffs_HandleUpdateChunk(yaffs_Device *dev, int chunkInNAND, + const yaffs_ExtendedTags *tags); /* Other local prototypes */ -static int yaffs_UnlinkObject( yaffs_Object *obj); +static void yaffs_UpdateParent(yaffs_Object *obj); +static int yaffs_UnlinkObject(yaffs_Object *obj); static int yaffs_ObjectHasCachedWriteData(yaffs_Object *obj); static void yaffs_HardlinkFixup(yaffs_Device *dev, yaffs_Object *hardList); -static int yaffs_WriteNewChunkWithTagsToNAND(yaffs_Device * dev, - const __u8 * buffer, - yaffs_ExtendedTags * tags, - int useReserve); -static int yaffs_PutChunkIntoFile(yaffs_Object * in, int chunkInInode, - int chunkInNAND, int inScan); - -static yaffs_Object *yaffs_CreateNewObject(yaffs_Device * dev, int number, - yaffs_ObjectType type); -static void yaffs_AddObjectToDirectory(yaffs_Object * directory, - yaffs_Object * obj); -static int yaffs_UpdateObjectHeader(yaffs_Object * in, const YCHAR * name, - int force, int isShrink, int shadows); -static void yaffs_RemoveObjectFromDirectory(yaffs_Object * obj); +static int yaffs_WriteNewChunkWithTagsToNAND(yaffs_Device *dev, + const __u8 *buffer, + yaffs_ExtendedTags *tags, + int useReserve); +static int yaffs_PutChunkIntoFile(yaffs_Object *in, int chunkInInode, + int chunkInNAND, int inScan); + +static yaffs_Object *yaffs_CreateNewObject(yaffs_Device *dev, int number, + yaffs_ObjectType type); +static void yaffs_AddObjectToDirectory(yaffs_Object *directory, + yaffs_Object *obj); +static int yaffs_UpdateObjectHeader(yaffs_Object *in, const YCHAR *name, + int force, int isShrink, int shadows); +static void yaffs_RemoveObjectFromDirectory(yaffs_Object *obj); static int yaffs_CheckStructures(void); -static int yaffs_DeleteWorker(yaffs_Object * in, yaffs_Tnode * tn, __u32 level, - int chunkOffset, int *limit); -static int yaffs_DoGenericObjectDeletion(yaffs_Object * in); +static int yaffs_DeleteWorker(yaffs_Object *in, yaffs_Tnode *tn, __u32 level, + int chunkOffset, int *limit); +static int yaffs_DoGenericObjectDeletion(yaffs_Object *in); -static yaffs_BlockInfo *yaffs_GetBlockInfo(yaffs_Device * dev, int blockNo); +static yaffs_BlockInfo *yaffs_GetBlockInfo(yaffs_Device *dev, int blockNo); static int yaffs_CheckChunkErased(struct yaffs_DeviceStruct *dev, - int chunkInNAND); + int chunkInNAND); -static int yaffs_UnlinkWorker(yaffs_Object * obj); -static void yaffs_DestroyObject(yaffs_Object * obj); +static int yaffs_UnlinkWorker(yaffs_Object *obj); -static int yaffs_TagsMatch(const yaffs_ExtendedTags * tags, int objectId, - int chunkInObject); +static int yaffs_TagsMatch(const yaffs_ExtendedTags *tags, int objectId, + int chunkInObject); -loff_t yaffs_GetFileSize(yaffs_Object * obj); +static int yaffs_AllocateChunk(yaffs_Device *dev, int useReserve, + yaffs_BlockInfo **blockUsedPtr); -static int yaffs_AllocateChunk(yaffs_Device * dev, int useReserve, yaffs_BlockInfo **blockUsedPtr); - -static void yaffs_VerifyFreeChunks(yaffs_Device * dev); +static void yaffs_VerifyFreeChunks(yaffs_Device *dev); static void yaffs_CheckObjectDetailsLoaded(yaffs_Object *in); static void yaffs_VerifyDirectory(yaffs_Object *directory); #ifdef YAFFS_PARANOID -static int yaffs_CheckFileSanity(yaffs_Object * in); +static int yaffs_CheckFileSanity(yaffs_Object *in); #else #define yaffs_CheckFileSanity(in) #endif -static void yaffs_InvalidateWholeChunkCache(yaffs_Object * in); -static void yaffs_InvalidateChunkCache(yaffs_Object * object, int chunkId); +static void yaffs_InvalidateWholeChunkCache(yaffs_Object *in); +static void yaffs_InvalidateChunkCache(yaffs_Object *object, int chunkId); static void yaffs_InvalidateCheckpoint(yaffs_Device *dev); -static int yaffs_FindChunkInFile(yaffs_Object * in, int chunkInInode, - yaffs_ExtendedTags * tags); +static int yaffs_FindChunkInFile(yaffs_Object *in, int chunkInInode, + yaffs_ExtendedTags *tags); -static __u32 yaffs_GetChunkGroupBase(yaffs_Device *dev, yaffs_Tnode *tn, unsigned pos); -static yaffs_Tnode *yaffs_FindLevel0Tnode(yaffs_Device * dev, - yaffs_FileStructure * fStruct, - __u32 chunkId); +static __u32 yaffs_GetChunkGroupBase(yaffs_Device *dev, yaffs_Tnode *tn, + unsigned pos); +static yaffs_Tnode *yaffs_FindLevel0Tnode(yaffs_Device *dev, + yaffs_FileStructure *fStruct, + __u32 chunkId); +static int yaffs_HandleHole(yaffs_Object *obj, loff_t newSize); +static void yaffs_SkipRestOfBlock(yaffs_Device *dev); +static int yaffs_VerifyChunkWritten(yaffs_Device *dev, + int chunkInNAND, + const __u8 *data, + yaffs_ExtendedTags *tags); /* Function to calculate chunk and offset */ -static void yaffs_AddrToChunk(yaffs_Device *dev, loff_t addr, int *chunkOut, __u32 *offsetOut) +static void yaffs_AddrToChunk(yaffs_Device *dev, loff_t addr, int *chunkOut, + __u32 *offsetOut) { int chunk; __u32 offset; - + chunk = (__u32)(addr >> dev->chunkShift); - - if(dev->chunkDiv == 1) - { + + if (dev->chunkDiv == 1) { /* easy power of 2 case */ offset = (__u32)(addr & dev->chunkMask); - } - else - { + } else { /* Non power-of-2 case */ - + loff_t chunkBase; - + chunk /= dev->chunkDiv; - + chunkBase = ((loff_t)chunk) * dev->nDataBytesPerChunk; offset = (__u32)(addr - chunkBase); } @@ -148,79 +150,80 @@ static void yaffs_AddrToChunk(yaffs_Device *dev, loff_t addr, int *chunkOut, __u *offsetOut = offset; } -/* Function to return the number of shifts for a power of 2 greater than or equal - * to the given number +/* Function to return the number of shifts for a power of 2 greater than or + * equal to the given number * Note we don't try to cater for all possible numbers and this does not have to * be hellishly efficient. */ - + static __u32 ShiftsGE(__u32 x) { int extraBits; int nShifts; - + nShifts = extraBits = 0; - - while(x>1){ - if(x & 1) extraBits++; - x>>=1; + + while (x > 1) { + if (x & 1) + extraBits++; + x >>= 1; nShifts++; } - if(extraBits) + if (extraBits) nShifts++; - + return nShifts; } /* Function to return the number of shifts to get a 1 in bit 0 */ - + static __u32 Shifts(__u32 x) { int nShifts; - + nShifts = 0; - - if(!x) return 0; - - while( !(x&1)){ - x>>=1; + + if (!x) + return 0; + + while (!(x&1)) { + x >>= 1; nShifts++; } - + return nShifts; } -/* +/* * Temporary buffer manipulations. */ -static int yaffs_InitialiseTempBuffers(yaffs_Device *dev) +static int yaffs_InitialiseTempBuffers(yaffs_Device *dev) { int i; __u8 *buf = (__u8 *)1; - - memset(dev->tempBuffer,0,sizeof(dev->tempBuffer)); - + + memset(dev->tempBuffer, 0, sizeof(dev->tempBuffer)); + for (i = 0; buf && i < YAFFS_N_TEMP_BUFFERS; i++) { dev->tempBuffer[i].line = 0; /* not in use */ dev->tempBuffer[i].buffer = buf = - YMALLOC_DMA(dev->totalBytesPerChunk); + YMALLOC_DMA(dev->param.totalBytesPerChunk); } - + return buf ? YAFFS_OK : YAFFS_FAIL; - } -__u8 *yaffs_GetTempBuffer(yaffs_Device * dev, int lineNo) +__u8 *yaffs_GetTempBuffer(yaffs_Device *dev, int lineNo) { int i, j; dev->tempInUse++; - if(dev->tempInUse > dev->maxTemp) + if (dev->tempInUse > dev->maxTemp) dev->maxTemp = dev->tempInUse; for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) { @@ -240,9 +243,9 @@ __u8 *yaffs_GetTempBuffer(yaffs_Device * dev, int lineNo) T(YAFFS_TRACE_BUFFERS, (TSTR("Out of temp buffers at line %d, other held by lines:"), lineNo)); - for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) { + for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) T(YAFFS_TRACE_BUFFERS, (TSTR(" %d "), dev->tempBuffer[i].line)); - } + T(YAFFS_TRACE_BUFFERS, (TSTR(" " TENDSTR))); /* @@ -255,13 +258,13 @@ __u8 *yaffs_GetTempBuffer(yaffs_Device * dev, int lineNo) } -void yaffs_ReleaseTempBuffer(yaffs_Device * dev, __u8 * buffer, +void yaffs_ReleaseTempBuffer(yaffs_Device *dev, __u8 *buffer, int lineNo) { int i; - + dev->tempInUse--; - + for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) { if (dev->tempBuffer[i].buffer == buffer) { dev->tempBuffer[i].line = 0; @@ -283,27 +286,26 @@ void yaffs_ReleaseTempBuffer(yaffs_Device * dev, __u8 * buffer, /* * Determine if we have a managed buffer. */ -int yaffs_IsManagedTempBuffer(yaffs_Device * dev, const __u8 * buffer) +int yaffs_IsManagedTempBuffer(yaffs_Device *dev, const __u8 *buffer) { int i; + for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) { if (dev->tempBuffer[i].buffer == buffer) return 1; - } - for (i = 0; i < dev->nShortOpCaches; i++) { - if( dev->srCache[i].data == buffer ) - return 1; - - } + for (i = 0; i < dev->param.nShortOpCaches; i++) { + if (dev->srCache[i].data == buffer) + return 1; + } - if (buffer == dev->checkpointBuffer) - return 1; + if (buffer == dev->checkpointBuffer) + return 1; - T(YAFFS_TRACE_ALWAYS, - (TSTR("yaffs: unmaged buffer detected.\n" TENDSTR))); - return 0; + T(YAFFS_TRACE_ALWAYS, + (TSTR("yaffs: unmaged buffer detected.\n" TENDSTR))); + return 0; } @@ -312,62 +314,63 @@ int yaffs_IsManagedTempBuffer(yaffs_Device * dev, const __u8 * buffer) * Chunk bitmap manipulations */ -static Y_INLINE __u8 *yaffs_BlockBits(yaffs_Device * dev, int blk) +static Y_INLINE __u8 *yaffs_BlockBits(yaffs_Device *dev, int blk) { if (blk < dev->internalStartBlock || blk > dev->internalEndBlock) { T(YAFFS_TRACE_ERROR, - (TSTR("**>> yaffs: BlockBits block %d is not valid" TENDSTR), - blk)); + (TSTR("**>> yaffs: BlockBits block %d is not valid" TENDSTR), + blk)); YBUG(); } return dev->chunkBits + - (dev->chunkBitmapStride * (blk - dev->internalStartBlock)); + (dev->chunkBitmapStride * (blk - dev->internalStartBlock)); } static Y_INLINE void yaffs_VerifyChunkBitId(yaffs_Device *dev, int blk, int chunk) { - if(blk < dev->internalStartBlock || blk > dev->internalEndBlock || - chunk < 0 || chunk >= dev->nChunksPerBlock) { - T(YAFFS_TRACE_ERROR, - (TSTR("**>> yaffs: Chunk Id (%d:%d) invalid"TENDSTR),blk,chunk)); - YBUG(); + if (blk < dev->internalStartBlock || blk > dev->internalEndBlock || + chunk < 0 || chunk >= dev->param.nChunksPerBlock) { + T(YAFFS_TRACE_ERROR, + (TSTR("**>> yaffs: Chunk Id (%d:%d) invalid"TENDSTR), + blk, chunk)); + YBUG(); } } -static Y_INLINE void yaffs_ClearChunkBits(yaffs_Device * dev, int blk) +static Y_INLINE void yaffs_ClearChunkBits(yaffs_Device *dev, int blk) { __u8 *blkBits = yaffs_BlockBits(dev, blk); memset(blkBits, 0, dev->chunkBitmapStride); } -static Y_INLINE void yaffs_ClearChunkBit(yaffs_Device * dev, int blk, int chunk) +static Y_INLINE void yaffs_ClearChunkBit(yaffs_Device *dev, int blk, int chunk) { __u8 *blkBits = yaffs_BlockBits(dev, blk); - yaffs_VerifyChunkBitId(dev,blk,chunk); + yaffs_VerifyChunkBitId(dev, blk, chunk); blkBits[chunk / 8] &= ~(1 << (chunk & 7)); } -static Y_INLINE void yaffs_SetChunkBit(yaffs_Device * dev, int blk, int chunk) +static Y_INLINE void yaffs_SetChunkBit(yaffs_Device *dev, int blk, int chunk) { __u8 *blkBits = yaffs_BlockBits(dev, blk); - - yaffs_VerifyChunkBitId(dev,blk,chunk); + + yaffs_VerifyChunkBitId(dev, blk, chunk); blkBits[chunk / 8] |= (1 << (chunk & 7)); } -static Y_INLINE int yaffs_CheckChunkBit(yaffs_Device * dev, int blk, int chunk) +static Y_INLINE int yaffs_CheckChunkBit(yaffs_Device *dev, int blk, int chunk) { __u8 *blkBits = yaffs_BlockBits(dev, blk); - yaffs_VerifyChunkBitId(dev,blk,chunk); + yaffs_VerifyChunkBitId(dev, blk, chunk); return (blkBits[chunk / 8] & (1 << (chunk & 7))) ? 1 : 0; } -static Y_INLINE int yaffs_StillSomeChunkBits(yaffs_Device * dev, int blk) +static Y_INLINE int yaffs_StillSomeChunkBits(yaffs_Device *dev, int blk) { __u8 *blkBits = yaffs_BlockBits(dev, blk); int i; @@ -379,44 +382,47 @@ static Y_INLINE int yaffs_StillSomeChunkBits(yaffs_Device * dev, int blk) return 0; } -static int yaffs_CountChunkBits(yaffs_Device * dev, int blk) +static int yaffs_CountChunkBits(yaffs_Device *dev, int blk) { __u8 *blkBits = yaffs_BlockBits(dev, blk); int i; int n = 0; for (i = 0; i < dev->chunkBitmapStride; i++) { __u8 x = *blkBits; - while(x){ - if(x & 1) + while (x) { + if (x & 1) n++; - x >>=1; + x >>= 1; } - + blkBits++; } return n; } -/* +/* * Verification code */ - + static int yaffs_SkipVerification(yaffs_Device *dev) { + dev=dev; return !(yaffs_traceMask & (YAFFS_TRACE_VERIFY | YAFFS_TRACE_VERIFY_FULL)); } static int yaffs_SkipFullVerification(yaffs_Device *dev) { + dev=dev; return !(yaffs_traceMask & (YAFFS_TRACE_VERIFY_FULL)); } static int yaffs_SkipNANDVerification(yaffs_Device *dev) { + dev=dev; return !(yaffs_traceMask & (YAFFS_TRACE_VERIFY_NAND)); } -static const char * blockStateName[] = { +static const char *blockStateName[] = { "Unknown", "Needs scanning", "Scanning", @@ -429,65 +435,65 @@ static const char * blockStateName[] = { "Dead" }; -static void yaffs_VerifyBlock(yaffs_Device *dev,yaffs_BlockInfo *bi,int n) +static void yaffs_VerifyBlock(yaffs_Device *dev, yaffs_BlockInfo *bi, int n) { int actuallyUsed; int inUse; - - if(yaffs_SkipVerification(dev)) + + if (yaffs_SkipVerification(dev)) return; - + /* Report illegal runtime states */ - if(bi->blockState >= YAFFS_NUMBER_OF_BLOCK_STATES) - T(YAFFS_TRACE_VERIFY,(TSTR("Block %d has undefined state %d"TENDSTR),n,bi->blockState)); - - switch(bi->blockState){ - case YAFFS_BLOCK_STATE_UNKNOWN: - case YAFFS_BLOCK_STATE_SCANNING: - case YAFFS_BLOCK_STATE_NEEDS_SCANNING: - T(YAFFS_TRACE_VERIFY,(TSTR("Block %d has bad run-state %s"TENDSTR), - n,blockStateName[bi->blockState])); + if (bi->blockState >= YAFFS_NUMBER_OF_BLOCK_STATES) + T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has undefined state %d"TENDSTR), n, bi->blockState)); + + switch (bi->blockState) { + case YAFFS_BLOCK_STATE_UNKNOWN: + case YAFFS_BLOCK_STATE_SCANNING: + case YAFFS_BLOCK_STATE_NEEDS_SCANNING: + T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has bad run-state %s"TENDSTR), + n, blockStateName[bi->blockState])); } - + /* Check pages in use and soft deletions are legal */ - + actuallyUsed = bi->pagesInUse - bi->softDeletions; - - if(bi->pagesInUse < 0 || bi->pagesInUse > dev->nChunksPerBlock || - bi->softDeletions < 0 || bi->softDeletions > dev->nChunksPerBlock || - actuallyUsed < 0 || actuallyUsed > dev->nChunksPerBlock) - T(YAFFS_TRACE_VERIFY,(TSTR("Block %d has illegal values pagesInUsed %d softDeletions %d"TENDSTR), - n,bi->pagesInUse,bi->softDeletions)); - - + + if (bi->pagesInUse < 0 || bi->pagesInUse > dev->param.nChunksPerBlock || + bi->softDeletions < 0 || bi->softDeletions > dev->param.nChunksPerBlock || + actuallyUsed < 0 || actuallyUsed > dev->param.nChunksPerBlock) + T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has illegal values pagesInUsed %d softDeletions %d"TENDSTR), + n, bi->pagesInUse, bi->softDeletions)); + + /* Check chunk bitmap legal */ - inUse = yaffs_CountChunkBits(dev,n); - if(inUse != bi->pagesInUse) - T(YAFFS_TRACE_VERIFY,(TSTR("Block %d has inconsistent values pagesInUse %d counted chunk bits %d"TENDSTR), - n,bi->pagesInUse,inUse)); - + inUse = yaffs_CountChunkBits(dev, n); + if (inUse != bi->pagesInUse) + T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has inconsistent values pagesInUse %d counted chunk bits %d"TENDSTR), + n, bi->pagesInUse, inUse)); + /* Check that the sequence number is valid. - * Ten million is legal, but is very unlikely + * Ten million is legal, but is very unlikely */ - if(dev->isYaffs2 && + if (dev->param.isYaffs2 && (bi->blockState == YAFFS_BLOCK_STATE_ALLOCATING || bi->blockState == YAFFS_BLOCK_STATE_FULL) && - (bi->sequenceNumber < YAFFS_LOWEST_SEQUENCE_NUMBER || bi->sequenceNumber > 10000000 )) - T(YAFFS_TRACE_VERIFY,(TSTR("Block %d has suspect sequence number of %d"TENDSTR), - n,bi->sequenceNumber)); - + (bi->sequenceNumber < YAFFS_LOWEST_SEQUENCE_NUMBER || bi->sequenceNumber > 10000000)) + T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has suspect sequence number of %d"TENDSTR), + n, bi->sequenceNumber)); } -static void yaffs_VerifyCollectedBlock(yaffs_Device *dev,yaffs_BlockInfo *bi,int n) +static void yaffs_VerifyCollectedBlock(yaffs_Device *dev, yaffs_BlockInfo *bi, + int n) { - yaffs_VerifyBlock(dev,bi,n); - + yaffs_VerifyBlock(dev, bi, n); + /* After collection the block should be in the erased state */ /* This will need to change if we do partial gc */ - - if(bi->blockState != YAFFS_BLOCK_STATE_COLLECTING && - bi->blockState != YAFFS_BLOCK_STATE_EMPTY){ - T(YAFFS_TRACE_ERROR,(TSTR("Block %d is in state %d after gc, should be erased"TENDSTR), - n,bi->blockState)); + + if (bi->blockState != YAFFS_BLOCK_STATE_COLLECTING && + bi->blockState != YAFFS_BLOCK_STATE_EMPTY) { + T(YAFFS_TRACE_ERROR, (TSTR("Block %d is in state %d after gc, should be erased"TENDSTR), + n, bi->blockState)); } } @@ -496,53 +502,50 @@ static void yaffs_VerifyBlocks(yaffs_Device *dev) int i; int nBlocksPerState[YAFFS_NUMBER_OF_BLOCK_STATES]; int nIllegalBlockStates = 0; - - if(yaffs_SkipVerification(dev)) + if (yaffs_SkipVerification(dev)) return; - memset(nBlocksPerState,0,sizeof(nBlocksPerState)); + memset(nBlocksPerState, 0, sizeof(nBlocksPerState)); - - for(i = dev->internalStartBlock; i <= dev->internalEndBlock; i++){ - yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev,i); - yaffs_VerifyBlock(dev,bi,i); + for (i = dev->internalStartBlock; i <= dev->internalEndBlock; i++) { + yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, i); + yaffs_VerifyBlock(dev, bi, i); - if(bi->blockState < YAFFS_NUMBER_OF_BLOCK_STATES) + if (bi->blockState < YAFFS_NUMBER_OF_BLOCK_STATES) nBlocksPerState[bi->blockState]++; else nIllegalBlockStates++; - } - - T(YAFFS_TRACE_VERIFY,(TSTR(""TENDSTR))); - T(YAFFS_TRACE_VERIFY,(TSTR("Block summary"TENDSTR))); - - T(YAFFS_TRACE_VERIFY,(TSTR("%d blocks have illegal states"TENDSTR),nIllegalBlockStates)); - if(nBlocksPerState[YAFFS_BLOCK_STATE_ALLOCATING] > 1) - T(YAFFS_TRACE_VERIFY,(TSTR("Too many allocating blocks"TENDSTR))); - for(i = 0; i < YAFFS_NUMBER_OF_BLOCK_STATES; i++) + T(YAFFS_TRACE_VERIFY, (TSTR(""TENDSTR))); + T(YAFFS_TRACE_VERIFY, (TSTR("Block summary"TENDSTR))); + + T(YAFFS_TRACE_VERIFY, (TSTR("%d blocks have illegal states"TENDSTR), nIllegalBlockStates)); + if (nBlocksPerState[YAFFS_BLOCK_STATE_ALLOCATING] > 1) + T(YAFFS_TRACE_VERIFY, (TSTR("Too many allocating blocks"TENDSTR))); + + for (i = 0; i < YAFFS_NUMBER_OF_BLOCK_STATES; i++) T(YAFFS_TRACE_VERIFY, (TSTR("%s %d blocks"TENDSTR), - blockStateName[i],nBlocksPerState[i])); - - if(dev->blocksInCheckpoint != nBlocksPerState[YAFFS_BLOCK_STATE_CHECKPOINT]) + blockStateName[i], nBlocksPerState[i])); + + if (dev->blocksInCheckpoint != nBlocksPerState[YAFFS_BLOCK_STATE_CHECKPOINT]) T(YAFFS_TRACE_VERIFY, (TSTR("Checkpoint block count wrong dev %d count %d"TENDSTR), dev->blocksInCheckpoint, nBlocksPerState[YAFFS_BLOCK_STATE_CHECKPOINT])); - - if(dev->nErasedBlocks != nBlocksPerState[YAFFS_BLOCK_STATE_EMPTY]) + + if (dev->nErasedBlocks != nBlocksPerState[YAFFS_BLOCK_STATE_EMPTY]) T(YAFFS_TRACE_VERIFY, (TSTR("Erased block count wrong dev %d count %d"TENDSTR), dev->nErasedBlocks, nBlocksPerState[YAFFS_BLOCK_STATE_EMPTY])); - - if(nBlocksPerState[YAFFS_BLOCK_STATE_COLLECTING] > 1) + + if (nBlocksPerState[YAFFS_BLOCK_STATE_COLLECTING] > 1) T(YAFFS_TRACE_VERIFY, (TSTR("Too many collecting blocks %d (max is 1)"TENDSTR), nBlocksPerState[YAFFS_BLOCK_STATE_COLLECTING])); - T(YAFFS_TRACE_VERIFY,(TSTR(""TENDSTR))); + T(YAFFS_TRACE_VERIFY, (TSTR(""TENDSTR))); } @@ -552,64 +555,62 @@ static void yaffs_VerifyBlocks(yaffs_Device *dev) */ static void yaffs_VerifyObjectHeader(yaffs_Object *obj, yaffs_ObjectHeader *oh, yaffs_ExtendedTags *tags, int parentCheck) { - if(obj && yaffs_SkipVerification(obj->myDev)) + if (obj && yaffs_SkipVerification(obj->myDev)) return; - - if(!(tags && obj && oh)){ - T(YAFFS_TRACE_VERIFY, - (TSTR("Verifying object header tags %x obj %x oh %x"TENDSTR), - (__u32)tags,(__u32)obj,(__u32)oh)); + + if (!(tags && obj && oh)) { + T(YAFFS_TRACE_VERIFY, + (TSTR("Verifying object header tags %p obj %p oh %p"TENDSTR), + tags, obj, oh)); return; } - - if(oh->type <= YAFFS_OBJECT_TYPE_UNKNOWN || - oh->type > YAFFS_OBJECT_TYPE_MAX) - T(YAFFS_TRACE_VERIFY, - (TSTR("Obj %d header type is illegal value 0x%x"TENDSTR), - tags->objectId, oh->type)); - if(tags->objectId != obj->objectId) - T(YAFFS_TRACE_VERIFY, - (TSTR("Obj %d header mismatch objectId %d"TENDSTR), - tags->objectId, obj->objectId)); + if (oh->type <= YAFFS_OBJECT_TYPE_UNKNOWN || + oh->type > YAFFS_OBJECT_TYPE_MAX) + T(YAFFS_TRACE_VERIFY, + (TSTR("Obj %d header type is illegal value 0x%x"TENDSTR), + tags->objectId, oh->type)); + + if (tags->objectId != obj->objectId) + T(YAFFS_TRACE_VERIFY, + (TSTR("Obj %d header mismatch objectId %d"TENDSTR), + tags->objectId, obj->objectId)); /* * Check that the object's parent ids match if parentCheck requested. - * + * * Tests do not apply to the root object. */ - - if(parentCheck && tags->objectId > 1 && !obj->parent) - T(YAFFS_TRACE_VERIFY, - (TSTR("Obj %d header mismatch parentId %d obj->parent is NULL"TENDSTR), - tags->objectId, oh->parentObjectId)); - - - if(parentCheck && obj->parent && - oh->parentObjectId != obj->parent->objectId && - (oh->parentObjectId != YAFFS_OBJECTID_UNLINKED || - obj->parent->objectId != YAFFS_OBJECTID_DELETED)) - T(YAFFS_TRACE_VERIFY, - (TSTR("Obj %d header mismatch parentId %d parentObjectId %d"TENDSTR), - tags->objectId, oh->parentObjectId, obj->parent->objectId)); - - - if(tags->objectId > 1 && oh->name[0] == 0) /* Null name */ + + if (parentCheck && tags->objectId > 1 && !obj->parent) + T(YAFFS_TRACE_VERIFY, + (TSTR("Obj %d header mismatch parentId %d obj->parent is NULL"TENDSTR), + tags->objectId, oh->parentObjectId)); + + if (parentCheck && obj->parent && + oh->parentObjectId != obj->parent->objectId && + (oh->parentObjectId != YAFFS_OBJECTID_UNLINKED || + obj->parent->objectId != YAFFS_OBJECTID_DELETED)) + T(YAFFS_TRACE_VERIFY, + (TSTR("Obj %d header mismatch parentId %d parentObjectId %d"TENDSTR), + tags->objectId, oh->parentObjectId, obj->parent->objectId)); + + if (tags->objectId > 1 && oh->name[0] == 0) /* Null name */ T(YAFFS_TRACE_VERIFY, - (TSTR("Obj %d header name is NULL"TENDSTR), - obj->objectId)); + (TSTR("Obj %d header name is NULL"TENDSTR), + obj->objectId)); - if(tags->objectId > 1 && ((__u8)(oh->name[0])) == 0xff) /* Trashed name */ + if (tags->objectId > 1 && ((__u8)(oh->name[0])) == 0xff) /* Trashed name */ T(YAFFS_TRACE_VERIFY, - (TSTR("Obj %d header name is 0xFF"TENDSTR), - obj->objectId)); + (TSTR("Obj %d header name is 0xFF"TENDSTR), + obj->objectId)); } -static int yaffs_VerifyTnodeWorker(yaffs_Object * obj, yaffs_Tnode * tn, - __u32 level, int chunkOffset) +static int yaffs_VerifyTnodeWorker(yaffs_Object *obj, yaffs_Tnode *tn, + __u32 level, int chunkOffset) { int i; yaffs_Device *dev = obj->myDev; @@ -618,7 +619,7 @@ static int yaffs_VerifyTnodeWorker(yaffs_Object * obj, yaffs_Tnode * tn, if (tn) { if (level > 0) { - for (i = 0; i < YAFFS_NTNODES_INTERNAL && ok; i++){ + for (i = 0; i < YAFFS_NTNODES_INTERNAL && ok; i++) { if (tn->internal[i]) { ok = yaffs_VerifyTnodeWorker(obj, tn->internal[i], @@ -629,17 +630,17 @@ static int yaffs_VerifyTnodeWorker(yaffs_Object * obj, yaffs_Tnode * tn, } else if (level == 0) { yaffs_ExtendedTags tags; __u32 objectId = obj->objectId; - + chunkOffset <<= YAFFS_TNODES_LEVEL0_BITS; - - for(i = 0; i < YAFFS_NTNODES_LEVEL0; i++){ - __u32 theChunk = yaffs_GetChunkGroupBase(dev,tn,i); - - if(theChunk > 0){ + + for (i = 0; i < YAFFS_NTNODES_LEVEL0; i++) { + __u32 theChunk = yaffs_GetChunkGroupBase(dev, tn, i); + + if (theChunk > 0) { /* T(~0,(TSTR("verifying (%d:%d) %d"TENDSTR),tags.objectId,tags.chunkId,theChunk)); */ - yaffs_ReadChunkWithTagsFromNAND(dev,theChunk,NULL, &tags); - if(tags.objectId != objectId || tags.chunkId != chunkOffset){ - T(~0,(TSTR("Object %d chunkId %d NAND mismatch chunk %d tags (%d:%d)"TENDSTR), + yaffs_ReadChunkWithTagsFromNAND(dev, theChunk, NULL, &tags); + if (tags.objectId != objectId || tags.chunkId != chunkOffset) { + T(~0, (TSTR("Object %d chunkId %d NAND mismatch chunk %d tags (%d:%d)"TENDSTR), objectId, chunkOffset, theChunk, tags.objectId, tags.chunkId)); } @@ -665,151 +666,152 @@ static void yaffs_VerifyFile(yaffs_Object *obj) yaffs_ExtendedTags tags; yaffs_Tnode *tn; __u32 objectId; - - if(!obj) + + if (!obj) return; - if(yaffs_SkipVerification(obj->myDev)) + if (yaffs_SkipVerification(obj->myDev)) return; - + dev = obj->myDev; objectId = obj->objectId; - + /* Check file size is consistent with tnode depth */ lastChunk = obj->variant.fileVariant.fileSize / dev->nDataBytesPerChunk + 1; x = lastChunk >> YAFFS_TNODES_LEVEL0_BITS; requiredTallness = 0; - while (x> 0) { + while (x > 0) { x >>= YAFFS_TNODES_INTERNAL_BITS; requiredTallness++; } - + actualTallness = obj->variant.fileVariant.topLevel; - - if(requiredTallness > actualTallness ) - T(YAFFS_TRACE_VERIFY, - (TSTR("Obj %d had tnode tallness %d, needs to be %d"TENDSTR), - obj->objectId,actualTallness, requiredTallness)); - - - /* Check that the chunks in the tnode tree are all correct. + + /* Check that the chunks in the tnode tree are all correct. * We do this by scanning through the tnode tree and * checking the tags for every chunk match. */ - if(yaffs_SkipNANDVerification(dev)) + if (yaffs_SkipNANDVerification(dev)) return; - - for(i = 1; i <= lastChunk; i++){ - tn = yaffs_FindLevel0Tnode(dev, &obj->variant.fileVariant,i); + + for (i = 1; i <= lastChunk; i++) { + tn = yaffs_FindLevel0Tnode(dev, &obj->variant.fileVariant, i); if (tn) { - __u32 theChunk = yaffs_GetChunkGroupBase(dev,tn,i); - if(theChunk > 0){ + __u32 theChunk = yaffs_GetChunkGroupBase(dev, tn, i); + if (theChunk > 0) { /* T(~0,(TSTR("verifying (%d:%d) %d"TENDSTR),objectId,i,theChunk)); */ - yaffs_ReadChunkWithTagsFromNAND(dev,theChunk,NULL, &tags); - if(tags.objectId != objectId || tags.chunkId != i){ - T(~0,(TSTR("Object %d chunkId %d NAND mismatch chunk %d tags (%d:%d)"TENDSTR), + yaffs_ReadChunkWithTagsFromNAND(dev, theChunk, NULL, &tags); + if (tags.objectId != objectId || tags.chunkId != i) { + T(~0, (TSTR("Object %d chunkId %d NAND mismatch chunk %d tags (%d:%d)"TENDSTR), objectId, i, theChunk, tags.objectId, tags.chunkId)); } } } - } - } static void yaffs_VerifyHardLink(yaffs_Object *obj) { - if(obj && yaffs_SkipVerification(obj->myDev)) + if (obj && yaffs_SkipVerification(obj->myDev)) return; - + /* Verify sane equivalent object */ } static void yaffs_VerifySymlink(yaffs_Object *obj) { - if(obj && yaffs_SkipVerification(obj->myDev)) + if (obj && yaffs_SkipVerification(obj->myDev)) return; - + /* Verify symlink string */ } static void yaffs_VerifySpecial(yaffs_Object *obj) { - if(obj && yaffs_SkipVerification(obj->myDev)) + if (obj && yaffs_SkipVerification(obj->myDev)) return; } static void yaffs_VerifyObject(yaffs_Object *obj) { yaffs_Device *dev; - + __u32 chunkMin; __u32 chunkMax; - + __u32 chunkIdOk; - __u32 chunkIsLive; - - if(!obj) + __u32 chunkInRange; + __u32 chunkShouldNotBeDeleted; + __u32 chunkValid; + + if (!obj) return; - + + if (obj->beingCreated) + return; + dev = obj->myDev; - - if(yaffs_SkipVerification(dev)) + + if (yaffs_SkipVerification(dev)) return; - + /* Check sane object header chunk */ - chunkMin = dev->internalStartBlock * dev->nChunksPerBlock; - chunkMax = (dev->internalEndBlock+1) * dev->nChunksPerBlock - 1; + chunkMin = dev->internalStartBlock * dev->param.nChunksPerBlock; + chunkMax = (dev->internalEndBlock+1) * dev->param.nChunksPerBlock - 1; - chunkIdOk = (((unsigned)(obj->hdrChunk)) >= chunkMin && ((unsigned)(obj->hdrChunk)) <= chunkMax); - chunkIsLive = chunkIdOk && + chunkInRange = (((unsigned)(obj->hdrChunk)) >= chunkMin && ((unsigned)(obj->hdrChunk)) <= chunkMax); + chunkIdOk = chunkInRange || (obj->hdrChunk == 0); + chunkValid = chunkInRange && yaffs_CheckChunkBit(dev, - obj->hdrChunk / dev->nChunksPerBlock, - obj->hdrChunk % dev->nChunksPerBlock); - if(!obj->fake && - (!chunkIdOk || !chunkIsLive)) { - T(YAFFS_TRACE_VERIFY, - (TSTR("Obj %d has chunkId %d %s %s"TENDSTR), - obj->objectId,obj->hdrChunk, - chunkIdOk ? "" : ",out of range", - chunkIsLive || !chunkIdOk ? "" : ",marked as deleted")); + obj->hdrChunk / dev->param.nChunksPerBlock, + obj->hdrChunk % dev->param.nChunksPerBlock); + chunkShouldNotBeDeleted = chunkInRange && !chunkValid; + + if (!obj->fake && + (!chunkIdOk || chunkShouldNotBeDeleted)) { + T(YAFFS_TRACE_VERIFY, + (TSTR("Obj %d has chunkId %d %s %s"TENDSTR), + obj->objectId, obj->hdrChunk, + chunkIdOk ? "" : ",out of range", + chunkShouldNotBeDeleted ? ",marked as deleted" : "")); } - - if(chunkIdOk && chunkIsLive &&!yaffs_SkipNANDVerification(dev)) { + + if (chunkValid && !yaffs_SkipNANDVerification(dev)) { yaffs_ExtendedTags tags; yaffs_ObjectHeader *oh; - __u8 *buffer = yaffs_GetTempBuffer(dev,__LINE__); - + __u8 *buffer = yaffs_GetTempBuffer(dev, __LINE__); + oh = (yaffs_ObjectHeader *)buffer; - yaffs_ReadChunkWithTagsFromNAND(dev, obj->hdrChunk,buffer, &tags); + yaffs_ReadChunkWithTagsFromNAND(dev, obj->hdrChunk, buffer, + &tags); - yaffs_VerifyObjectHeader(obj,oh,&tags,1); - - yaffs_ReleaseTempBuffer(dev,buffer,__LINE__); + yaffs_VerifyObjectHeader(obj, oh, &tags, 1); + + yaffs_ReleaseTempBuffer(dev, buffer, __LINE__); } - + /* Verify it has a parent */ - if(obj && !obj->fake && - (!obj->parent || obj->parent->myDev != dev)){ - T(YAFFS_TRACE_VERIFY, - (TSTR("Obj %d has parent pointer %p which does not look like an object"TENDSTR), - obj->objectId,obj->parent)); + if (obj && !obj->fake && + (!obj->parent || obj->parent->myDev != dev)) { + T(YAFFS_TRACE_VERIFY, + (TSTR("Obj %d has parent pointer %p which does not look like an object"TENDSTR), + obj->objectId, obj->parent)); } - + /* Verify parent is a directory */ - if(obj->parent && obj->parent->variantType != YAFFS_OBJECT_TYPE_DIRECTORY){ - T(YAFFS_TRACE_VERIFY, - (TSTR("Obj %d's parent is not a directory (type %d)"TENDSTR), - obj->objectId,obj->parent->variantType)); + if (obj->parent && obj->parent->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) { + T(YAFFS_TRACE_VERIFY, + (TSTR("Obj %d's parent is not a directory (type %d)"TENDSTR), + obj->objectId, obj->parent->variantType)); } - - switch(obj->variantType){ + + switch (obj->variantType) { case YAFFS_OBJECT_TYPE_FILE: yaffs_VerifyFile(obj); break; @@ -829,57 +831,54 @@ static void yaffs_VerifyObject(yaffs_Object *obj) default: T(YAFFS_TRACE_VERIFY, (TSTR("Obj %d has illegaltype %d"TENDSTR), - obj->objectId,obj->variantType)); + obj->objectId, obj->variantType)); break; } - - } static void yaffs_VerifyObjects(yaffs_Device *dev) { - yaffs_Object *obj; - int i; - struct ylist_head *lh; + yaffs_Object *obj; + int i; + struct ylist_head *lh; - if(yaffs_SkipVerification(dev)) - return; - - /* Iterate through the objects in each hash entry */ - - for(i = 0; i < YAFFS_NOBJECT_BUCKETS; i++){ - ylist_for_each(lh, &dev->objectBucket[i].list) { - if (lh) { - obj = ylist_entry(lh, yaffs_Object, hashLink); - yaffs_VerifyObject(obj); - } - } - } + if (yaffs_SkipVerification(dev)) + return; + /* Iterate through the objects in each hash entry */ + + for (i = 0; i < YAFFS_NOBJECT_BUCKETS; i++) { + ylist_for_each(lh, &dev->objectBucket[i].list) { + if (lh) { + obj = ylist_entry(lh, yaffs_Object, hashLink); + yaffs_VerifyObject(obj); + } + } + } } /* * Simple hash function. Needs to have a reasonable spread */ - + static Y_INLINE int yaffs_HashFunction(int n) { n = abs(n); - return (n % YAFFS_NOBJECT_BUCKETS); + return n % YAFFS_NOBJECT_BUCKETS; } /* * Access functions to useful fake objects. * Note that root might have a presence in NAND if permissions are set. */ - -yaffs_Object *yaffs_Root(yaffs_Device * dev) + +yaffs_Object *yaffs_Root(yaffs_Device *dev) { return dev->rootDir; } -yaffs_Object *yaffs_LostNFound(yaffs_Device * dev) +yaffs_Object *yaffs_LostNFound(yaffs_Device *dev) { return dev->lostNFoundDir; } @@ -888,8 +887,8 @@ yaffs_Object *yaffs_LostNFound(yaffs_Device * dev) /* * Erased NAND checking functions */ - -int yaffs_CheckFF(__u8 * buffer, int nBytes) + +int yaffs_CheckFF(__u8 *buffer, int nBytes) { /* Horrible, slow implementation */ while (nBytes--) { @@ -901,19 +900,17 @@ int yaffs_CheckFF(__u8 * buffer, int nBytes) } static int yaffs_CheckChunkErased(struct yaffs_DeviceStruct *dev, - int chunkInNAND) + int chunkInNAND) { - int retval = YAFFS_OK; __u8 *data = yaffs_GetTempBuffer(dev, __LINE__); yaffs_ExtendedTags tags; int result; result = yaffs_ReadChunkWithTagsFromNAND(dev, chunkInNAND, data, &tags); - - if(tags.eccResult > YAFFS_ECC_RESULT_NO_ERROR) + + if (tags.eccResult > YAFFS_ECC_RESULT_NO_ERROR) retval = YAFFS_FAIL; - if (!yaffs_CheckFF(data, dev->nDataBytesPerChunk) || tags.chunkUsed) { T(YAFFS_TRACE_NANDACCESS, @@ -927,10 +924,33 @@ static int yaffs_CheckChunkErased(struct yaffs_DeviceStruct *dev, } + +static int yaffs_VerifyChunkWritten(yaffs_Device *dev, + int chunkInNAND, + const __u8 *data, + yaffs_ExtendedTags *tags) +{ + int retval = YAFFS_OK; + yaffs_ExtendedTags tempTags; + __u8 *buffer = yaffs_GetTempBuffer(dev,__LINE__); + int result; + + result = yaffs_ReadChunkWithTagsFromNAND(dev,chunkInNAND,buffer,&tempTags); + if(memcmp(buffer,data,dev->nDataBytesPerChunk) || + tempTags.objectId != tags->objectId || + tempTags.chunkId != tags->chunkId || + tempTags.byteCount != tags->byteCount) + retval = YAFFS_FAIL; + + yaffs_ReleaseTempBuffer(dev, buffer, __LINE__); + + return retval; +} + static int yaffs_WriteNewChunkWithTagsToNAND(struct yaffs_DeviceStruct *dev, - const __u8 * data, - yaffs_ExtendedTags * tags, - int useReserve) + const __u8 *data, + yaffs_ExtendedTags *tags, + int useReserve) { int attempts = 0; int writeOk = 0; @@ -966,12 +986,11 @@ static int yaffs_WriteNewChunkWithTagsToNAND(struct yaffs_DeviceStruct *dev, * chunk due to power loss. This checking policy should * catch that case with very few checks and thus save a * lot of checks that are most likely not needed. + * + * Mods to the above + * If an erase check fails or the write fails we skip the + * rest of the block. */ - if (bi->gcPrioritise) { - yaffs_DeleteChunk(dev, chunk, 1, __LINE__); - /* try another chunk */ - continue; - } /* let's give it a try */ attempts++; @@ -983,30 +1002,40 @@ static int yaffs_WriteNewChunkWithTagsToNAND(struct yaffs_DeviceStruct *dev, erasedOk = yaffs_CheckChunkErased(dev, chunk); if (erasedOk != YAFFS_OK) { T(YAFFS_TRACE_ERROR, - (TSTR ("**>> yaffs chunk %d was not erased" + (TSTR("**>> yaffs chunk %d was not erased" TENDSTR), chunk)); - /* try another chunk */ + /* If not erased, delete this one, + * skip rest of block and + * try another chunk */ + yaffs_DeleteChunk(dev,chunk,1,__LINE__); + yaffs_SkipRestOfBlock(dev); continue; } - bi->skipErasedCheck = 1; } writeOk = yaffs_WriteChunkWithTagsToNAND(dev, chunk, data, tags); + + if(!bi->skipErasedCheck) + writeOk = yaffs_VerifyChunkWritten(dev, chunk, data, tags); + if (writeOk != YAFFS_OK) { + /* Clean up aborted write, skip to next block and + * try another chunk */ yaffs_HandleWriteChunkError(dev, chunk, erasedOk); - /* try another chunk */ continue; } + bi->skipErasedCheck = 1; + /* Copy the data into the robustification buffer */ yaffs_HandleWriteChunkOk(dev, chunk, data, tags); - } while (writeOk != YAFFS_OK && - (yaffs_wr_attempts <= 0 || attempts <= yaffs_wr_attempts)); - - if(!writeOk) + } while (writeOk != YAFFS_OK && + (yaffs_wr_attempts <= 0 || attempts <= yaffs_wr_attempts)); + + if (!writeOk) chunk = -1; if (attempts > 1) { @@ -1020,17 +1049,116 @@ static int yaffs_WriteNewChunkWithTagsToNAND(struct yaffs_DeviceStruct *dev, return chunk; } + /* - * Block retiring for handling a broken block. + * Oldest Dirty Sequence Number handling. + */ + +/* yaffs_CalcOldestDirtySequence() + * yaffs_FindOldestDirtySequence() + * Calculate the oldest dirty sequence number if we don't know it. + */ +static int yaffs_CalcOldestDirtySequence(yaffs_Device *dev) +{ + int i; + __u32 seq; + yaffs_BlockInfo *b; + + if(!dev->param.isYaffs2) + return 0; + + /* Find the oldest dirty sequence number. */ + seq = dev->sequenceNumber; + b = dev->blockInfo; + for (i = dev->internalStartBlock; i <= dev->internalEndBlock; i++) { + if (b->blockState == YAFFS_BLOCK_STATE_FULL && + (b->pagesInUse - b->softDeletions) < dev->param.nChunksPerBlock && + b->sequenceNumber < seq) + seq = b->sequenceNumber; + b++; + } + return seq; +} + + +static void yaffs_FindOldestDirtySequence(yaffs_Device *dev) +{ + if(dev->param.isYaffs2 && !dev->oldestDirtySequence) + dev->oldestDirtySequence = + yaffs_CalcOldestDirtySequence(dev); + +#if 0 + if(!yaffs_SkipVerification(dev) && + dev->oldestDirtySequence != yaffs_CalcOldestDirtySequence(dev)) + YBUG(); + +#endif +} + +/* + * yaffs_ClearOldestDirtySequence() + * Called when a block is erased or marked bad. (ie. when its sequenceNumber + * becomes invalid). If the value matches the oldest then we clear + * dev->oldestDirtySequence to force its recomputation. + */ +static void yaffs_ClearOldestDirtySequence(yaffs_Device *dev, yaffs_BlockInfo *bi) +{ + + if(!dev->param.isYaffs2) + return; + + if(!bi || bi->sequenceNumber == dev->oldestDirtySequence) + dev->oldestDirtySequence = 0; +} + +/* + * yaffs_UpdateOldestDirtySequence() + * Update the oldest dirty sequence number whenever we dirty a block. + * Only do this if the oldestDirtySequence is actually being tracked. */ +static void yaffs_UpdateOldestDirtySequence(yaffs_Device *dev, yaffs_BlockInfo *bi) +{ + if(dev->param.isYaffs2 && dev->oldestDirtySequence){ + if(dev->oldestDirtySequence > bi->sequenceNumber) + dev->oldestDirtySequence = bi->sequenceNumber; + } +} -static void yaffs_RetireBlock(yaffs_Device * dev, int blockInNAND) +/* + * Block retiring for handling a broken block. + */ + +static void yaffs_RetireBlock(yaffs_Device *dev, int blockInNAND) { yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, blockInNAND); yaffs_InvalidateCheckpoint(dev); - yaffs_MarkBlockBad(dev, blockInNAND); + yaffs_ClearOldestDirtySequence(dev,bi); + + if (yaffs_MarkBlockBad(dev, blockInNAND) != YAFFS_OK) { + if (yaffs_EraseBlockInNAND(dev, blockInNAND) != YAFFS_OK) { + T(YAFFS_TRACE_ALWAYS, (TSTR( + "yaffs: Failed to mark bad and erase block %d" + TENDSTR), blockInNAND)); + } else { + yaffs_ExtendedTags tags; + int chunkId = blockInNAND * dev->param.nChunksPerBlock; + + __u8 *buffer = yaffs_GetTempBuffer(dev, __LINE__); + + memset(buffer, 0xff, dev->nDataBytesPerChunk); + yaffs_InitialiseTags(&tags); + tags.sequenceNumber = YAFFS_SEQUENCE_BAD_BLOCK; + if (dev->param.writeChunkWithTagsToNAND(dev, chunkId - + dev->chunkOffset, buffer, &tags) != YAFFS_OK) + T(YAFFS_TRACE_ALWAYS, (TSTR("yaffs: Failed to " + TCONT("write bad block marker to block %d") + TENDSTR), blockInNAND)); + + yaffs_ReleaseTempBuffer(dev, buffer, __LINE__); + } + } bi->blockState = YAFFS_BLOCK_STATE_DEAD; bi->gcPrioritise = 0; @@ -1043,60 +1171,64 @@ static void yaffs_RetireBlock(yaffs_Device * dev, int blockInNAND) * Functions for robustisizing TODO * */ - -static void yaffs_HandleWriteChunkOk(yaffs_Device * dev, int chunkInNAND, - const __u8 * data, - const yaffs_ExtendedTags * tags) + +static void yaffs_HandleWriteChunkOk(yaffs_Device *dev, int chunkInNAND, + const __u8 *data, + const yaffs_ExtendedTags *tags) { + dev=dev; + chunkInNAND=chunkInNAND; + data=data; + tags=tags; } -static void yaffs_HandleUpdateChunk(yaffs_Device * dev, int chunkInNAND, - const yaffs_ExtendedTags * tags) +static void yaffs_HandleUpdateChunk(yaffs_Device *dev, int chunkInNAND, + const yaffs_ExtendedTags *tags) { + dev=dev; + chunkInNAND=chunkInNAND; + tags=tags; } void yaffs_HandleChunkError(yaffs_Device *dev, yaffs_BlockInfo *bi) { - if(!bi->gcPrioritise){ + if (!bi->gcPrioritise) { bi->gcPrioritise = 1; dev->hasPendingPrioritisedGCs = 1; - bi->chunkErrorStrikes ++; - - if(bi->chunkErrorStrikes > 3){ + bi->chunkErrorStrikes++; + + if (bi->chunkErrorStrikes > 3) { bi->needsRetiring = 1; /* Too many stikes, so retire this */ T(YAFFS_TRACE_ALWAYS, (TSTR("yaffs: Block struck out" TENDSTR))); } - } } -static void yaffs_HandleWriteChunkError(yaffs_Device * dev, int chunkInNAND, int erasedOk) +static void yaffs_HandleWriteChunkError(yaffs_Device *dev, int chunkInNAND, + int erasedOk) { - - int blockInNAND = chunkInNAND / dev->nChunksPerBlock; + int blockInNAND = chunkInNAND / dev->param.nChunksPerBlock; yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, blockInNAND); - yaffs_HandleChunkError(dev,bi); - - - if(erasedOk ) { + yaffs_HandleChunkError(dev, bi); + + if (erasedOk) { /* Was an actual write failure, so mark the block for retirement */ bi->needsRetiring = 1; T(YAFFS_TRACE_ERROR | YAFFS_TRACE_BAD_BLOCKS, (TSTR("**>> Block %d needs retiring" TENDSTR), blockInNAND)); - - } - + /* Delete the chunk */ yaffs_DeleteChunk(dev, chunkInNAND, 1, __LINE__); + yaffs_SkipRestOfBlock(dev); } -/*---------------- Name handling functions ------------*/ +/*---------------- Name handling functions ------------*/ -static __u16 yaffs_CalcNameSum(const YCHAR * name) +static __u16 yaffs_CalcNameSum(const YCHAR *name) { __u16 sum = 0; __u16 i = 1; @@ -1114,19 +1246,17 @@ static __u16 yaffs_CalcNameSum(const YCHAR * name) bname++; } } - return sum; } -static void yaffs_SetObjectName(yaffs_Object * obj, const YCHAR * name) +static void yaffs_SetObjectName(yaffs_Object *obj, const YCHAR *name) { #ifdef CONFIG_YAFFS_SHORT_NAMES_IN_RAM - memset(obj->shortName,0,sizeof (YCHAR) * (YAFFS_SHORT_NAME_LENGTH+1)); - if (name && yaffs_strlen(name) <= YAFFS_SHORT_NAME_LENGTH) { + memset(obj->shortName, 0, sizeof(YCHAR) * (YAFFS_SHORT_NAME_LENGTH+1)); + if (name && yaffs_strnlen(name,YAFFS_SHORT_NAME_LENGTH+1) <= YAFFS_SHORT_NAME_LENGTH) yaffs_strcpy(obj->shortName, name); - } else { + else obj->shortName[0] = _Y('\0'); - } #endif obj->sum = yaffs_CalcNameSum(name); } @@ -1137,16 +1267,27 @@ static void yaffs_SetObjectName(yaffs_Object * obj, const YCHAR * name) * The list is hooked together using the first pointer * in the tnode. */ - + /* yaffs_CreateTnodes creates a bunch more tnodes and * adds them to the tnode free list. * Don't use this function directly */ +static Y_INLINE int yaffs_CalcTnodeSize(yaffs_Device *dev) +{ + int tnodeSize; + /* Calculate the tnode size in bytes for variable width tnode support. + * Must be a multiple of 32-bits */ + tnodeSize = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8; -static int yaffs_CreateTnodes(yaffs_Device * dev, int nTnodes) + if (tnodeSize < sizeof(yaffs_Tnode)) + tnodeSize = sizeof(yaffs_Tnode); + return tnodeSize; +} + +static int yaffs_CreateTnodes(yaffs_Device *dev, int nTnodes) { int i; - int tnodeSize; + int tnodeSize = yaffs_CalcTnodeSize(dev); yaffs_Tnode *newTnodes; __u8 *mem; yaffs_Tnode *curr; @@ -1155,14 +1296,7 @@ static int yaffs_CreateTnodes(yaffs_Device * dev, int nTnodes) if (nTnodes < 1) return YAFFS_OK; - - /* Calculate the tnode size in bytes for variable width tnode support. - * Must be a multiple of 32-bits */ - tnodeSize = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8; - if(tnodeSize < sizeof(yaffs_Tnode)) - tnodeSize = sizeof(yaffs_Tnode); - /* make these things */ @@ -1171,7 +1305,7 @@ static int yaffs_CreateTnodes(yaffs_Device * dev, int nTnodes) if (!newTnodes) { T(YAFFS_TRACE_ERROR, - (TSTR("yaffs: Could not allocate Tnodes" TENDSTR))); + (TSTR("yaffs: Could not allocate Tnodes" TENDSTR))); return YAFFS_FAIL; } @@ -1191,12 +1325,12 @@ static int yaffs_CreateTnodes(yaffs_Device * dev, int nTnodes) dev->freeTnodes = newTnodes; #else /* New hookup for wide tnodes */ - for(i = 0; i < nTnodes -1; i++) { + for (i = 0; i < nTnodes - 1; i++) { curr = (yaffs_Tnode *) &mem[i * tnodeSize]; next = (yaffs_Tnode *) &mem[(i+1) * tnodeSize]; curr->internal[0] = next; } - + curr = (yaffs_Tnode *) &mem[(nTnodes - 1) * tnodeSize]; curr->internal[0] = dev->freeTnodes; dev->freeTnodes = (yaffs_Tnode *)mem; @@ -1211,14 +1345,13 @@ static int yaffs_CreateTnodes(yaffs_Device * dev, int nTnodes) * NB If we can't add this to the management list it isn't fatal * but it just means we can't free this bunch of tnodes later. */ - + tnl = YMALLOC(sizeof(yaffs_TnodeList)); if (!tnl) { T(YAFFS_TRACE_ERROR, (TSTR ("yaffs: Could not add tnodes to management list" TENDSTR))); return YAFFS_FAIL; - } else { tnl->tnodes = newTnodes; tnl->next = dev->allocatedTnodeList; @@ -1232,14 +1365,18 @@ static int yaffs_CreateTnodes(yaffs_Device * dev, int nTnodes) /* GetTnode gets us a clean tnode. Tries to make allocate more if we run out */ -static yaffs_Tnode *yaffs_GetTnodeRaw(yaffs_Device * dev) +static yaffs_Tnode *yaffs_GetTnodeRaw(yaffs_Device *dev) { yaffs_Tnode *tn = NULL; +#ifdef CONFIG_YAFFS_VALGRIND_TEST + tn = YMALLOC(yaffs_CalcTnodeSize(dev)); + if(tn) + dev->nTnodesCreated++; +#else /* If there are none left make more */ - if (!dev->freeTnodes) { + if (!dev->freeTnodes) yaffs_CreateTnodes(dev, YAFFS_ALLOCATION_NTNODES); - } if (dev->freeTnodes) { tn = dev->freeTnodes; @@ -1253,30 +1390,31 @@ static yaffs_Tnode *yaffs_GetTnodeRaw(yaffs_Device * dev) dev->freeTnodes = dev->freeTnodes->internal[0]; dev->nFreeTnodes--; } - +#endif dev->nCheckpointBlocksRequired = 0; /* force recalculation*/ return tn; } -static yaffs_Tnode *yaffs_GetTnode(yaffs_Device * dev) +static yaffs_Tnode *yaffs_GetTnode(yaffs_Device *dev) { yaffs_Tnode *tn = yaffs_GetTnodeRaw(dev); - int tnodeSize = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8; + int tnodeSize = yaffs_CalcTnodeSize(dev); - if(tnodeSize < sizeof(yaffs_Tnode)) - tnodeSize = sizeof(yaffs_Tnode); - - if(tn) + if (tn) memset(tn, 0, tnodeSize); - return tn; + return tn; } /* FreeTnode frees up a tnode and puts it back on the free list */ -static void yaffs_FreeTnode(yaffs_Device * dev, yaffs_Tnode * tn) +static void yaffs_FreeTnode(yaffs_Device *dev, yaffs_Tnode *tn) { if (tn) { +#ifdef CONFIG_YAFFS_VALGRIND_TEST + YFREE(tn); + dev->nTnodesCreated--; +#else #ifdef CONFIG_YAFFS_TNODE_LIST_DEBUG if (tn->internal[YAFFS_NTNODES_INTERNAL] != 0) { /* Hoosterman, this thing looks like it is already in the list */ @@ -1288,12 +1426,12 @@ static void yaffs_FreeTnode(yaffs_Device * dev, yaffs_Tnode * tn) tn->internal[0] = dev->freeTnodes; dev->freeTnodes = tn; dev->nFreeTnodes++; +#endif } dev->nCheckpointBlocksRequired = 0; /* force recalculation*/ - } -static void yaffs_DeinitialiseTnodes(yaffs_Device * dev) +static void yaffs_DeinitialiseTnodes(yaffs_Device *dev) { /* Free the list of allocated tnodes */ yaffs_TnodeList *tmp; @@ -1309,73 +1447,75 @@ static void yaffs_DeinitialiseTnodes(yaffs_Device * dev) dev->freeTnodes = NULL; dev->nFreeTnodes = 0; + dev->nTnodesCreated = 0; } -static void yaffs_InitialiseTnodes(yaffs_Device * dev) +static void yaffs_InitialiseTnodes(yaffs_Device *dev) { dev->allocatedTnodeList = NULL; dev->freeTnodes = NULL; dev->nFreeTnodes = 0; dev->nTnodesCreated = 0; +} + + +void yaffs_LoadLevel0Tnode(yaffs_Device *dev, yaffs_Tnode *tn, unsigned pos, + unsigned val) +{ + __u32 *map = (__u32 *)tn; + __u32 bitInMap; + __u32 bitInWord; + __u32 wordInMap; + __u32 mask; + + pos &= YAFFS_TNODES_LEVEL0_MASK; + val >>= dev->chunkGroupBits; + + bitInMap = pos * dev->tnodeWidth; + wordInMap = bitInMap / 32; + bitInWord = bitInMap & (32 - 1); + + mask = dev->tnodeMask << bitInWord; + map[wordInMap] &= ~mask; + map[wordInMap] |= (mask & (val << bitInWord)); + + if (dev->tnodeWidth > (32 - bitInWord)) { + bitInWord = (32 - bitInWord); + wordInMap++;; + mask = dev->tnodeMask >> (/*dev->tnodeWidth -*/ bitInWord); + map[wordInMap] &= ~mask; + map[wordInMap] |= (mask & (val >> bitInWord)); + } } +static __u32 yaffs_GetChunkGroupBase(yaffs_Device *dev, yaffs_Tnode *tn, + unsigned pos) +{ + __u32 *map = (__u32 *)tn; + __u32 bitInMap; + __u32 bitInWord; + __u32 wordInMap; + __u32 val; + + pos &= YAFFS_TNODES_LEVEL0_MASK; + + bitInMap = pos * dev->tnodeWidth; + wordInMap = bitInMap / 32; + bitInWord = bitInMap & (32 - 1); -void yaffs_PutLevel0Tnode(yaffs_Device *dev, yaffs_Tnode *tn, unsigned pos, unsigned val) -{ - __u32 *map = (__u32 *)tn; - __u32 bitInMap; - __u32 bitInWord; - __u32 wordInMap; - __u32 mask; - - pos &= YAFFS_TNODES_LEVEL0_MASK; - val >>= dev->chunkGroupBits; - - bitInMap = pos * dev->tnodeWidth; - wordInMap = bitInMap /32; - bitInWord = bitInMap & (32 -1); - - mask = dev->tnodeMask << bitInWord; - - map[wordInMap] &= ~mask; - map[wordInMap] |= (mask & (val << bitInWord)); - - if(dev->tnodeWidth > (32-bitInWord)) { - bitInWord = (32 - bitInWord); - wordInMap++;; - mask = dev->tnodeMask >> (/*dev->tnodeWidth -*/ bitInWord); - map[wordInMap] &= ~mask; - map[wordInMap] |= (mask & (val >> bitInWord)); - } -} - -static __u32 yaffs_GetChunkGroupBase(yaffs_Device *dev, yaffs_Tnode *tn, unsigned pos) -{ - __u32 *map = (__u32 *)tn; - __u32 bitInMap; - __u32 bitInWord; - __u32 wordInMap; - __u32 val; - - pos &= YAFFS_TNODES_LEVEL0_MASK; - - bitInMap = pos * dev->tnodeWidth; - wordInMap = bitInMap /32; - bitInWord = bitInMap & (32 -1); - - val = map[wordInMap] >> bitInWord; - - if(dev->tnodeWidth > (32-bitInWord)) { - bitInWord = (32 - bitInWord); - wordInMap++;; - val |= (map[wordInMap] << bitInWord); - } - - val &= dev->tnodeMask; - val <<= dev->chunkGroupBits; - - return val; + val = map[wordInMap] >> bitInWord; + + if (dev->tnodeWidth > (32 - bitInWord)) { + bitInWord = (32 - bitInWord); + wordInMap++;; + val |= (map[wordInMap] << bitInWord); + } + + val &= dev->tnodeMask; + val <<= dev->chunkGroupBits; + + return val; } /* ------------------- End of individual tnode manipulation -----------------*/ @@ -1386,24 +1526,23 @@ static __u32 yaffs_GetChunkGroupBase(yaffs_Device *dev, yaffs_Tnode *tn, unsigne */ /* FindLevel0Tnode finds the level 0 tnode, if one exists. */ -static yaffs_Tnode *yaffs_FindLevel0Tnode(yaffs_Device * dev, - yaffs_FileStructure * fStruct, - __u32 chunkId) +static yaffs_Tnode *yaffs_FindLevel0Tnode(yaffs_Device *dev, + yaffs_FileStructure *fStruct, + __u32 chunkId) { - yaffs_Tnode *tn = fStruct->top; __u32 i; int requiredTallness; int level = fStruct->topLevel; + dev=dev; + /* Check sane level and chunk Id */ - if (level < 0 || level > YAFFS_TNODES_MAX_LEVEL) { + if (level < 0 || level > YAFFS_TNODES_MAX_LEVEL) return NULL; - } - if (chunkId > YAFFS_MAX_CHUNK_ID) { + if (chunkId > YAFFS_MAX_CHUNK_ID) return NULL; - } /* First check we're tall enough (ie enough topLevel) */ @@ -1414,22 +1553,17 @@ static yaffs_Tnode *yaffs_FindLevel0Tnode(yaffs_Device * dev, requiredTallness++; } - if (requiredTallness > fStruct->topLevel) { - /* Not tall enough, so we can't find it, return NULL. */ - return NULL; - } + if (requiredTallness > fStruct->topLevel) + return NULL; /* Not tall enough, so we can't find it */ /* Traverse down to level 0 */ while (level > 0 && tn) { - tn = tn-> - internal[(chunkId >> - ( YAFFS_TNODES_LEVEL0_BITS + - (level - 1) * - YAFFS_TNODES_INTERNAL_BITS) - ) & - YAFFS_TNODES_INTERNAL_MASK]; + tn = tn->internal[(chunkId >> + (YAFFS_TNODES_LEVEL0_BITS + + (level - 1) * + YAFFS_TNODES_INTERNAL_BITS)) & + YAFFS_TNODES_INTERNAL_MASK]; level--; - } return tn; @@ -1445,13 +1579,12 @@ static yaffs_Tnode *yaffs_FindLevel0Tnode(yaffs_Device * dev, * If the tn argument is NULL, then a fresh tnode will be added otherwise the specified tn will * be plugged into the ttree. */ - -static yaffs_Tnode *yaffs_AddOrFindLevel0Tnode(yaffs_Device * dev, - yaffs_FileStructure * fStruct, - __u32 chunkId, - yaffs_Tnode *passedTn) -{ +static yaffs_Tnode *yaffs_AddOrFindLevel0Tnode(yaffs_Device *dev, + yaffs_FileStructure *fStruct, + __u32 chunkId, + yaffs_Tnode *passedTn) +{ int requiredTallness; int i; int l; @@ -1461,13 +1594,11 @@ static yaffs_Tnode *yaffs_AddOrFindLevel0Tnode(yaffs_Device * dev, /* Check sane level and page Id */ - if (fStruct->topLevel < 0 || fStruct->topLevel > YAFFS_TNODES_MAX_LEVEL) { + if (fStruct->topLevel < 0 || fStruct->topLevel > YAFFS_TNODES_MAX_LEVEL) return NULL; - } - if (chunkId > YAFFS_MAX_CHUNK_ID) { + if (chunkId > YAFFS_MAX_CHUNK_ID) return NULL; - } /* First check we're tall enough (ie enough topLevel) */ @@ -1480,84 +1611,90 @@ static yaffs_Tnode *yaffs_AddOrFindLevel0Tnode(yaffs_Device * dev, if (requiredTallness > fStruct->topLevel) { - /* Not tall enough,gotta make the tree taller */ + /* Not tall enough, gotta make the tree taller */ for (i = fStruct->topLevel; i < requiredTallness; i++) { - + tn = yaffs_GetTnode(dev); if (tn) { tn->internal[0] = fStruct->top; fStruct->top = tn; + fStruct->topLevel++; } else { T(YAFFS_TRACE_ERROR, - (TSTR("yaffs: no more tnodes" TENDSTR))); + (TSTR("yaffs: no more tnodes" TENDSTR))); + return NULL; } } - - fStruct->topLevel = requiredTallness; } /* Traverse down to level 0, adding anything we need */ l = fStruct->topLevel; tn = fStruct->top; - - if(l > 0) { + + if (l > 0) { while (l > 0 && tn) { x = (chunkId >> - ( YAFFS_TNODES_LEVEL0_BITS + + (YAFFS_TNODES_LEVEL0_BITS + (l - 1) * YAFFS_TNODES_INTERNAL_BITS)) & YAFFS_TNODES_INTERNAL_MASK; - if((l>1) && !tn->internal[x]){ + if ((l > 1) && !tn->internal[x]) { /* Add missing non-level-zero tnode */ tn->internal[x] = yaffs_GetTnode(dev); - - } else if(l == 1) { + if(!tn->internal[x]) + return NULL; + } else if (l == 1) { /* Looking from level 1 at level 0 */ - if (passedTn) { + if (passedTn) { /* If we already have one, then release it.*/ - if(tn->internal[x]) - yaffs_FreeTnode(dev,tn->internal[x]); + if (tn->internal[x]) + yaffs_FreeTnode(dev, tn->internal[x]); tn->internal[x] = passedTn; - - } else if(!tn->internal[x]) { + + } else if (!tn->internal[x]) { /* Don't have one, none passed in */ tn->internal[x] = yaffs_GetTnode(dev); + if(!tn->internal[x]) + return NULL; } } - + tn = tn->internal[x]; l--; } } else { /* top is level 0 */ - if(passedTn) { - memcpy(tn,passedTn,(dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8); - yaffs_FreeTnode(dev,passedTn); + if (passedTn) { + memcpy(tn, passedTn, (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8); + yaffs_FreeTnode(dev, passedTn); } } return tn; } -static int yaffs_FindChunkInGroup(yaffs_Device * dev, int theChunk, - yaffs_ExtendedTags * tags, int objectId, - int chunkInInode) +static int yaffs_FindChunkInGroup(yaffs_Device *dev, int theChunk, + yaffs_ExtendedTags *tags, int objectId, + int chunkInInode) { int j; for (j = 0; theChunk && j < dev->chunkGroupSize; j++) { - if (yaffs_CheckChunkBit - (dev, theChunk / dev->nChunksPerBlock, - theChunk % dev->nChunksPerBlock)) { - yaffs_ReadChunkWithTagsFromNAND(dev, theChunk, NULL, - tags); - if (yaffs_TagsMatch(tags, objectId, chunkInInode)) { - /* found it; */ + if (yaffs_CheckChunkBit(dev, theChunk / dev->param.nChunksPerBlock, + theChunk % dev->param.nChunksPerBlock)) { + + if(dev->chunkGroupSize == 1) return theChunk; - + else { + yaffs_ReadChunkWithTagsFromNAND(dev, theChunk, NULL, + tags); + if (yaffs_TagsMatch(tags, objectId, chunkInInode)) { + /* found it; */ + return theChunk; + } } } theChunk++; @@ -1568,11 +1705,11 @@ static int yaffs_FindChunkInGroup(yaffs_Device * dev, int theChunk, /* DeleteWorker scans backwards through the tnode tree and deletes all the * chunks and tnodes in the file - * Returns 1 if the tree was deleted. + * Returns 1 if the tree was deleted. * Returns 0 if it stopped early due to hitting the limit and the delete is incomplete. */ -static int yaffs_DeleteWorker(yaffs_Object * in, yaffs_Tnode * tn, __u32 level, +static int yaffs_DeleteWorker(yaffs_Object *in, yaffs_Tnode *tn, __u32 level, int chunkOffset, int *limit) { int i; @@ -1586,7 +1723,6 @@ static int yaffs_DeleteWorker(yaffs_Object * in, yaffs_Tnode * tn, __u32 level, if (tn) { if (level > 0) { - for (i = YAFFS_NTNODES_INTERNAL - 1; allDone && i >= 0; i--) { if (tn->internal[i]) { @@ -1594,17 +1730,17 @@ static int yaffs_DeleteWorker(yaffs_Object * in, yaffs_Tnode * tn, __u32 level, allDone = 0; } else { allDone = - yaffs_DeleteWorker(in, - tn-> - internal - [i], - level - - 1, - (chunkOffset + yaffs_DeleteWorker(in, + tn-> + internal + [i], + level - + 1, + (chunkOffset << YAFFS_TNODES_INTERNAL_BITS) - + i, - limit); + + i, + limit); } if (allDone) { yaffs_FreeTnode(dev, @@ -1613,27 +1749,25 @@ static int yaffs_DeleteWorker(yaffs_Object * in, yaffs_Tnode * tn, __u32 level, tn->internal[i] = NULL; } } - } return (allDone) ? 1 : 0; } else if (level == 0) { int hitLimit = 0; for (i = YAFFS_NTNODES_LEVEL0 - 1; i >= 0 && !hitLimit; - i--) { - theChunk = yaffs_GetChunkGroupBase(dev,tn,i); + i--) { + theChunk = yaffs_GetChunkGroupBase(dev, tn, i); if (theChunk) { - chunkInInode = - (chunkOffset << - YAFFS_TNODES_LEVEL0_BITS) + i; + chunkInInode = (chunkOffset << + YAFFS_TNODES_LEVEL0_BITS) + i; foundChunk = - yaffs_FindChunkInGroup(dev, - theChunk, - &tags, - in->objectId, - chunkInInode); + yaffs_FindChunkInGroup(dev, + theChunk, + &tags, + in->objectId, + chunkInInode); if (foundChunk > 0) { yaffs_DeleteChunk(dev, @@ -1642,14 +1776,13 @@ static int yaffs_DeleteWorker(yaffs_Object * in, yaffs_Tnode * tn, __u32 level, in->nDataChunks--; if (limit) { *limit = *limit - 1; - if (*limit <= 0) { + if (*limit <= 0) hitLimit = 1; - } } } - yaffs_PutLevel0Tnode(dev,tn,i,0); + yaffs_LoadLevel0Tnode(dev, tn, i, 0); } } @@ -1663,17 +1796,17 @@ static int yaffs_DeleteWorker(yaffs_Object * in, yaffs_Tnode * tn, __u32 level, } -static void yaffs_SoftDeleteChunk(yaffs_Device * dev, int chunk) +static void yaffs_SoftDeleteChunk(yaffs_Device *dev, int chunk) { - yaffs_BlockInfo *theBlock; T(YAFFS_TRACE_DELETION, (TSTR("soft delete chunk %d" TENDSTR), chunk)); - theBlock = yaffs_GetBlockInfo(dev, chunk / dev->nChunksPerBlock); + theBlock = yaffs_GetBlockInfo(dev, chunk / dev->param.nChunksPerBlock); if (theBlock) { theBlock->softDeletions++; dev->nFreeChunks++; + yaffs_UpdateOldestDirtySequence(dev,theBlock); } } @@ -1682,8 +1815,8 @@ static void yaffs_SoftDeleteChunk(yaffs_Device * dev, int chunk) * of the tnode. * Thus, essentially this is the same as DeleteWorker except that the chunks are soft deleted. */ - -static int yaffs_SoftDeleteWorker(yaffs_Object * in, yaffs_Tnode * tn, + +static int yaffs_SoftDeleteWorker(yaffs_Object *in, yaffs_Tnode *tn, __u32 level, int chunkOffset) { int i; @@ -1720,14 +1853,14 @@ static int yaffs_SoftDeleteWorker(yaffs_Object * in, yaffs_Tnode * tn, } else if (level == 0) { for (i = YAFFS_NTNODES_LEVEL0 - 1; i >= 0; i--) { - theChunk = yaffs_GetChunkGroupBase(dev,tn,i); + theChunk = yaffs_GetChunkGroupBase(dev, tn, i); if (theChunk) { /* Note this does not find the real chunk, only the chunk group. - * We make an assumption that a chunk group is not larger than + * We make an assumption that a chunk group is not larger than * a block. */ yaffs_SoftDeleteChunk(dev, theChunk); - yaffs_PutLevel0Tnode(dev,tn,i,0); + yaffs_LoadLevel0Tnode(dev, tn, i, 0); } } @@ -1741,7 +1874,7 @@ static int yaffs_SoftDeleteWorker(yaffs_Object * in, yaffs_Tnode * tn, } -static void yaffs_SoftDeleteFile(yaffs_Object * obj) +static void yaffs_SoftDeleteFile(yaffs_Object *obj) { if (obj->deleted && obj->variantType == YAFFS_OBJECT_TYPE_FILE && !obj->softDeleted) { @@ -1773,10 +1906,14 @@ static void yaffs_SoftDeleteFile(yaffs_Object * obj) * level 0 tnode entries must be zeroed out. * Could also use this for file deletion, but that's probably better handled * by a special case. + * + * This function is recursive. For levels > 0 the function is called again on + * any sub-tree. For level == 0 we just check if the sub-tree has data. + * If there is no data in a subtree then it is pruned. */ -static yaffs_Tnode *yaffs_PruneWorker(yaffs_Device * dev, yaffs_Tnode * tn, - __u32 level, int del0) +static yaffs_Tnode *yaffs_PruneWorker(yaffs_Device *dev, yaffs_Tnode *tn, + __u32 level, int del0) { int i; int hasData; @@ -1784,18 +1921,27 @@ static yaffs_Tnode *yaffs_PruneWorker(yaffs_Device * dev, yaffs_Tnode * tn, if (tn) { hasData = 0; - for (i = 0; i < YAFFS_NTNODES_INTERNAL; i++) { - if (tn->internal[i] && level > 0) { - tn->internal[i] = - yaffs_PruneWorker(dev, tn->internal[i], - level - 1, - (i == 0) ? del0 : 1); - } + if(level > 0){ + for (i = 0; i < YAFFS_NTNODES_INTERNAL; i++) { + if (tn->internal[i]) { + tn->internal[i] = + yaffs_PruneWorker(dev, tn->internal[i], + level - 1, + (i == 0) ? del0 : 1); + } - if (tn->internal[i]) { - hasData++; + if (tn->internal[i]) + hasData++; } - } + } else { + int tnodeSize_u32 = yaffs_CalcTnodeSize(dev)/sizeof(__u32); + __u32 *map = (__u32 *)tn; + + for(i = 0; !hasData && i < tnodeSize_u32; i++){ + if(map[i]) + hasData++; + } + } if (hasData == 0 && del0) { /* Free and return NULL */ @@ -1810,8 +1956,8 @@ static yaffs_Tnode *yaffs_PruneWorker(yaffs_Device * dev, yaffs_Tnode * tn, } -static int yaffs_PruneFileStructure(yaffs_Device * dev, - yaffs_FileStructure * fStruct) +static int yaffs_PruneFileStructure(yaffs_Device *dev, + yaffs_FileStructure *fStruct) { int i; int hasData; @@ -1825,7 +1971,7 @@ static int yaffs_PruneFileStructure(yaffs_Device * dev, /* Now we have a tree with all the non-zero branches NULL but the height * is the same as it was. * Let's see if we can trim internal tnodes to shorten the tree. - * We can do this if only the 0th element in the tnode is in use + * We can do this if only the 0th element in the tnode is in use * (ie all the non-zero are NULL) */ @@ -1834,9 +1980,8 @@ static int yaffs_PruneFileStructure(yaffs_Device * dev, hasData = 0; for (i = 1; i < YAFFS_NTNODES_INTERNAL; i++) { - if (tn->internal[i]) { + if (tn->internal[i]) hasData++; - } } if (!hasData) { @@ -1857,7 +2002,7 @@ static int yaffs_PruneFileStructure(yaffs_Device * dev, /* yaffs_CreateFreeObjects creates a bunch more objects and * adds them to the object free list. */ -static int yaffs_CreateFreeObjects(yaffs_Device * dev, int nObjects) +static int yaffs_CreateFreeObjects(yaffs_Device *dev, int nObjects) { int i; yaffs_Object *newObjects; @@ -1871,22 +2016,26 @@ static int yaffs_CreateFreeObjects(yaffs_Device * dev, int nObjects) list = YMALLOC(sizeof(yaffs_ObjectList)); if (!newObjects || !list) { - if(newObjects) + if (newObjects){ YFREE(newObjects); - if(list) + newObjects = NULL; + } + if (list){ YFREE(list); + list = NULL; + } T(YAFFS_TRACE_ALLOCATE, (TSTR("yaffs: Could not allocate more objects" TENDSTR))); return YAFFS_FAIL; } - - /* Hook them into the free list */ - for (i = 0; i < nObjects - 1; i++) { - newObjects[i].siblings.next = - (struct ylist_head *)(&newObjects[i + 1]); - } - newObjects[nObjects - 1].siblings.next = (void *)dev->freeObjects; + /* Hook them into the free list */ + for (i = 0; i < nObjects - 1; i++) { + newObjects[i].siblings.next = + (struct ylist_head *)(&newObjects[i + 1]); + } + + newObjects[nObjects - 1].siblings.next = (void *)dev->freeObjects; dev->freeObjects = newObjects; dev->nFreeObjects += nObjects; dev->nObjectsCreated += nObjects; @@ -1902,58 +2051,62 @@ static int yaffs_CreateFreeObjects(yaffs_Device * dev, int nObjects) /* AllocateEmptyObject gets us a clean Object. Tries to make allocate more if we run out */ -static yaffs_Object *yaffs_AllocateEmptyObject(yaffs_Device * dev) +static yaffs_Object *yaffs_AllocateEmptyObject(yaffs_Device *dev) { yaffs_Object *tn = NULL; -#ifdef VALGRIND_TEST +#ifdef CONFIG_YAFFS_VALGRIND_TEST tn = YMALLOC(sizeof(yaffs_Object)); + if(tn) + dev->nObjectsCreated++; #else /* If there are none left make more */ - if (!dev->freeObjects) { + if (!dev->freeObjects) yaffs_CreateFreeObjects(dev, YAFFS_ALLOCATION_NOBJECTS); - } if (dev->freeObjects) { tn = dev->freeObjects; dev->freeObjects = - (yaffs_Object *) (dev->freeObjects->siblings.next); + (yaffs_Object *) (dev->freeObjects->siblings.next); dev->nFreeObjects--; } #endif - if(tn){ + if (tn) { /* Now sweeten it up... */ memset(tn, 0, sizeof(yaffs_Object)); + tn->beingCreated = 1; + tn->myDev = dev; tn->hdrChunk = 0; tn->variantType = YAFFS_OBJECT_TYPE_UNKNOWN; YINIT_LIST_HEAD(&(tn->hardLinks)); YINIT_LIST_HEAD(&(tn->hashLink)); YINIT_LIST_HEAD(&tn->siblings); - + /* Now make the directory sane */ - if(dev->rootDir){ + if (dev->rootDir) { tn->parent = dev->rootDir; - ylist_add(&(tn->siblings),&dev->rootDir->variant.directoryVariant.children); + ylist_add(&(tn->siblings), &dev->rootDir->variant.directoryVariant.children); } - /* Add it to the lost and found directory. - * NB Can't put root or lostNFound in lostNFound so + /* Add it to the lost and found directory. + * NB Can't put root or lostNFound in lostNFound so * check if lostNFound exists first */ - if (dev->lostNFoundDir) { + if (dev->lostNFoundDir) yaffs_AddObjectToDirectory(dev->lostNFoundDir, tn); - } + + tn->beingCreated = 0; } - + dev->nCheckpointBlocksRequired = 0; /* force recalculation*/ return tn; } -static yaffs_Object *yaffs_CreateFakeDirectory(yaffs_Device * dev, int number, +static yaffs_Object *yaffs_CreateFakeDirectory(yaffs_Device *dev, int number, __u32 mode) { @@ -1974,34 +2127,34 @@ static yaffs_Object *yaffs_CreateFakeDirectory(yaffs_Device * dev, int number, } -static void yaffs_UnhashObject(yaffs_Object * tn) +static void yaffs_UnhashObject(yaffs_Object *tn) { int bucket; - yaffs_Device *dev = tn->myDev; - - /* If it is still linked into the bucket list, free from the list */ - if (!ylist_empty(&tn->hashLink)) { - ylist_del_init(&tn->hashLink); - bucket = yaffs_HashFunction(tn->objectId); - dev->objectBucket[bucket].count--; - } + yaffs_Device *dev = tn->myDev; + /* If it is still linked into the bucket list, free from the list */ + if (!ylist_empty(&tn->hashLink)) { + ylist_del_init(&tn->hashLink); + bucket = yaffs_HashFunction(tn->objectId); + dev->objectBucket[bucket].count--; + } } /* FreeObject frees up a Object and puts it back on the free list */ -static void yaffs_FreeObject(yaffs_Object * tn) +static void yaffs_FreeObject(yaffs_Object *tn) { - yaffs_Device *dev = tn->myDev; - - if(tn->parent) + T(YAFFS_TRACE_OS, (TSTR("FreeObject %p inode %p"TENDSTR), tn, tn->myInode)); + + if (!tn) + YBUG(); + if (tn->parent) YBUG(); - if(!ylist_empty(&tn->siblings)) + if (!ylist_empty(&tn->siblings)) YBUG(); -#ifdef __KERNEL__ if (tn->myInode) { /* We're still hooked up to a cached inode. * Don't delete now, but mark for later deletion @@ -2009,34 +2162,31 @@ static void yaffs_FreeObject(yaffs_Object * tn) tn->deferedFree = 1; return; } -#endif - yaffs_UnhashObject(tn); + yaffs_UnhashObject(tn); -#ifdef VALGRIND_TEST +#ifdef CONFIG_YAFFS_VALGRIND_TEST YFREE(tn); + dev->nObjectsCreated--; + tn = NULL; #else - /* Link into the free list. */ - tn->siblings.next = (struct ylist_head *)(dev->freeObjects); - dev->freeObjects = tn; - dev->nFreeObjects++; + /* Link into the free list. */ + tn->siblings.next = (struct ylist_head *)(dev->freeObjects); + dev->freeObjects = tn; + dev->nFreeObjects++; #endif dev->nCheckpointBlocksRequired = 0; /* force recalculation*/ - } -#ifdef __KERNEL__ -void yaffs_HandleDeferedFree(yaffs_Object * obj) +void yaffs_HandleDeferedFree(yaffs_Object *obj) { - if (obj->deferedFree) { + if (obj->deferedFree) yaffs_FreeObject(obj); - } } -#endif -static void yaffs_DeinitialiseObjects(yaffs_Device * dev) +static void yaffs_DeinitialiseObjects(yaffs_Device *dev) { /* Free the list of allocated Objects */ @@ -2052,52 +2202,40 @@ static void yaffs_DeinitialiseObjects(yaffs_Device * dev) dev->freeObjects = NULL; dev->nFreeObjects = 0; + dev->nObjectsCreated = 0; } -static void yaffs_InitialiseObjects(yaffs_Device * dev) +static void yaffs_InitialiseObjects(yaffs_Device *dev) { int i; dev->allocatedObjectList = NULL; dev->freeObjects = NULL; - dev->nFreeObjects = 0; - - for (i = 0; i < YAFFS_NOBJECT_BUCKETS; i++) { - YINIT_LIST_HEAD(&dev->objectBucket[i].list); - dev->objectBucket[i].count = 0; - } + dev->nFreeObjects = 0; + for (i = 0; i < YAFFS_NOBJECT_BUCKETS; i++) { + YINIT_LIST_HEAD(&dev->objectBucket[i].list); + dev->objectBucket[i].count = 0; + } } -static int yaffs_FindNiceObjectBucket(yaffs_Device * dev) +static int yaffs_FindNiceObjectBucket(yaffs_Device *dev) { - static int x = 0; int i; int l = 999; int lowest = 999999; - /* First let's see if we can find one that's empty. */ - for (i = 0; i < 10 && lowest > 0; i++) { - x++; - x %= YAFFS_NOBJECT_BUCKETS; - if (dev->objectBucket[x].count < lowest) { - lowest = dev->objectBucket[x].count; - l = x; - } - - } - - /* If we didn't find an empty list, then try - * looking a bit further for a short one + /* Search for the shortest list or one that + * isn't too long. */ - for (i = 0; i < 10 && lowest > 3; i++) { - x++; - x %= YAFFS_NOBJECT_BUCKETS; - if (dev->objectBucket[x].count < lowest) { - lowest = dev->objectBucket[x].count; - l = x; + for (i = 0; i < 10 && lowest > 4; i++) { + dev->bucketFinder++; + dev->bucketFinder %= YAFFS_NOBJECT_BUCKETS; + if (dev->objectBucket[dev->bucketFinder].count < lowest) { + lowest = dev->objectBucket[dev->bucketFinder].count; + l = dev->bucketFinder; } } @@ -2105,66 +2243,62 @@ static int yaffs_FindNiceObjectBucket(yaffs_Device * dev) return l; } -static int yaffs_CreateNewObjectNumber(yaffs_Device * dev) +static int yaffs_CreateNewObjectNumber(yaffs_Device *dev) { int bucket = yaffs_FindNiceObjectBucket(dev); /* Now find an object value that has not already been taken * by scanning the list. - */ + */ - int found = 0; - struct ylist_head *i; + int found = 0; + struct ylist_head *i; - __u32 n = (__u32) bucket; + __u32 n = (__u32) bucket; /* yaffs_CheckObjectHashSanity(); */ while (!found) { - found = 1; - n += YAFFS_NOBJECT_BUCKETS; - if (1 || dev->objectBucket[bucket].count > 0) { - ylist_for_each(i, &dev->objectBucket[bucket].list) { - /* If there is already one in the list */ - if (i - && ylist_entry(i, yaffs_Object, - hashLink)->objectId == n) { - found = 0; - } + found = 1; + n += YAFFS_NOBJECT_BUCKETS; + if (1 || dev->objectBucket[bucket].count > 0) { + ylist_for_each(i, &dev->objectBucket[bucket].list) { + /* If there is already one in the list */ + if (i && ylist_entry(i, yaffs_Object, + hashLink)->objectId == n) { + found = 0; + } } } } - return n; } -static void yaffs_HashObject(yaffs_Object * in) +static void yaffs_HashObject(yaffs_Object *in) { - int bucket = yaffs_HashFunction(in->objectId); - yaffs_Device *dev = in->myDev; - - ylist_add(&in->hashLink, &dev->objectBucket[bucket].list); - dev->objectBucket[bucket].count++; + int bucket = yaffs_HashFunction(in->objectId); + yaffs_Device *dev = in->myDev; + ylist_add(&in->hashLink, &dev->objectBucket[bucket].list); + dev->objectBucket[bucket].count++; } -yaffs_Object *yaffs_FindObjectByNumber(yaffs_Device * dev, __u32 number) +yaffs_Object *yaffs_FindObjectByNumber(yaffs_Device *dev, __u32 number) { - int bucket = yaffs_HashFunction(number); - struct ylist_head *i; - yaffs_Object *in; + int bucket = yaffs_HashFunction(number); + struct ylist_head *i; + yaffs_Object *in; - ylist_for_each(i, &dev->objectBucket[bucket].list) { - /* Look if it is in the list */ - if (i) { - in = ylist_entry(i, yaffs_Object, hashLink); - if (in->objectId == number) { -#ifdef __KERNEL__ - /* Don't tell the VFS about this one if it is defered free */ + ylist_for_each(i, &dev->objectBucket[bucket].list) { + /* Look if it is in the list */ + if (i) { + in = ylist_entry(i, yaffs_Object, hashLink); + if (in->objectId == number) { + + /* Don't tell the VFS about this one if it is defered free */ if (in->deferedFree) return NULL; -#endif return in; } @@ -2174,30 +2308,28 @@ yaffs_Object *yaffs_FindObjectByNumber(yaffs_Device * dev, __u32 number) return NULL; } -yaffs_Object *yaffs_CreateNewObject(yaffs_Device * dev, int number, +yaffs_Object *yaffs_CreateNewObject(yaffs_Device *dev, int number, yaffs_ObjectType type) { - - yaffs_Object *theObject; + yaffs_Object *theObject=NULL; yaffs_Tnode *tn = NULL; - if (number < 0) { + if (number < 0) number = yaffs_CreateNewObjectNumber(dev); + + if (type == YAFFS_OBJECT_TYPE_FILE) { + tn = yaffs_GetTnode(dev); + if (!tn) + return NULL; } theObject = yaffs_AllocateEmptyObject(dev); - if(!theObject) + if (!theObject){ + if(tn) + yaffs_FreeTnode(dev,tn); return NULL; - - if(type == YAFFS_OBJECT_TYPE_FILE){ - tn = yaffs_GetTnode(dev); - if(!tn){ - yaffs_FreeObject(theObject); - return NULL; - } } - - + if (theObject) { theObject->fake = 0; @@ -2218,25 +2350,21 @@ yaffs_Object *yaffs_CreateNewObject(yaffs_Device * dev, int number, theObject->yst_atime = theObject->yst_mtime = theObject->yst_ctime = Y_CURRENT_TIME; #endif - -#if 0 - theObject->sum_prev = 12345; - theObject->sum_trailer = 6789; -#endif - switch (type) { case YAFFS_OBJECT_TYPE_FILE: theObject->variant.fileVariant.fileSize = 0; theObject->variant.fileVariant.scannedFileSize = 0; theObject->variant.fileVariant.shrinkSize = 0xFFFFFFFF; /* max __u32 */ theObject->variant.fileVariant.topLevel = 0; - theObject->variant.fileVariant.top = tn; - break; - case YAFFS_OBJECT_TYPE_DIRECTORY: - YINIT_LIST_HEAD(&theObject->variant.directoryVariant. - children); - break; - case YAFFS_OBJECT_TYPE_SYMLINK: + theObject->variant.fileVariant.top = tn; + break; + case YAFFS_OBJECT_TYPE_DIRECTORY: + YINIT_LIST_HEAD(&theObject->variant.directoryVariant. + children); + YINIT_LIST_HEAD(&theObject->variant.directoryVariant. + dirty); + break; + case YAFFS_OBJECT_TYPE_SYMLINK: case YAFFS_OBJECT_TYPE_HARDLINK: case YAFFS_OBJECT_TYPE_SPECIAL: /* No action required */ @@ -2250,35 +2378,37 @@ yaffs_Object *yaffs_CreateNewObject(yaffs_Device * dev, int number, return theObject; } -static yaffs_Object *yaffs_FindOrCreateObjectByNumber(yaffs_Device * dev, +static yaffs_Object *yaffs_FindOrCreateObjectByNumber(yaffs_Device *dev, int number, yaffs_ObjectType type) { yaffs_Object *theObject = NULL; - if (number > 0) { + if (number > 0) theObject = yaffs_FindObjectByNumber(dev, number); - } - if (!theObject) { + if (!theObject) theObject = yaffs_CreateNewObject(dev, number, type); - } return theObject; } - -static YCHAR *yaffs_CloneString(const YCHAR * str) + +static YCHAR *yaffs_CloneString(const YCHAR *str) { YCHAR *newStr = NULL; + int len; - if (str && *str) { - newStr = YMALLOC((yaffs_strlen(str) + 1) * sizeof(YCHAR)); - if(newStr) - yaffs_strcpy(newStr, str); - } + if (!str) + str = _Y(""); + len = yaffs_strnlen(str,YAFFS_MAX_ALIAS_LENGTH); + newStr = YMALLOC((len + 1) * sizeof(YCHAR)); + if (newStr){ + yaffs_strncpy(newStr, str,len); + newStr[len] = 0; + } return newStr; } @@ -2286,18 +2416,18 @@ static YCHAR *yaffs_CloneString(const YCHAR * str) /* * Mknod (create) a new object. * equivalentObject only has meaning for a hard link; - * aliasString only has meaning for a sumlink. + * aliasString only has meaning for a symlink. * rdev only has meaning for devices (a subset of special objects) */ - + static yaffs_Object *yaffs_MknodObject(yaffs_ObjectType type, - yaffs_Object * parent, - const YCHAR * name, + yaffs_Object *parent, + const YCHAR *name, __u32 mode, __u32 uid, __u32 gid, - yaffs_Object * equivalentObject, - const YCHAR * aliasString, __u32 rdev) + yaffs_Object *equivalentObject, + const YCHAR *aliasString, __u32 rdev) { yaffs_Object *in; YCHAR *str = NULL; @@ -2305,24 +2435,26 @@ static yaffs_Object *yaffs_MknodObject(yaffs_ObjectType type, yaffs_Device *dev = parent->myDev; /* Check if the entry exists. If it does then fail the call since we don't want a dup.*/ - if (yaffs_FindObjectByName(parent, name)) { + if (yaffs_FindObjectByName(parent, name)) return NULL; + + if (type == YAFFS_OBJECT_TYPE_SYMLINK) { + str = yaffs_CloneString(aliasString); + if (!str) + return NULL; } in = yaffs_CreateNewObject(dev, -1, type); - if(!in) - return YAFFS_FAIL; - - if(type == YAFFS_OBJECT_TYPE_SYMLINK){ - str = yaffs_CloneString(aliasString); - if(!str){ - yaffs_FreeObject(in); - return NULL; - } + if (!in){ + if(str) + YFREE(str); + return NULL; } - - + + + + if (in) { in->hdrChunk = 0; @@ -2358,13 +2490,13 @@ static yaffs_Object *yaffs_MknodObject(yaffs_ObjectType type, break; case YAFFS_OBJECT_TYPE_HARDLINK: in->variant.hardLinkVariant.equivalentObject = - equivalentObject; - in->variant.hardLinkVariant.equivalentObjectId = - equivalentObject->objectId; - ylist_add(&in->hardLinks, &equivalentObject->hardLinks); - break; - case YAFFS_OBJECT_TYPE_FILE: - case YAFFS_OBJECT_TYPE_DIRECTORY: + equivalentObject; + in->variant.hardLinkVariant.equivalentObjectId = + equivalentObject->objectId; + ylist_add(&in->hardLinks, &equivalentObject->hardLinks); + break; + case YAFFS_OBJECT_TYPE_FILE: + case YAFFS_OBJECT_TYPE_DIRECTORY: case YAFFS_OBJECT_TYPE_SPECIAL: case YAFFS_OBJECT_TYPE_UNKNOWN: /* do nothing */ @@ -2373,47 +2505,48 @@ static yaffs_Object *yaffs_MknodObject(yaffs_ObjectType type, if (yaffs_UpdateObjectHeader(in, name, 0, 0, 0) < 0) { /* Could not create the object header, fail the creation */ - yaffs_DestroyObject(in); + yaffs_DeleteObject(in); in = NULL; } + yaffs_UpdateParent(parent); } return in; } -yaffs_Object *yaffs_MknodFile(yaffs_Object * parent, const YCHAR * name, - __u32 mode, __u32 uid, __u32 gid) +yaffs_Object *yaffs_MknodFile(yaffs_Object *parent, const YCHAR *name, + __u32 mode, __u32 uid, __u32 gid) { return yaffs_MknodObject(YAFFS_OBJECT_TYPE_FILE, parent, name, mode, - uid, gid, NULL, NULL, 0); + uid, gid, NULL, NULL, 0); } -yaffs_Object *yaffs_MknodDirectory(yaffs_Object * parent, const YCHAR * name, - __u32 mode, __u32 uid, __u32 gid) +yaffs_Object *yaffs_MknodDirectory(yaffs_Object *parent, const YCHAR *name, + __u32 mode, __u32 uid, __u32 gid) { return yaffs_MknodObject(YAFFS_OBJECT_TYPE_DIRECTORY, parent, name, mode, uid, gid, NULL, NULL, 0); } -yaffs_Object *yaffs_MknodSpecial(yaffs_Object * parent, const YCHAR * name, - __u32 mode, __u32 uid, __u32 gid, __u32 rdev) +yaffs_Object *yaffs_MknodSpecial(yaffs_Object *parent, const YCHAR *name, + __u32 mode, __u32 uid, __u32 gid, __u32 rdev) { return yaffs_MknodObject(YAFFS_OBJECT_TYPE_SPECIAL, parent, name, mode, uid, gid, NULL, NULL, rdev); } -yaffs_Object *yaffs_MknodSymLink(yaffs_Object * parent, const YCHAR * name, - __u32 mode, __u32 uid, __u32 gid, - const YCHAR * alias) +yaffs_Object *yaffs_MknodSymLink(yaffs_Object *parent, const YCHAR *name, + __u32 mode, __u32 uid, __u32 gid, + const YCHAR *alias) { return yaffs_MknodObject(YAFFS_OBJECT_TYPE_SYMLINK, parent, name, mode, - uid, gid, NULL, alias, 0); + uid, gid, NULL, alias, 0); } /* yaffs_Link returns the object id of the equivalent object.*/ -yaffs_Object *yaffs_Link(yaffs_Object * parent, const YCHAR * name, - yaffs_Object * equivalentObject) +yaffs_Object *yaffs_Link(yaffs_Object *parent, const YCHAR *name, + yaffs_Object *equivalentObject) { /* Get the real object in case we were fed a hard link as an equivalent object */ equivalentObject = yaffs_GetEquivalentObject(equivalentObject); @@ -2428,17 +2561,16 @@ yaffs_Object *yaffs_Link(yaffs_Object * parent, const YCHAR * name, } -static int yaffs_ChangeObjectName(yaffs_Object * obj, yaffs_Object * newDir, - const YCHAR * newName, int force, int shadows) +static int yaffs_ChangeObjectName(yaffs_Object *obj, yaffs_Object *newDir, + const YCHAR *newName, int force, int shadows) { int unlinkOp; int deleteOp; yaffs_Object *existingTarget; - if (newDir == NULL) { + if (newDir == NULL) newDir = obj->parent; /* use the old directory */ - } if (newDir->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) { T(YAFFS_TRACE_ALWAYS, @@ -2447,22 +2579,21 @@ static int yaffs_ChangeObjectName(yaffs_Object * obj, yaffs_Object * newDir, TENDSTR))); YBUG(); } - + /* TODO: Do we need this different handling for YAFFS2 and YAFFS1?? */ - if (obj->myDev->isYaffs2) { + if (obj->myDev->param.isYaffs2) unlinkOp = (newDir == obj->myDev->unlinkedDir); - } else { + else unlinkOp = (newDir == obj->myDev->unlinkedDir && obj->variantType == YAFFS_OBJECT_TYPE_FILE); - } deleteOp = (newDir == obj->myDev->deletedDir); existingTarget = yaffs_FindObjectByName(newDir, newName); - /* If the object is a file going into the unlinked directory, + /* If the object is a file going into the unlinked directory, * then it is OK to just stuff it in since duplicate names are allowed. - * else only proceed if the new name does not exist and if we're putting + * else only proceed if the new name does not exist and if we're putting * it into a directory. */ if ((unlinkOp || @@ -2480,39 +2611,42 @@ static int yaffs_ChangeObjectName(yaffs_Object * obj, yaffs_Object * newDir, obj->unlinked = 1; /* If it is a deletion then we mark it as a shrink for gc purposes. */ - if (yaffs_UpdateObjectHeader(obj, newName, 0, deleteOp, shadows)>= 0) + if (yaffs_UpdateObjectHeader(obj, newName, 0, deleteOp, shadows) >= 0) return YAFFS_OK; } return YAFFS_FAIL; } -int yaffs_RenameObject(yaffs_Object * oldDir, const YCHAR * oldName, - yaffs_Object * newDir, const YCHAR * newName) +int yaffs_RenameObject(yaffs_Object *oldDir, const YCHAR *oldName, + yaffs_Object *newDir, const YCHAR *newName) { - yaffs_Object *obj=NULL; - yaffs_Object *existingTarget=NULL; + yaffs_Object *obj = NULL; + yaffs_Object *existingTarget = NULL; int force = 0; - - - if(!oldDir || oldDir->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) + int result; + yaffs_Device *dev; + + + if (!oldDir || oldDir->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) YBUG(); - if(!newDir || newDir->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) + if (!newDir || newDir->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) YBUG(); + dev = oldDir->myDev; + #ifdef CONFIG_YAFFS_CASE_INSENSITIVE /* Special case for case insemsitive systems (eg. WinCE). * While look-up is case insensitive, the name isn't. * Therefore we might want to change x.txt to X.txt */ - if (oldDir == newDir && yaffs_strcmp(oldName, newName) == 0) { + if (oldDir == newDir && yaffs_strcmp(oldName, newName) == 0) force = 1; - } #endif - else if (yaffs_strlen(newName) > YAFFS_MAX_NAME_LENGTH) - /* ENAMETOOLONG */ - return YAFFS_FAIL; + if(yaffs_strnlen(newName,YAFFS_MAX_NAME_LENGTH+1) > YAFFS_MAX_NAME_LENGTH) + /* ENAMETOOLONG */ + return YAFFS_FAIL; obj = yaffs_FindObjectByName(oldDir, oldName); @@ -2520,59 +2654,68 @@ int yaffs_RenameObject(yaffs_Object * oldDir, const YCHAR * oldName, /* Now do the handling for an existing target, if there is one */ - existingTarget = yaffs_FindObjectByName(newDir, newName); - if (existingTarget && - existingTarget->variantType == YAFFS_OBJECT_TYPE_DIRECTORY && - !ylist_empty(&existingTarget->variant.directoryVariant.children)) { - /* There is a target that is a non-empty directory, so we fail */ - return YAFFS_FAIL; /* EEXIST or ENOTEMPTY */ - } else if (existingTarget && existingTarget != obj) { - /* Nuke the target first, using shadowing, - * but only if it isn't the same object + existingTarget = yaffs_FindObjectByName(newDir, newName); + if (existingTarget && + existingTarget->variantType == YAFFS_OBJECT_TYPE_DIRECTORY && + !ylist_empty(&existingTarget->variant.directoryVariant.children)) { + /* There is a target that is a non-empty directory, so we fail */ + return YAFFS_FAIL; /* EEXIST or ENOTEMPTY */ + } else if (existingTarget && existingTarget != obj) { + /* Nuke the target first, using shadowing, + * but only if it isn't the same object. + * + * Note we must disable gc otherwise it can mess up the shadowing. + * */ + dev->isDoingGC=1; yaffs_ChangeObjectName(obj, newDir, newName, force, - existingTarget->objectId); + existingTarget->objectId); + existingTarget->isShadowed = 1; yaffs_UnlinkObject(existingTarget); + dev->isDoingGC=0; } - return yaffs_ChangeObjectName(obj, newDir, newName, 1, 0); + result = yaffs_ChangeObjectName(obj, newDir, newName, 1, 0); + + yaffs_UpdateParent(oldDir); + if(newDir != oldDir) + yaffs_UpdateParent(newDir); + + return result; } return YAFFS_FAIL; } /*------------------------- Block Management and Page Allocation ----------------*/ -static int yaffs_InitialiseBlocks(yaffs_Device * dev) +static int yaffs_InitialiseBlocks(yaffs_Device *dev) { int nBlocks = dev->internalEndBlock - dev->internalStartBlock + 1; - + dev->blockInfo = NULL; dev->chunkBits = NULL; - + dev->allocationBlock = -1; /* force it to get a new one */ /* If the first allocation strategy fails, thry the alternate one */ dev->blockInfo = YMALLOC(nBlocks * sizeof(yaffs_BlockInfo)); - if(!dev->blockInfo){ + if (!dev->blockInfo) { dev->blockInfo = YMALLOC_ALT(nBlocks * sizeof(yaffs_BlockInfo)); dev->blockInfoAlt = 1; - } - else + } else dev->blockInfoAlt = 0; - - if(dev->blockInfo){ - + + if (dev->blockInfo) { /* Set up dynamic blockinfo stuff. */ - dev->chunkBitmapStride = (dev->nChunksPerBlock + 7) / 8; /* round up bytes */ + dev->chunkBitmapStride = (dev->param.nChunksPerBlock + 7) / 8; /* round up bytes */ dev->chunkBits = YMALLOC(dev->chunkBitmapStride * nBlocks); - if(!dev->chunkBits){ + if (!dev->chunkBits) { dev->chunkBits = YMALLOC_ALT(dev->chunkBitmapStride * nBlocks); dev->chunkBitsAlt = 1; - } - else + } else dev->chunkBitsAlt = 0; } - + if (dev->blockInfo && dev->chunkBits) { memset(dev->blockInfo, 0, nBlocks * sizeof(yaffs_BlockInfo)); memset(dev->chunkBits, 0, dev->chunkBitmapStride * nBlocks); @@ -2580,104 +2723,144 @@ static int yaffs_InitialiseBlocks(yaffs_Device * dev) } return YAFFS_FAIL; - } -static void yaffs_DeinitialiseBlocks(yaffs_Device * dev) +static void yaffs_DeinitialiseBlocks(yaffs_Device *dev) { - if(dev->blockInfoAlt && dev->blockInfo) + if (dev->blockInfoAlt && dev->blockInfo) YFREE_ALT(dev->blockInfo); - else if(dev->blockInfo) + else if (dev->blockInfo) YFREE(dev->blockInfo); dev->blockInfoAlt = 0; dev->blockInfo = NULL; - - if(dev->chunkBitsAlt && dev->chunkBits) + + if (dev->chunkBitsAlt && dev->chunkBits) YFREE_ALT(dev->chunkBits); - else if(dev->chunkBits) + else if (dev->chunkBits) YFREE(dev->chunkBits); dev->chunkBitsAlt = 0; dev->chunkBits = NULL; } -static int yaffs_BlockNotDisqualifiedFromGC(yaffs_Device * dev, - yaffs_BlockInfo * bi) +static int yaffs_BlockNotDisqualifiedFromGC(yaffs_Device *dev, + yaffs_BlockInfo *bi) { - int i; - __u32 seq; - yaffs_BlockInfo *b; - if (!dev->isYaffs2) + if (!dev->param.isYaffs2) return 1; /* disqualification only applies to yaffs2. */ if (!bi->hasShrinkHeader) return 1; /* can gc */ - /* Find the oldest dirty sequence number if we don't know it and save it - * so we don't have to keep recomputing it. - */ - if (!dev->oldestDirtySequence) { - seq = dev->sequenceNumber; - - for (i = dev->internalStartBlock; i <= dev->internalEndBlock; - i++) { - b = yaffs_GetBlockInfo(dev, i); - if (b->blockState == YAFFS_BLOCK_STATE_FULL && - (b->pagesInUse - b->softDeletions) < - dev->nChunksPerBlock && b->sequenceNumber < seq) { - seq = b->sequenceNumber; - } - } - dev->oldestDirtySequence = seq; - } + yaffs_FindOldestDirtySequence(dev); /* Can't do gc of this block if there are any blocks older than this one that have * discarded pages. */ return (bi->sequenceNumber <= dev->oldestDirtySequence); +} + +/* + * yaffs_FindRefreshBlock() + * periodically finds the oldest full block by sequence number for refreshing. + * Only for yaffs2. + */ +static __u32 yaffs_FindRefreshBlock(yaffs_Device *dev) +{ + __u32 b ; + + __u32 oldest = 0; + __u32 oldestSequence = 0; + + yaffs_BlockInfo *bi; + + /* + * If refresh period < 10 then refreshing is disabled. + */ + if(dev->param.refreshPeriod < 10 || + !dev->param.isYaffs2) + return oldest; + + /* + * Fix broken values. + */ + if(dev->refreshSkip > dev->param.refreshPeriod) + dev->refreshSkip = dev->param.refreshPeriod; + + if(dev->refreshSkip > 0){ + dev->refreshSkip--; + return oldest; + } + + /* + * Refresh skip is now zero. + * We'll do a refresh this time around.... + * Update the refresh skip and find the oldest block. + */ + dev->refreshSkip = dev->param.refreshPeriod; + dev->refreshCount++; + bi = dev->blockInfo; + for (b = dev->internalStartBlock; b <=dev->internalEndBlock; b++){ + + if (bi->blockState == YAFFS_BLOCK_STATE_FULL){ + + if(oldest < 1 || + bi->sequenceNumber < oldestSequence){ + oldest = b; + oldestSequence = bi->sequenceNumber; + } + } + bi++; + } + + if (oldest > 0) { + T(YAFFS_TRACE_GC, + (TSTR("GC refresh count %d selected block %d with sequenceNumber %d" TENDSTR), + dev->refreshCount, oldest, oldestSequence)); + } + return oldest; } -/* FindDiretiestBlock is used to select the dirtiest block (or close enough) +/* + * FindDiretiestBlock is used to select the dirtiest block (or close enough) * for garbage collection. */ -static int yaffs_FindBlockForGarbageCollection(yaffs_Device * dev, - int aggressive) +static int yaffs_FindBlockForGarbageCollection(yaffs_Device *dev, + int aggressive) { - int b = dev->currentDirtyChecker; int i; int iterations; int dirtiest = -1; int pagesInUse = 0; - int prioritised=0; + int prioritised = 0; yaffs_BlockInfo *bi; int pendingPrioritisedExist = 0; - + /* First let's see if we need to grab a prioritised block */ - if(dev->hasPendingPrioritisedGCs){ - for(i = dev->internalStartBlock; i < dev->internalEndBlock && !prioritised; i++){ + if (dev->hasPendingPrioritisedGCs) { + bi = dev->blockInfo; + for (i = dev->internalStartBlock; i < dev->internalEndBlock && !prioritised; i++) { - bi = yaffs_GetBlockInfo(dev, i); - //yaffs_VerifyBlock(dev,bi,i); - - if(bi->gcPrioritise) { + if (bi->gcPrioritise) { pendingPrioritisedExist = 1; - if(bi->blockState == YAFFS_BLOCK_STATE_FULL && - yaffs_BlockNotDisqualifiedFromGC(dev, bi)){ + if (bi->blockState == YAFFS_BLOCK_STATE_FULL && + yaffs_BlockNotDisqualifiedFromGC(dev, bi)) { pagesInUse = (bi->pagesInUse - bi->softDeletions); dirtiest = i; prioritised = 1; aggressive = 1; /* Fool the non-aggressive skip logiv below */ } } + bi++; } - - if(!pendingPrioritisedExist) /* None found, so we can clear this */ + + if (!pendingPrioritisedExist) /* None found, so we can clear this */ dev->hasPendingPrioritisedGCs = 0; } @@ -2689,31 +2872,28 @@ static int yaffs_FindBlockForGarbageCollection(yaffs_Device * dev, dev->nonAggressiveSkip--; - if (!aggressive && (dev->nonAggressiveSkip > 0)) { + if (!aggressive && (dev->nonAggressiveSkip > 0)) return -1; - } - if(!prioritised) + if (!prioritised) pagesInUse = - (aggressive) ? dev->nChunksPerBlock : YAFFS_PASSIVE_GC_CHUNKS + 1; + (aggressive) ? dev->param.nChunksPerBlock : YAFFS_PASSIVE_GC_CHUNKS + 1; - if (aggressive) { + if (aggressive) iterations = dev->internalEndBlock - dev->internalStartBlock + 1; - } else { + else { iterations = dev->internalEndBlock - dev->internalStartBlock + 1; iterations = iterations / 16; - if (iterations > 200) { + if (iterations > 200) iterations = 200; - } } for (i = 0; i <= iterations && pagesInUse > 0 && !prioritised; i++) { b++; - if (b < dev->internalStartBlock || b > dev->internalEndBlock) { + if (b < dev->internalStartBlock || b > dev->internalEndBlock) b = dev->internalStartBlock; - } if (b < dev->internalStartBlock || b > dev->internalEndBlock) { T(YAFFS_TRACE_ERROR, @@ -2723,17 +2903,9 @@ static int yaffs_FindBlockForGarbageCollection(yaffs_Device * dev, bi = yaffs_GetBlockInfo(dev, b); -#if 0 - if (bi->blockState == YAFFS_BLOCK_STATE_CHECKPOINT) { - dirtiest = b; - pagesInUse = 0; - } - else -#endif - if (bi->blockState == YAFFS_BLOCK_STATE_FULL && - (bi->pagesInUse - bi->softDeletions) < pagesInUse && - yaffs_BlockNotDisqualifiedFromGC(dev, bi)) { + (bi->pagesInUse - bi->softDeletions) < pagesInUse && + yaffs_BlockNotDisqualifiedFromGC(dev, bi)) { dirtiest = b; pagesInUse = (bi->pagesInUse - bi->softDeletions); } @@ -2744,19 +2916,16 @@ static int yaffs_FindBlockForGarbageCollection(yaffs_Device * dev, if (dirtiest > 0) { T(YAFFS_TRACE_GC, (TSTR("GC Selected block %d with %d free, prioritised:%d" TENDSTR), dirtiest, - dev->nChunksPerBlock - pagesInUse,prioritised)); + dev->param.nChunksPerBlock - pagesInUse, prioritised)); } - dev->oldestDirtySequence = 0; - - if (dirtiest > 0) { + if (dirtiest > 0) dev->nonAggressiveSkip = 4; - } return dirtiest; } -static void yaffs_BlockBecameDirty(yaffs_Device * dev, int blockNo) +static void yaffs_BlockBecameDirty(yaffs_Device *dev, int blockNo) { yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, blockNo); @@ -2765,13 +2934,19 @@ static void yaffs_BlockBecameDirty(yaffs_Device * dev, int blockNo) /* If the block is still healthy erase it and mark as clean. * If the block has had a data failure, then retire it. */ - + T(YAFFS_TRACE_GC | YAFFS_TRACE_ERASE, (TSTR("yaffs_BlockBecameDirty block %d state %d %s"TENDSTR), blockNo, bi->blockState, (bi->needsRetiring) ? "needs retiring" : "")); - + + yaffs_ClearOldestDirtySequence(dev,bi); + bi->blockState = YAFFS_BLOCK_STATE_DIRTY; + /* If this is the block being garbage collected then stop gc'ing this block */ + if(blockNo == dev->gcBlock) + dev->gcBlock = -1; + if (!bi->needsRetiring) { yaffs_InvalidateCheckpoint(dev); erasedOk = yaffs_EraseBlockInNAND(dev, blockNo); @@ -2782,12 +2957,12 @@ static void yaffs_BlockBecameDirty(yaffs_Device * dev, int blockNo) } } - if (erasedOk && + if (erasedOk && ((yaffs_traceMask & YAFFS_TRACE_ERASE) || !yaffs_SkipVerification(dev))) { int i; - for (i = 0; i < dev->nChunksPerBlock; i++) { + for (i = 0; i < dev->param.nChunksPerBlock; i++) { if (!yaffs_CheckChunkErased - (dev, blockNo * dev->nChunksPerBlock + i)) { + (dev, blockNo * dev->param.nChunksPerBlock + i)) { T(YAFFS_TRACE_ERROR, (TSTR (">>Block %d erasure supposedly OK, but chunk %d not erased" @@ -2799,6 +2974,7 @@ static void yaffs_BlockBecameDirty(yaffs_Device * dev, int blockNo) if (erasedOk) { /* Clean it up... */ bi->blockState = YAFFS_BLOCK_STATE_EMPTY; + bi->sequenceNumber = 0; dev->nErasedBlocks++; bi->pagesInUse = 0; bi->softDeletions = 0; @@ -2810,7 +2986,7 @@ static void yaffs_BlockBecameDirty(yaffs_Device * dev, int blockNo) T(YAFFS_TRACE_ERASE, (TSTR("Erased block %d" TENDSTR), blockNo)); } else { - dev->nFreeChunks -= dev->nChunksPerBlock; /* We lost a block of free space */ + dev->nFreeChunks -= dev->param.nChunksPerBlock; /* We lost a block of free space */ yaffs_RetireBlock(dev, blockNo); T(YAFFS_TRACE_ERROR | YAFFS_TRACE_BAD_BLOCKS, @@ -2818,7 +2994,7 @@ static void yaffs_BlockBecameDirty(yaffs_Device * dev, int blockNo) } } -static int yaffs_FindBlockForAllocation(yaffs_Device * dev) +static int yaffs_FindBlockForAllocation(yaffs_Device *dev) { int i; @@ -2833,7 +3009,7 @@ static int yaffs_FindBlockForAllocation(yaffs_Device * dev) return -1; } - + /* Find an empty block. */ for (i = dev->internalStartBlock; i <= dev->internalEndBlock; i++) { @@ -2870,19 +3046,14 @@ static int yaffs_FindBlockForAllocation(yaffs_Device * dev) static int yaffs_CalcCheckpointBlocksRequired(yaffs_Device *dev) { - if(!dev->nCheckpointBlocksRequired && - dev->isYaffs2){ + if (!dev->nCheckpointBlocksRequired && + dev->param.isYaffs2) { /* Not a valid value so recalculate */ int nBytes = 0; int nBlocks; - int devBlocks = (dev->endBlock - dev->startBlock + 1); - int tnodeSize; + int devBlocks = (dev->param.endBlock - dev->param.startBlock + 1); + int tnodeSize = yaffs_CalcTnodeSize(dev); - tnodeSize = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8; - - if(tnodeSize < sizeof(yaffs_Tnode)) - tnodeSize = sizeof(yaffs_Tnode); - nBytes += sizeof(yaffs_CheckpointValidity); nBytes += sizeof(yaffs_CheckpointDevice); nBytes += devBlocks * sizeof(yaffs_BlockInfo); @@ -2891,40 +3062,43 @@ static int yaffs_CalcCheckpointBlocksRequired(yaffs_Device *dev) nBytes += (tnodeSize + sizeof(__u32)) * (dev->nTnodesCreated - dev->nFreeTnodes); nBytes += sizeof(yaffs_CheckpointValidity); nBytes += sizeof(__u32); /* checksum*/ - + /* Round up and add 2 blocks to allow for some bad blocks, so add 3 */ - - nBlocks = (nBytes/(dev->nDataBytesPerChunk * dev->nChunksPerBlock)) + 3; - + + nBlocks = (nBytes/(dev->nDataBytesPerChunk * dev->param.nChunksPerBlock)) + 3; + dev->nCheckpointBlocksRequired = nBlocks; } return dev->nCheckpointBlocksRequired; } -// Check if there's space to allocate... -// Thinks.... do we need top make this ths same as yaffs_GetFreeChunks()? -static int yaffs_CheckSpaceForAllocation(yaffs_Device * dev) +/* + * Check if there's space to allocate... + * Thinks.... do we need top make this ths same as yaffs_GetFreeChunks()? + */ +static int yaffs_CheckSpaceForAllocation(yaffs_Device *dev, int nChunks) { int reservedChunks; - int reservedBlocks = dev->nReservedBlocks; + int reservedBlocks = dev->param.nReservedBlocks; int checkpointBlocks; - - if(dev->isYaffs2){ - checkpointBlocks = yaffs_CalcCheckpointBlocksRequired(dev) - + + if (dev->param.isYaffs2) { + checkpointBlocks = yaffs_CalcCheckpointBlocksRequired(dev) - dev->blocksInCheckpoint; - if(checkpointBlocks < 0) + if (checkpointBlocks < 0) checkpointBlocks = 0; } else { - checkpointBlocks =0; + checkpointBlocks = 0; } - - reservedChunks = ((reservedBlocks + checkpointBlocks) * dev->nChunksPerBlock); - - return (dev->nFreeChunks > reservedChunks); + + reservedChunks = ((reservedBlocks + checkpointBlocks) * dev->param.nChunksPerBlock); + + return (dev->nFreeChunks > (reservedChunks + nChunks)); } -static int yaffs_AllocateChunk(yaffs_Device * dev, int useReserve, yaffs_BlockInfo **blockUsedPtr) +static int yaffs_AllocateChunk(yaffs_Device *dev, int useReserve, + yaffs_BlockInfo **blockUsedPtr) { int retVal; yaffs_BlockInfo *bi; @@ -2935,13 +3109,13 @@ static int yaffs_AllocateChunk(yaffs_Device * dev, int useReserve, yaffs_BlockIn dev->allocationPage = 0; } - if (!useReserve && !yaffs_CheckSpaceForAllocation(dev)) { + if (!useReserve && !yaffs_CheckSpaceForAllocation(dev, 1)) { /* Not enough space to allocate unless we're allowed to use the reserve. */ return -1; } - if (dev->nErasedBlocks < dev->nReservedBlocks - && dev->allocationPage == 0) { + if (dev->nErasedBlocks < dev->param.nReservedBlocks + && dev->allocationPage == 0) { T(YAFFS_TRACE_ALLOCATE, (TSTR("Allocating reserve" TENDSTR))); } @@ -2949,49 +3123,65 @@ static int yaffs_AllocateChunk(yaffs_Device * dev, int useReserve, yaffs_BlockIn if (dev->allocationBlock >= 0) { bi = yaffs_GetBlockInfo(dev, dev->allocationBlock); - retVal = (dev->allocationBlock * dev->nChunksPerBlock) + - dev->allocationPage; + retVal = (dev->allocationBlock * dev->param.nChunksPerBlock) + + dev->allocationPage; bi->pagesInUse++; yaffs_SetChunkBit(dev, dev->allocationBlock, - dev->allocationPage); + dev->allocationPage); dev->allocationPage++; dev->nFreeChunks--; /* If the block is full set the state to full */ - if (dev->allocationPage >= dev->nChunksPerBlock) { + if (dev->allocationPage >= dev->param.nChunksPerBlock) { bi->blockState = YAFFS_BLOCK_STATE_FULL; dev->allocationBlock = -1; } - if(blockUsedPtr) + if (blockUsedPtr) *blockUsedPtr = bi; - + return retVal; } - + T(YAFFS_TRACE_ERROR, - (TSTR("!!!!!!!!! Allocator out !!!!!!!!!!!!!!!!!" TENDSTR))); + (TSTR("!!!!!!!!! Allocator out !!!!!!!!!!!!!!!!!" TENDSTR))); return -1; } -static int yaffs_GetErasedChunks(yaffs_Device * dev) +static int yaffs_GetErasedChunks(yaffs_Device *dev) { int n; - n = dev->nErasedBlocks * dev->nChunksPerBlock; + n = dev->nErasedBlocks * dev->param.nChunksPerBlock; - if (dev->allocationBlock > 0) { - n += (dev->nChunksPerBlock - dev->allocationPage); - } + if (dev->allocationBlock > 0) + n += (dev->param.nChunksPerBlock - dev->allocationPage); return n; } -static int yaffs_GarbageCollectBlock(yaffs_Device * dev, int block, int wholeBlock) +/* + * yaffs_SkipRestOfBlock() skips over the rest of the allocation block + * if we don't want to write to it. + */ +static void yaffs_SkipRestOfBlock(yaffs_Device *dev) +{ + if(dev->allocationBlock > 0){ + yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, dev->allocationBlock); + if(bi->blockState == YAFFS_BLOCK_STATE_ALLOCATING){ + bi->blockState = YAFFS_BLOCK_STATE_FULL; + dev->allocationBlock = -1; + } + } +} + + +static int yaffs_GarbageCollectBlock(yaffs_Device *dev, int block, + int wholeBlock) { int oldChunk; int newChunk; @@ -3013,53 +3203,50 @@ static int yaffs_GarbageCollectBlock(yaffs_Device * dev, int block, int wholeBlo yaffs_Object *object; isCheckpointBlock = (bi->blockState == YAFFS_BLOCK_STATE_CHECKPOINT); - - bi->blockState = YAFFS_BLOCK_STATE_COLLECTING; + T(YAFFS_TRACE_TRACING, - (TSTR("Collecting block %d, in use %d, shrink %d, wholeBlock %d" TENDSTR), - block, - bi->pagesInUse, - bi->hasShrinkHeader, - wholeBlock)); + (TSTR("Collecting block %d, in use %d, shrink %d, wholeBlock %d" TENDSTR), + block, + bi->pagesInUse, + bi->hasShrinkHeader, + wholeBlock)); /*yaffs_VerifyFreeChunks(dev); */ + if(bi->blockState == YAFFS_BLOCK_STATE_FULL) + bi->blockState = YAFFS_BLOCK_STATE_COLLECTING; + bi->hasShrinkHeader = 0; /* clear the flag so that the block can erase */ - /* Take off the number of soft deleted entries because - * they're going to get really deleted during GC. - */ - dev->nFreeChunks -= bi->softDeletions; - dev->isDoingGC = 1; if (isCheckpointBlock || - !yaffs_StillSomeChunkBits(dev, block)) { + !yaffs_StillSomeChunkBits(dev, block)) { T(YAFFS_TRACE_TRACING, - (TSTR - ("Collecting block %d that has no chunks in use" TENDSTR), - block)); + (TSTR + ("Collecting block %d that has no chunks in use" TENDSTR), + block)); yaffs_BlockBecameDirty(dev, block); } else { __u8 *buffer = yaffs_GetTempBuffer(dev, __LINE__); - - yaffs_VerifyBlock(dev,bi,block); - maxCopies = (wholeBlock) ? dev->nChunksPerBlock : 10; - oldChunk = block * dev->nChunksPerBlock + dev->gcChunk; - - for ( /* init already done */; + yaffs_VerifyBlock(dev, bi, block); + + maxCopies = (wholeBlock) ? dev->param.nChunksPerBlock : 10; + oldChunk = block * dev->param.nChunksPerBlock + dev->gcChunk; + + for (/* init already done */; retVal == YAFFS_OK && - dev->gcChunk < dev->nChunksPerBlock && - (bi->blockState == YAFFS_BLOCK_STATE_COLLECTING)&& + dev->gcChunk < dev->param.nChunksPerBlock && + (bi->blockState == YAFFS_BLOCK_STATE_COLLECTING) && maxCopies > 0; dev->gcChunk++, oldChunk++) { if (yaffs_CheckChunkBit(dev, block, dev->gcChunk)) { /* This page is in use and might need to be copied off */ - + maxCopies--; markNAND = 1; @@ -3078,20 +3265,20 @@ static int yaffs_GarbageCollectBlock(yaffs_Device * dev, int block, int wholeBlo ("Collecting chunk in block %d, %d %d %d " TENDSTR), dev->gcChunk, tags.objectId, tags.chunkId, tags.byteCount)); - - if(object && !yaffs_SkipVerification(dev)){ - if(tags.chunkId == 0) + + if (object && !yaffs_SkipVerification(dev)) { + if (tags.chunkId == 0) matchingChunk = object->hdrChunk; - else if(object->softDeleted) + else if (object->softDeleted) matchingChunk = oldChunk; /* Defeat the test */ else - matchingChunk = yaffs_FindChunkInFile(object,tags.chunkId,NULL); - - if(oldChunk != matchingChunk) + matchingChunk = yaffs_FindChunkInFile(object, tags.chunkId, NULL); + + if (oldChunk != matchingChunk) T(YAFFS_TRACE_ERROR, (TSTR("gc: page in gc mismatch: %d %d %d %d"TENDSTR), - oldChunk,matchingChunk,tags.objectId, tags.chunkId)); - + oldChunk, matchingChunk, tags.objectId, tags.chunkId)); + } if (!object) { @@ -3102,15 +3289,22 @@ static int yaffs_GarbageCollectBlock(yaffs_Device * dev, int block, int wholeBlo tags.objectId, tags.chunkId, tags.byteCount)); } - if (object && + if (object && object->deleted && object->softDeleted && tags.chunkId != 0) { /* Data chunk in a soft deleted file, throw it away * It's a soft deleted data chunk, - * No need to copy this, just forget about it and + * No need to copy this, just forget about it and * fix up the object. */ + + /* Free chunks already includes softdeleted chunks. + * How ever this chunk is going to soon be really deleted + * which will increment free chunks. + * We have to decrement free chunks so this works out properly. + */ + dev->nFreeChunks--; object->nDataChunks--; @@ -3121,9 +3315,8 @@ static int yaffs_GarbageCollectBlock(yaffs_Device * dev, int block, int wholeBlo cleanups++; } markNAND = 0; - } else if (0 - /* Todo object && object->deleted && object->nDataChunks == 0 */ - ) { + } else if (0) { + /* Todo object && object->deleted && object->nDataChunks == 0 */ /* Deleted object header with no data chunks. * Can be discarded and the file deleted. */ @@ -3147,22 +3340,33 @@ static int yaffs_GarbageCollectBlock(yaffs_Device * dev, int block, int wholeBlo if (tags.chunkId == 0) { /* It is an object Id, * We need to nuke the shrinkheader flags first + * Also need to clean up shadowing. * We no longer want the shrinkHeader flag since its work is done * and if it is left in place it will mess up scanning. - * Also, clear out any shadowing stuff */ yaffs_ObjectHeader *oh; oh = (yaffs_ObjectHeader *)buffer; + oh->isShrink = 0; - tags.extraShadows = 0; tags.extraIsShrinkHeader = 0; - - yaffs_VerifyObjectHeader(object,oh,&tags,1); - } - newChunk = - yaffs_WriteNewChunkWithTagsToNAND(dev, buffer, &tags, 1); + oh->shadowsObject = 0; + oh->inbandShadowsObject = 0; + tags.extraShadows = 0; + + /* Update file size */ + if(object->variantType == YAFFS_OBJECT_TYPE_FILE){ + oh->fileSize = object->variant.fileVariant.fileSize; + tags.extraFileLength = oh->fileSize; + } + + yaffs_VerifyObjectHeader(object, oh, &tags, 1); + newChunk = + yaffs_WriteNewChunkWithTagsToNAND(dev,(__u8 *) oh, &tags, 1); + } else + newChunk = + yaffs_WriteNewChunkWithTagsToNAND(dev, buffer, &tags, 1); if (newChunk < 0) { retVal = YAFFS_FAIL; @@ -3176,7 +3380,8 @@ static int yaffs_GarbageCollectBlock(yaffs_Device * dev, int block, int wholeBlo object->serial = tags.serialNumber; } else { /* It's a data chunk */ - yaffs_PutChunkIntoFile + int ok; + ok = yaffs_PutChunkIntoFile (object, tags.chunkId, newChunk, 0); @@ -3184,14 +3389,13 @@ static int yaffs_GarbageCollectBlock(yaffs_Device * dev, int block, int wholeBlo } } - if(retVal == YAFFS_OK) + if (retVal == YAFFS_OK) yaffs_DeleteChunk(dev, oldChunk, markNAND, __LINE__); } } yaffs_ReleaseTempBuffer(dev, buffer, __LINE__); - /* Do any required cleanups */ @@ -3217,21 +3421,29 @@ static int yaffs_GarbageCollectBlock(yaffs_Device * dev, int block, int wholeBlo } - yaffs_VerifyCollectedBlock(dev,bi,block); - - if (chunksBefore >= (chunksAfter = yaffs_GetErasedChunks(dev))) { - T(YAFFS_TRACE_GC, - (TSTR - ("gc did not increase free chunks before %d after %d" - TENDSTR), chunksBefore, chunksAfter)); - } + yaffs_VerifyCollectedBlock(dev, bi, block); + - /* If the gc completed then clear the current gcBlock so that we find another. */ - if(bi->blockState != YAFFS_BLOCK_STATE_COLLECTING){ + + if (bi->blockState == YAFFS_BLOCK_STATE_COLLECTING) { + /* + * The gc did not complete. Set block state back to FULL + * because checkpointing does not restore gc. + */ + bi->blockState = YAFFS_BLOCK_STATE_FULL; + } else { + /* The gc completed. */ + chunksAfter = yaffs_GetErasedChunks(dev); + if (chunksBefore >= chunksAfter) { + T(YAFFS_TRACE_GC, + (TSTR + ("gc did not increase free chunks before %d after %d" + TENDSTR), chunksBefore, chunksAfter)); + } dev->gcBlock = -1; dev->gcChunk = 0; } - + dev->isDoingGC = 0; return retVal; @@ -3246,67 +3458,74 @@ static int yaffs_GarbageCollectBlock(yaffs_Device * dev, int block, int wholeBlo * The idea is to help clear out space in a more spread-out manner. * Dunno if it really does anything useful. */ -static int yaffs_CheckGarbageCollection(yaffs_Device * dev) +static int yaffs_CheckGarbageCollection(yaffs_Device *dev) { int block; int aggressive; int gcOk = YAFFS_OK; int maxTries = 0; - + int checkpointBlockAdjust; + if(dev->param.gcControl && + (dev->param.gcControl(dev) & 1) == 0) + return YAFFS_OK; + if (dev->isDoingGC) { /* Bail out so we don't get recursive gc */ return YAFFS_OK; } - + /* This loop should pass the first time. * We'll only see looping here if the erase of the collected block fails. */ do { maxTries++; - + checkpointBlockAdjust = yaffs_CalcCheckpointBlocksRequired(dev) - dev->blocksInCheckpoint; - if(checkpointBlockAdjust < 0) + if (checkpointBlockAdjust < 0) checkpointBlockAdjust = 0; - if (dev->nErasedBlocks < (dev->nReservedBlocks + checkpointBlockAdjust + 2)) { - /* We need a block soon...*/ + /* If we need a block soon then do aggressive gc.*/ + if (dev->nErasedBlocks < (dev->param.nReservedBlocks + checkpointBlockAdjust + 2)) aggressive = 1; - } else { - /* We're in no hurry */ + else aggressive = 0; - } - if(dev->gcBlock <= 0){ + /* If we don't already have a block being gc'd then see if we should start another */ + + if (dev->gcBlock < 1 && !aggressive) { + dev->gcBlock = yaffs_FindRefreshBlock(dev); + dev->gcChunk = 0; + } + if (dev->gcBlock < 1) { dev->gcBlock = yaffs_FindBlockForGarbageCollection(dev, aggressive); dev->gcChunk = 0; } - + block = dev->gcBlock; if (block > 0) { dev->garbageCollections++; - if (!aggressive) { + if (!aggressive) dev->passiveGarbageCollections++; - } T(YAFFS_TRACE_GC, (TSTR ("yaffs: GC erasedBlocks %d aggressive %d" TENDSTR), dev->nErasedBlocks, aggressive)); - gcOk = yaffs_GarbageCollectBlock(dev,block,aggressive); + gcOk = yaffs_GarbageCollectBlock(dev, block, aggressive); } - if (dev->nErasedBlocks < (dev->nReservedBlocks) && block > 0) { + if (dev->nErasedBlocks < (dev->param.nReservedBlocks) && block > 0) { T(YAFFS_TRACE_GC, (TSTR ("yaffs: GC !!!no reclaim!!! erasedBlocks %d after try %d block %d" TENDSTR), dev->nErasedBlocks, maxTries, block)); } - } while ((dev->nErasedBlocks < dev->nReservedBlocks) && + } while ((dev->nErasedBlocks < dev->param.nReservedBlocks) && (block > 0) && (maxTries < 2)); @@ -3315,7 +3534,7 @@ static int yaffs_CheckGarbageCollection(yaffs_Device * dev) /*------------------------- TAGS --------------------------------*/ -static int yaffs_TagsMatch(const yaffs_ExtendedTags * tags, int objectId, +static int yaffs_TagsMatch(const yaffs_ExtendedTags *tags, int objectId, int chunkInObject) { return (tags->chunkId == chunkInObject && @@ -3326,8 +3545,8 @@ static int yaffs_TagsMatch(const yaffs_ExtendedTags * tags, int objectId, /*-------------------- Data file manipulation -----------------*/ -static int yaffs_FindChunkInFile(yaffs_Object * in, int chunkInInode, - yaffs_ExtendedTags * tags) +static int yaffs_FindChunkInFile(yaffs_Object *in, int chunkInInode, + yaffs_ExtendedTags *tags) { /*Get the Tnode, then get the level 0 offset chunk offset */ yaffs_Tnode *tn; @@ -3345,7 +3564,7 @@ static int yaffs_FindChunkInFile(yaffs_Object * in, int chunkInInode, tn = yaffs_FindLevel0Tnode(dev, &in->variant.fileVariant, chunkInInode); if (tn) { - theChunk = yaffs_GetChunkGroupBase(dev,tn,chunkInInode); + theChunk = yaffs_GetChunkGroupBase(dev, tn, chunkInInode); retVal = yaffs_FindChunkInGroup(dev, theChunk, tags, in->objectId, @@ -3354,8 +3573,8 @@ static int yaffs_FindChunkInFile(yaffs_Object * in, int chunkInInode, return retVal; } -static int yaffs_FindAndDeleteChunkInFile(yaffs_Object * in, int chunkInInode, - yaffs_ExtendedTags * tags) +static int yaffs_FindAndDeleteChunkInFile(yaffs_Object *in, int chunkInInode, + yaffs_ExtendedTags *tags) { /* Get the Tnode, then get the level 0 offset chunk offset */ yaffs_Tnode *tn; @@ -3374,29 +3593,23 @@ static int yaffs_FindAndDeleteChunkInFile(yaffs_Object * in, int chunkInInode, if (tn) { - theChunk = yaffs_GetChunkGroupBase(dev,tn,chunkInInode); + theChunk = yaffs_GetChunkGroupBase(dev, tn, chunkInInode); retVal = yaffs_FindChunkInGroup(dev, theChunk, tags, in->objectId, chunkInInode); /* Delete the entry in the filestructure (if found) */ - if (retVal != -1) { - yaffs_PutLevel0Tnode(dev,tn,chunkInInode,0); - } - } else { - /*T(("No level 0 found for %d\n", chunkInInode)); */ + if (retVal != -1) + yaffs_LoadLevel0Tnode(dev, tn, chunkInInode, 0); } - if (retVal == -1) { - /* T(("Could not find %d to delete\n",chunkInInode)); */ - } return retVal; } #ifdef YAFFS_PARANOID -static int yaffs_CheckFileSanity(yaffs_Object * in) +static int yaffs_CheckFileSanity(yaffs_Object *in) { int chunk; int nChunks; @@ -3409,10 +3622,8 @@ static int yaffs_CheckFileSanity(yaffs_Object * in) int theChunk; int chunkDeleted; - if (in->variantType != YAFFS_OBJECT_TYPE_FILE) { - /* T(("Object not a file\n")); */ + if (in->variantType != YAFFS_OBJECT_TYPE_FILE) return YAFFS_FAIL; - } objId = in->objectId; fSize = in->variant.fileVariant.fileSize; @@ -3425,11 +3636,11 @@ static int yaffs_CheckFileSanity(yaffs_Object * in) if (tn) { - theChunk = yaffs_GetChunkGroupBase(dev,tn,chunk); + theChunk = yaffs_GetChunkGroupBase(dev, tn, chunk); if (yaffs_CheckChunkBits - (dev, theChunk / dev->nChunksPerBlock, - theChunk % dev->nChunksPerBlock)) { + (dev, theChunk / dev->param.nChunksPerBlock, + theChunk % dev->param.nChunksPerBlock)) { yaffs_ReadChunkTagsFromNAND(in->myDev, theChunk, tags, @@ -3454,14 +3665,16 @@ static int yaffs_CheckFileSanity(yaffs_Object * in) #endif -static int yaffs_PutChunkIntoFile(yaffs_Object * in, int chunkInInode, +static int yaffs_PutChunkIntoFile(yaffs_Object *in, int chunkInInode, int chunkInNAND, int inScan) { - /* NB inScan is zero unless scanning. - * For forward scanning, inScan is > 0; + /* NB inScan is zero unless scanning. + * For forward scanning, inScan is > 0; * for backward scanning inScan is < 0 + * + * chunkInNAND = 0 is a dummy insert to make sure the tnodes are there. */ - + yaffs_Tnode *tn; yaffs_Device *dev = in->myDev; int existingChunk; @@ -3485,19 +3698,22 @@ static int yaffs_PutChunkIntoFile(yaffs_Object * in, int chunkInInode, return YAFFS_OK; } - tn = yaffs_AddOrFindLevel0Tnode(dev, + tn = yaffs_AddOrFindLevel0Tnode(dev, &in->variant.fileVariant, chunkInInode, NULL); - if (!tn) { + if (!tn) return YAFFS_FAIL; - } + + if(!chunkInNAND) + /* Dummy insert, bail now */ + return YAFFS_OK; - existingChunk = yaffs_GetChunkGroupBase(dev,tn,chunkInInode); + existingChunk = yaffs_GetChunkGroupBase(dev, tn, chunkInInode); if (inScan != 0) { /* If we're scanning then we need to test for duplicates - * NB This does not need to be efficient since it should only ever + * NB This does not need to be efficient since it should only ever * happen when the power fails during a write, then only one * chunk should ever be affected. * @@ -3538,20 +3754,20 @@ static int yaffs_PutChunkIntoFile(yaffs_Object * in, int chunkInInode, } - /* NB The deleted flags should be false, otherwise the chunks will + /* NB The deleted flags should be false, otherwise the chunks will * not be loaded during a scan */ - if(inScan > 0) { + if (inScan > 0) { newSerial = newTags.serialNumber; existingSerial = existingTags.serialNumber; } if ((inScan > 0) && - (in->myDev->isYaffs2 || + (in->myDev->param.isYaffs2 || existingChunk <= 0 || ((existingSerial + 1) & 3) == newSerial)) { - /* Forward scanning. + /* Forward scanning. * Use new * Delete the old one and drop through to update the tnode */ @@ -3570,35 +3786,34 @@ static int yaffs_PutChunkIntoFile(yaffs_Object * in, int chunkInInode, } - if (existingChunk == 0) { + if (existingChunk == 0) in->nDataChunks++; - } - yaffs_PutLevel0Tnode(dev,tn,chunkInInode,chunkInNAND); + yaffs_LoadLevel0Tnode(dev, tn, chunkInInode, chunkInNAND); return YAFFS_OK; } -static int yaffs_ReadChunkDataFromObject(yaffs_Object * in, int chunkInInode, - __u8 * buffer) +static int yaffs_ReadChunkDataFromObject(yaffs_Object *in, int chunkInInode, + __u8 *buffer) { int chunkInNAND = yaffs_FindChunkInFile(in, chunkInInode, NULL); - if (chunkInNAND >= 0) { + if (chunkInNAND >= 0) return yaffs_ReadChunkWithTagsFromNAND(in->myDev, chunkInNAND, - buffer,NULL); - } else { + buffer, NULL); + else { T(YAFFS_TRACE_NANDACCESS, (TSTR("Chunk %d not found zero instead" TENDSTR), chunkInNAND)); /* get sane (zero) data if you read a hole */ - memset(buffer, 0, in->myDev->nDataBytesPerChunk); + memset(buffer, 0, in->myDev->nDataBytesPerChunk); return 0; } } -void yaffs_DeleteChunk(yaffs_Device * dev, int chunkId, int markNAND, int lyn) +void yaffs_DeleteChunk(yaffs_Device *dev, int chunkId, int markNAND, int lyn) { int block; int page; @@ -3607,25 +3822,26 @@ void yaffs_DeleteChunk(yaffs_Device * dev, int chunkId, int markNAND, int lyn) if (chunkId <= 0) return; - dev->nDeletions++; - block = chunkId / dev->nChunksPerBlock; - page = chunkId % dev->nChunksPerBlock; + block = chunkId / dev->param.nChunksPerBlock; + page = chunkId % dev->param.nChunksPerBlock; - if(!yaffs_CheckChunkBit(dev,block,page)) + if (!yaffs_CheckChunkBit(dev, block, page)) T(YAFFS_TRACE_VERIFY, - (TSTR("Deleting invalid chunk %d"TENDSTR), - chunkId)); + (TSTR("Deleting invalid chunk %d"TENDSTR), + chunkId)); bi = yaffs_GetBlockInfo(dev, block); + + yaffs_UpdateOldestDirtySequence(dev,bi); T(YAFFS_TRACE_DELETION, (TSTR("line %d delete of chunk %d" TENDSTR), lyn, chunkId)); if (markNAND && - bi->blockState != YAFFS_BLOCK_STATE_COLLECTING && !dev->isYaffs2) { + bi->blockState != YAFFS_BLOCK_STATE_COLLECTING && !dev->param.isYaffs2) { yaffs_InitialiseTags(&tags); @@ -3657,14 +3873,12 @@ void yaffs_DeleteChunk(yaffs_Device * dev, int chunkId, int markNAND, int lyn) yaffs_BlockBecameDirty(dev, block); } - } else { - /* T(("Bad news deleting chunk %d\n",chunkId)); */ } } -static int yaffs_WriteChunkDataToObject(yaffs_Object * in, int chunkInInode, - const __u8 * buffer, int nBytes, +static int yaffs_WriteChunkDataToObject(yaffs_Object *in, int chunkInInode, + const __u8 *buffer, int nBytes, int useReserve) { /* Find old chunk Need to do this to get serial number @@ -3682,8 +3896,14 @@ static int yaffs_WriteChunkDataToObject(yaffs_Object * in, int chunkInInode, yaffs_CheckGarbageCollection(dev); - /* Get the previous chunk at this location in the file if it exists */ + /* Get the previous chunk at this location in the file if it exists. + * If it does not exist then put a zero into the tree. This creates + * the tnode now, rather than later when it is harder to clean up. + */ prevChunkId = yaffs_FindChunkInFile(in, chunkInInode, &prevTags); + if(prevChunkId < 1 && + !yaffs_PutChunkIntoFile(in, chunkInInode, 0, 0)) + return 0; /* Set up new tags */ yaffs_InitialiseTags(&newTags); @@ -3691,29 +3911,26 @@ static int yaffs_WriteChunkDataToObject(yaffs_Object * in, int chunkInInode, newTags.chunkId = chunkInInode; newTags.objectId = in->objectId; newTags.serialNumber = - (prevChunkId >= 0) ? prevTags.serialNumber + 1 : 1; + (prevChunkId > 0) ? prevTags.serialNumber + 1 : 1; newTags.byteCount = nBytes; - - if(nBytes < 1 || nBytes > dev->totalBytesPerChunk){ - T(YAFFS_TRACE_ERROR, - (TSTR("Writing %d bytes to chunk!!!!!!!!!" TENDSTR), nBytes)); - while(1){} - } - - + if (nBytes < 1 || nBytes > dev->param.totalBytesPerChunk) { + T(YAFFS_TRACE_ERROR, + (TSTR("Writing %d bytes to chunk!!!!!!!!!" TENDSTR), nBytes)); + YBUG(); + } + + newChunkId = yaffs_WriteNewChunkWithTagsToNAND(dev, buffer, &newTags, useReserve); - if (newChunkId >= 0) { + if (newChunkId > 0) { yaffs_PutChunkIntoFile(in, chunkInInode, newChunkId, 0); - if (prevChunkId >= 0) { + if (prevChunkId > 0) yaffs_DeleteChunk(dev, prevChunkId, 1, __LINE__); - } - yaffs_CheckFileSanity(in); } return newChunkId; @@ -3723,7 +3940,7 @@ static int yaffs_WriteChunkDataToObject(yaffs_Object * in, int chunkInInode, /* UpdateObjectHeader updates the header on NAND for an object. * If name is not NULL, then that new name is used. */ -int yaffs_UpdateObjectHeader(yaffs_Object * in, const YCHAR * name, int force, +int yaffs_UpdateObjectHeader(yaffs_Object *in, const YCHAR *name, int force, int isShrink, int shadows) { @@ -3738,18 +3955,19 @@ int yaffs_UpdateObjectHeader(yaffs_Object * in, const YCHAR * name, int force, int newChunkId; yaffs_ExtendedTags newTags; yaffs_ExtendedTags oldTags; + YCHAR *alias = NULL; __u8 *buffer = NULL; YCHAR oldName[YAFFS_MAX_NAME_LENGTH + 1]; - yaffs_ObjectHeader *oh = NULL; - - yaffs_strcpy(oldName,_Y("silly old name")); + yaffs_ObjectHeader *oh = NULL; + + yaffs_strcpy(oldName, _Y("silly old name")); - if (!in->fake || - in == dev->rootDir || /* The rootDir should also be saved */ - force) { + if (!in->fake || + in == dev->rootDir || /* The rootDir should also be saved */ + force) { yaffs_CheckGarbageCollection(dev); yaffs_CheckObjectDetailsLoaded(in); @@ -3762,9 +3980,9 @@ int yaffs_UpdateObjectHeader(yaffs_Object * in, const YCHAR * name, int force, if (prevChunkId > 0) { result = yaffs_ReadChunkWithTagsFromNAND(dev, prevChunkId, buffer, &oldTags); - - yaffs_VerifyObjectHeader(in,oh,&oldTags,0); - + + yaffs_VerifyObjectHeader(in, oh, &oldTags, 0); + memcpy(oldName, oh->name, sizeof(oh->name)); } @@ -3789,20 +4007,18 @@ int yaffs_UpdateObjectHeader(yaffs_Object * in, const YCHAR * name, int force, oh->yst_ctime = in->yst_ctime; oh->yst_rdev = in->yst_rdev; #endif - if (in->parent) { + if (in->parent) oh->parentObjectId = in->parent->objectId; - } else { + else oh->parentObjectId = 0; - } if (name && *name) { memset(oh->name, 0, sizeof(oh->name)); yaffs_strncpy(oh->name, name, YAFFS_MAX_NAME_LENGTH); - } else if (prevChunkId>=0) { + } else if (prevChunkId > 0) memcpy(oh->name, oldName, sizeof(oh->name)); - } else { + else memset(oh->name, 0, sizeof(oh->name)); - } oh->isShrink = isShrink; @@ -3828,8 +4044,11 @@ int yaffs_UpdateObjectHeader(yaffs_Object * in, const YCHAR * name, int force, /* Do nothing */ break; case YAFFS_OBJECT_TYPE_SYMLINK: + alias = in->variant.symLinkVariant.alias; + if(!alias) + alias = _Y("no alias"); yaffs_strncpy(oh->alias, - in->variant.symLinkVariant.alias, + alias, YAFFS_MAX_ALIAS_LENGTH); oh->alias[YAFFS_MAX_ALIAS_LENGTH] = 0; break; @@ -3852,29 +4071,29 @@ int yaffs_UpdateObjectHeader(yaffs_Object * in, const YCHAR * name, int force, newTags.extraShadows = (oh->shadowsObject > 0) ? 1 : 0; newTags.extraObjectType = in->variantType; - yaffs_VerifyObjectHeader(in,oh,&newTags,1); + yaffs_VerifyObjectHeader(in, oh, &newTags, 1); /* Create new chunk in NAND */ newChunkId = yaffs_WriteNewChunkWithTagsToNAND(dev, buffer, &newTags, - (prevChunkId >= 0) ? 1 : 0); + (prevChunkId > 0) ? 1 : 0); if (newChunkId >= 0) { in->hdrChunk = newChunkId; - if (prevChunkId >= 0) { + if (prevChunkId > 0) { yaffs_DeleteChunk(dev, prevChunkId, 1, __LINE__); } - if(!yaffs_ObjectHasCachedWriteData(in)) + if (!yaffs_ObjectHasCachedWriteData(in)) in->dirty = 0; /* If this was a shrink, then mark the block that the chunk lives on */ if (isShrink) { bi = yaffs_GetBlockInfo(in->myDev, - newChunkId /in->myDev-> nChunksPerBlock); + newChunkId / in->myDev->param.nChunksPerBlock); bi->hasShrinkHeader = 1; } @@ -3892,11 +4111,11 @@ int yaffs_UpdateObjectHeader(yaffs_Object * in, const YCHAR * name, int force, /*------------------------ Short Operations Cache ---------------------------------------- * In many situations where there is no high level buffering (eg WinCE) a lot of - * reads might be short sequential reads, and a lot of writes may be short + * reads might be short sequential reads, and a lot of writes may be short * sequential writes. eg. scanning/writing a jpeg file. - * In these cases, a short read/write cache can provide a huge perfomance benefit + * In these cases, a short read/write cache can provide a huge perfomance benefit * with dumb-as-a-rock code. - * In Linux, the page cache provides read buffering aand the short op cache provides write + * In Linux, the page cache provides read buffering aand the short op cache provides write * buffering. * * There are a limited number (~10) of cache chunks per device so that we don't @@ -3908,27 +4127,27 @@ static int yaffs_ObjectHasCachedWriteData(yaffs_Object *obj) yaffs_Device *dev = obj->myDev; int i; yaffs_ChunkCache *cache; - int nCaches = obj->myDev->nShortOpCaches; - - for(i = 0; i < nCaches; i++){ + int nCaches = obj->myDev->param.nShortOpCaches; + + for (i = 0; i < nCaches; i++) { cache = &dev->srCache[i]; if (cache->object == obj && cache->dirty) return 1; } - + return 0; } -static void yaffs_FlushFilesChunkCache(yaffs_Object * obj) +static void yaffs_FlushFilesChunkCache(yaffs_Object *obj) { yaffs_Device *dev = obj->myDev; int lowest = -99; /* Stop compiler whining. */ int i; yaffs_ChunkCache *cache; int chunkWritten = 0; - int nCaches = obj->myDev->nShortOpCaches; + int nCaches = obj->myDev->param.nShortOpCaches; if (nCaches > 0) { do { @@ -3980,40 +4199,40 @@ static void yaffs_FlushFilesChunkCache(yaffs_Object * obj) void yaffs_FlushEntireDeviceCache(yaffs_Device *dev) { yaffs_Object *obj; - int nCaches = dev->nShortOpCaches; + int nCaches = dev->param.nShortOpCaches; int i; - + /* Find a dirty object in the cache and flush it... * until there are no further dirty objects. */ do { obj = NULL; - for( i = 0; i < nCaches && !obj; i++) { + for (i = 0; i < nCaches && !obj; i++) { if (dev->srCache[i].object && dev->srCache[i].dirty) obj = dev->srCache[i].object; - + } - if(obj) + if (obj) yaffs_FlushFilesChunkCache(obj); - - } while(obj); - + + } while (obj); + } /* Grab us a cache chunk for use. - * First look for an empty one. + * First look for an empty one. * Then look for the least recently used non-dirty one. * Then look for the least recently used dirty one...., flush and look again. */ -static yaffs_ChunkCache *yaffs_GrabChunkCacheWorker(yaffs_Device * dev) +static yaffs_ChunkCache *yaffs_GrabChunkCacheWorker(yaffs_Device *dev) { int i; - if (dev->nShortOpCaches > 0) { - for (i = 0; i < dev->nShortOpCaches; i++) { - if (!dev->srCache[i].object) + if (dev->param.nShortOpCaches > 0) { + for (i = 0; i < dev->param.nShortOpCaches; i++) { + if (!dev->srCache[i].object) return &dev->srCache[i]; } } @@ -4021,7 +4240,7 @@ static yaffs_ChunkCache *yaffs_GrabChunkCacheWorker(yaffs_Device * dev) return NULL; } -static yaffs_ChunkCache *yaffs_GrabChunkCache(yaffs_Device * dev) +static yaffs_ChunkCache *yaffs_GrabChunkCache(yaffs_Device *dev) { yaffs_ChunkCache *cache; yaffs_Object *theObj; @@ -4029,7 +4248,7 @@ static yaffs_ChunkCache *yaffs_GrabChunkCache(yaffs_Device * dev) int i; int pushout; - if (dev->nShortOpCaches > 0) { + if (dev->param.nShortOpCaches > 0) { /* Try find a non-dirty one... */ cache = yaffs_GrabChunkCacheWorker(dev); @@ -4048,11 +4267,10 @@ static yaffs_ChunkCache *yaffs_GrabChunkCache(yaffs_Device * dev) cache = NULL; pushout = -1; - for (i = 0; i < dev->nShortOpCaches; i++) { + for (i = 0; i < dev->param.nShortOpCaches; i++) { if (dev->srCache[i].object && !dev->srCache[i].locked && - (dev->srCache[i].lastUse < usage || !cache)) - { + (dev->srCache[i].lastUse < usage || !cache)) { usage = dev->srCache[i].lastUse; theObj = dev->srCache[i].object; cache = &dev->srCache[i]; @@ -4074,13 +4292,13 @@ static yaffs_ChunkCache *yaffs_GrabChunkCache(yaffs_Device * dev) } /* Find a cached chunk */ -static yaffs_ChunkCache *yaffs_FindChunkCache(const yaffs_Object * obj, +static yaffs_ChunkCache *yaffs_FindChunkCache(const yaffs_Object *obj, int chunkId) { yaffs_Device *dev = obj->myDev; int i; - if (dev->nShortOpCaches > 0) { - for (i = 0; i < dev->nShortOpCaches; i++) { + if (dev->param.nShortOpCaches > 0) { + for (i = 0; i < dev->param.nShortOpCaches; i++) { if (dev->srCache[i].object == obj && dev->srCache[i].chunkId == chunkId) { dev->cacheHits++; @@ -4093,17 +4311,17 @@ static yaffs_ChunkCache *yaffs_FindChunkCache(const yaffs_Object * obj, } /* Mark the chunk for the least recently used algorithym */ -static void yaffs_UseChunkCache(yaffs_Device * dev, yaffs_ChunkCache * cache, +static void yaffs_UseChunkCache(yaffs_Device *dev, yaffs_ChunkCache *cache, int isAWrite) { - if (dev->nShortOpCaches > 0) { + if (dev->param.nShortOpCaches > 0) { if (dev->srLastUse < 0 || dev->srLastUse > 100000000) { /* Reset the cache usages */ int i; - for (i = 1; i < dev->nShortOpCaches; i++) { + for (i = 1; i < dev->param.nShortOpCaches; i++) dev->srCache[i].lastUse = 0; - } + dev->srLastUse = 0; } @@ -4111,9 +4329,8 @@ static void yaffs_UseChunkCache(yaffs_Device * dev, yaffs_ChunkCache * cache, cache->lastUse = dev->srLastUse; - if (isAWrite) { + if (isAWrite) cache->dirty = 1; - } } } @@ -4121,31 +4338,29 @@ static void yaffs_UseChunkCache(yaffs_Device * dev, yaffs_ChunkCache * cache, * Do this when a whole page gets written, * ie the short cache for this page is no longer valid. */ -static void yaffs_InvalidateChunkCache(yaffs_Object * object, int chunkId) +static void yaffs_InvalidateChunkCache(yaffs_Object *object, int chunkId) { - if (object->myDev->nShortOpCaches > 0) { + if (object->myDev->param.nShortOpCaches > 0) { yaffs_ChunkCache *cache = yaffs_FindChunkCache(object, chunkId); - if (cache) { + if (cache) cache->object = NULL; - } } } /* Invalidate all the cache pages associated with this object * Do this whenever ther file is deleted or resized. */ -static void yaffs_InvalidateWholeChunkCache(yaffs_Object * in) +static void yaffs_InvalidateWholeChunkCache(yaffs_Object *in) { int i; yaffs_Device *dev = in->myDev; - if (dev->nShortOpCaches > 0) { + if (dev->param.nShortOpCaches > 0) { /* Invalidate it. */ - for (i = 0; i < dev->nShortOpCaches; i++) { - if (dev->srCache[i].object == in) { + for (i = 0; i < dev->param.nShortOpCaches; i++) { + if (dev->srCache[i].object == in) dev->srCache[i].object = NULL; - } } } } @@ -4153,18 +4368,18 @@ static void yaffs_InvalidateWholeChunkCache(yaffs_Object * in) /*--------------------- Checkpointing --------------------*/ -static int yaffs_WriteCheckpointValidityMarker(yaffs_Device *dev,int head) +static int yaffs_WriteCheckpointValidityMarker(yaffs_Device *dev, int head) { yaffs_CheckpointValidity cp; - - memset(&cp,0,sizeof(cp)); - + + memset(&cp, 0, sizeof(cp)); + cp.structType = sizeof(cp); cp.magic = YAFFS_MAGIC; cp.version = YAFFS_CHECKPOINT_VERSION; cp.head = (head) ? 1 : 0; - - return (yaffs_CheckpointWrite(dev,&cp,sizeof(cp)) == sizeof(cp))? + + return (yaffs_CheckpointWrite(dev, &cp, sizeof(cp)) == sizeof(cp)) ? 1 : 0; } @@ -4172,10 +4387,10 @@ static int yaffs_ReadCheckpointValidityMarker(yaffs_Device *dev, int head) { yaffs_CheckpointValidity cp; int ok; - - ok = (yaffs_CheckpointRead(dev,&cp,sizeof(cp)) == sizeof(cp)); - - if(ok) + + ok = (yaffs_CheckpointRead(dev, &cp, sizeof(cp)) == sizeof(cp)); + + if (ok) ok = (cp.structType == sizeof(cp)) && (cp.magic == YAFFS_MAGIC) && (cp.version == YAFFS_CHECKPOINT_VERSION) && @@ -4183,20 +4398,19 @@ static int yaffs_ReadCheckpointValidityMarker(yaffs_Device *dev, int head) return ok ? 1 : 0; } -static void yaffs_DeviceToCheckpointDevice(yaffs_CheckpointDevice *cp, +static void yaffs_DeviceToCheckpointDevice(yaffs_CheckpointDevice *cp, yaffs_Device *dev) { cp->nErasedBlocks = dev->nErasedBlocks; cp->allocationBlock = dev->allocationBlock; cp->allocationPage = dev->allocationPage; cp->nFreeChunks = dev->nFreeChunks; - + cp->nDeletedFiles = dev->nDeletedFiles; cp->nUnlinkedFiles = dev->nUnlinkedFiles; cp->nBackgroundDeletions = dev->nBackgroundDeletions; cp->sequenceNumber = dev->sequenceNumber; - cp->oldestDirtySequence = dev->oldestDirtySequence; - + } static void yaffs_CheckpointDeviceToDevice(yaffs_Device *dev, @@ -4206,12 +4420,11 @@ static void yaffs_CheckpointDeviceToDevice(yaffs_Device *dev, dev->allocationBlock = cp->allocationBlock; dev->allocationPage = cp->allocationPage; dev->nFreeChunks = cp->nFreeChunks; - + dev->nDeletedFiles = cp->nDeletedFiles; dev->nUnlinkedFiles = cp->nUnlinkedFiles; dev->nBackgroundDeletions = cp->nBackgroundDeletions; dev->sequenceNumber = cp->sequenceNumber; - dev->oldestDirtySequence = cp->oldestDirtySequence; } @@ -4222,23 +4435,23 @@ static int yaffs_WriteCheckpointDevice(yaffs_Device *dev) __u32 nBlocks = (dev->internalEndBlock - dev->internalStartBlock + 1); int ok; - + /* Write device runtime values*/ - yaffs_DeviceToCheckpointDevice(&cp,dev); + yaffs_DeviceToCheckpointDevice(&cp, dev); cp.structType = sizeof(cp); - - ok = (yaffs_CheckpointWrite(dev,&cp,sizeof(cp)) == sizeof(cp)); - + + ok = (yaffs_CheckpointWrite(dev, &cp, sizeof(cp)) == sizeof(cp)); + /* Write block info */ - if(ok) { + if (ok) { nBytes = nBlocks * sizeof(yaffs_BlockInfo); - ok = (yaffs_CheckpointWrite(dev,dev->blockInfo,nBytes) == nBytes); + ok = (yaffs_CheckpointWrite(dev, dev->blockInfo, nBytes) == nBytes); } - - /* Write chunk bits */ - if(ok) { + + /* Write chunk bits */ + if (ok) { nBytes = nBlocks * dev->chunkBitmapStride; - ok = (yaffs_CheckpointWrite(dev,dev->chunkBits,nBytes) == nBytes); + ok = (yaffs_CheckpointWrite(dev, dev->chunkBits, nBytes) == nBytes); } return ok ? 1 : 0; @@ -4250,28 +4463,28 @@ static int yaffs_ReadCheckpointDevice(yaffs_Device *dev) __u32 nBytes; __u32 nBlocks = (dev->internalEndBlock - dev->internalStartBlock + 1); - int ok; - - ok = (yaffs_CheckpointRead(dev,&cp,sizeof(cp)) == sizeof(cp)); - if(!ok) + int ok; + + ok = (yaffs_CheckpointRead(dev, &cp, sizeof(cp)) == sizeof(cp)); + if (!ok) return 0; - - if(cp.structType != sizeof(cp)) + + if (cp.structType != sizeof(cp)) return 0; - - - yaffs_CheckpointDeviceToDevice(dev,&cp); - + + + yaffs_CheckpointDeviceToDevice(dev, &cp); + nBytes = nBlocks * sizeof(yaffs_BlockInfo); - - ok = (yaffs_CheckpointRead(dev,dev->blockInfo,nBytes) == nBytes); - - if(!ok) + + ok = (yaffs_CheckpointRead(dev, dev->blockInfo, nBytes) == nBytes); + + if (!ok) return 0; nBytes = nBlocks * dev->chunkBitmapStride; - - ok = (yaffs_CheckpointRead(dev,dev->chunkBits,nBytes) == nBytes); - + + ok = (yaffs_CheckpointRead(dev, dev->chunkBits, nBytes) == nBytes); + return ok ? 1 : 0; } @@ -4291,30 +4504,47 @@ static void yaffs_ObjectToCheckpointObject(yaffs_CheckpointObject *cp, cp->unlinkAllowed = obj->unlinkAllowed; cp->serial = obj->serial; cp->nDataChunks = obj->nDataChunks; - - if(obj->variantType == YAFFS_OBJECT_TYPE_FILE) + + if (obj->variantType == YAFFS_OBJECT_TYPE_FILE) cp->fileSizeOrEquivalentObjectId = obj->variant.fileVariant.fileSize; - else if(obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK) + else if (obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK) cp->fileSizeOrEquivalentObjectId = obj->variant.hardLinkVariant.equivalentObjectId; } -static void yaffs_CheckpointObjectToObject( yaffs_Object *obj,yaffs_CheckpointObject *cp) +static int yaffs_CheckpointObjectToObject(yaffs_Object *obj, yaffs_CheckpointObject *cp) { yaffs_Object *parent; - + + if (obj->variantType != cp->variantType) { + T(YAFFS_TRACE_ERROR, (TSTR("Checkpoint read object %d type %d " + TCONT("chunk %d does not match existing object type %d") + TENDSTR), cp->objectId, cp->variantType, cp->hdrChunk, + obj->variantType)); + return 0; + } + obj->objectId = cp->objectId; - - if(cp->parentId) + + if (cp->parentId) parent = yaffs_FindOrCreateObjectByNumber( obj->myDev, cp->parentId, YAFFS_OBJECT_TYPE_DIRECTORY); else parent = NULL; - - if(parent) + + if (parent) { + if (parent->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) { + T(YAFFS_TRACE_ALWAYS, (TSTR("Checkpoint read object %d parent %d type %d" + TCONT(" chunk %d Parent type, %d, not directory") + TENDSTR), + cp->objectId, cp->parentId, cp->variantType, + cp->hdrChunk, parent->variantType)); + return 0; + } yaffs_AddObjectToDirectory(parent, obj); + } obj->hdrChunk = cp->hdrChunk; obj->variantType = cp->variantType; @@ -4326,34 +4556,31 @@ static void yaffs_CheckpointObjectToObject( yaffs_Object *obj,yaffs_CheckpointOb obj->unlinkAllowed = cp->unlinkAllowed; obj->serial = cp->serial; obj->nDataChunks = cp->nDataChunks; - - if(obj->variantType == YAFFS_OBJECT_TYPE_FILE) + + if (obj->variantType == YAFFS_OBJECT_TYPE_FILE) obj->variant.fileVariant.fileSize = cp->fileSizeOrEquivalentObjectId; - else if(obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK) + else if (obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK) obj->variant.hardLinkVariant.equivalentObjectId = cp->fileSizeOrEquivalentObjectId; - if(obj->hdrChunk > 0) + if (obj->hdrChunk > 0) obj->lazyLoaded = 1; + return 1; } -static int yaffs_CheckpointTnodeWorker(yaffs_Object * in, yaffs_Tnode * tn, - __u32 level, int chunkOffset) +static int yaffs_CheckpointTnodeWorker(yaffs_Object *in, yaffs_Tnode *tn, + __u32 level, int chunkOffset) { int i; yaffs_Device *dev = in->myDev; int ok = 1; - int tnodeSize = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8; - - if(tnodeSize < sizeof(yaffs_Tnode)) - tnodeSize = sizeof(yaffs_Tnode); - + int tnodeSize = yaffs_CalcTnodeSize(dev); if (tn) { if (level > 0) { - for (i = 0; i < YAFFS_NTNODES_INTERNAL && ok; i++){ + for (i = 0; i < YAFFS_NTNODES_INTERNAL && ok; i++) { if (tn->internal[i]) { ok = yaffs_CheckpointTnodeWorker(in, tn->internal[i], @@ -4363,10 +4590,9 @@ static int yaffs_CheckpointTnodeWorker(yaffs_Object * in, yaffs_Tnode * tn, } } else if (level == 0) { __u32 baseOffset = chunkOffset << YAFFS_TNODES_LEVEL0_BITS; - /* printf("write tnode at %d\n",baseOffset); */ - ok = (yaffs_CheckpointWrite(dev,&baseOffset,sizeof(baseOffset)) == sizeof(baseOffset)); - if(ok) - ok = (yaffs_CheckpointWrite(dev,tn,tnodeSize) == tnodeSize); + ok = (yaffs_CheckpointWrite(dev, &baseOffset, sizeof(baseOffset)) == sizeof(baseOffset)); + if (ok) + ok = (yaffs_CheckpointWrite(dev, tn, tnodeSize) == tnodeSize); } } @@ -4378,17 +4604,17 @@ static int yaffs_WriteCheckpointTnodes(yaffs_Object *obj) { __u32 endMarker = ~0; int ok = 1; - - if(obj->variantType == YAFFS_OBJECT_TYPE_FILE){ + + if (obj->variantType == YAFFS_OBJECT_TYPE_FILE) { ok = yaffs_CheckpointTnodeWorker(obj, obj->variant.fileVariant.top, obj->variant.fileVariant.topLevel, 0); - if(ok) - ok = (yaffs_CheckpointWrite(obj->myDev,&endMarker,sizeof(endMarker)) == + if (ok) + ok = (yaffs_CheckpointWrite(obj->myDev, &endMarker, sizeof(endMarker)) == sizeof(endMarker)); } - + return ok ? 1 : 0; } @@ -4400,88 +4626,81 @@ static int yaffs_ReadCheckpointTnodes(yaffs_Object *obj) yaffs_FileStructure *fileStructPtr = &obj->variant.fileVariant; yaffs_Tnode *tn; int nread = 0; - int tnodeSize = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8; + int tnodeSize = yaffs_CalcTnodeSize(dev); - if(tnodeSize < sizeof(yaffs_Tnode)) - tnodeSize = sizeof(yaffs_Tnode); + ok = (yaffs_CheckpointRead(dev, &baseChunk, sizeof(baseChunk)) == sizeof(baseChunk)); - ok = (yaffs_CheckpointRead(dev,&baseChunk,sizeof(baseChunk)) == sizeof(baseChunk)); - - while(ok && (~baseChunk)){ + while (ok && (~baseChunk)) { nread++; /* Read level 0 tnode */ - - - /* printf("read tnode at %d\n",baseChunk); */ + + tn = yaffs_GetTnodeRaw(dev); - if(tn) - ok = (yaffs_CheckpointRead(dev,tn,tnodeSize) == tnodeSize); + if (tn) + ok = (yaffs_CheckpointRead(dev, tn, tnodeSize) == tnodeSize); else ok = 0; - - if(tn && ok){ + + if (tn && ok) ok = yaffs_AddOrFindLevel0Tnode(dev, - fileStructPtr, - baseChunk, - tn) ? 1 : 0; - - } - - if(ok) - ok = (yaffs_CheckpointRead(dev,&baseChunk,sizeof(baseChunk)) == sizeof(baseChunk)); - + fileStructPtr, + baseChunk, + tn) ? 1 : 0; + + if (ok) + ok = (yaffs_CheckpointRead(dev, &baseChunk, sizeof(baseChunk)) == sizeof(baseChunk)); + } - T(YAFFS_TRACE_CHECKPOINT,( + T(YAFFS_TRACE_CHECKPOINT, ( TSTR("Checkpoint read tnodes %d records, last %d. ok %d" TENDSTR), - nread,baseChunk,ok)); + nread, baseChunk, ok)); - return ok ? 1 : 0; + return ok ? 1 : 0; } - + static int yaffs_WriteCheckpointObjects(yaffs_Device *dev) { yaffs_Object *obj; - yaffs_CheckpointObject cp; - int i; - int ok = 1; - struct ylist_head *lh; + yaffs_CheckpointObject cp; + int i; + int ok = 1; + struct ylist_head *lh; + - - /* Iterate through the objects in each hash entry, + /* Iterate through the objects in each hash entry, * dumping them to the checkpointing stream. - */ - - for(i = 0; ok && i < YAFFS_NOBJECT_BUCKETS; i++){ - ylist_for_each(lh, &dev->objectBucket[i].list) { - if (lh) { - obj = ylist_entry(lh, yaffs_Object, hashLink); - if (!obj->deferedFree) { - yaffs_ObjectToCheckpointObject(&cp,obj); - cp.structType = sizeof(cp); - - T(YAFFS_TRACE_CHECKPOINT,( - TSTR("Checkpoint write object %d parent %d type %d chunk %d obj addr %x" TENDSTR), - cp.objectId,cp.parentId,cp.variantType,cp.hdrChunk,(unsigned) obj)); - - ok = (yaffs_CheckpointWrite(dev,&cp,sizeof(cp)) == sizeof(cp)); - - if(ok && obj->variantType == YAFFS_OBJECT_TYPE_FILE){ + */ + + for (i = 0; ok && i < YAFFS_NOBJECT_BUCKETS; i++) { + ylist_for_each(lh, &dev->objectBucket[i].list) { + if (lh) { + obj = ylist_entry(lh, yaffs_Object, hashLink); + if (!obj->deferedFree) { + yaffs_ObjectToCheckpointObject(&cp, obj); + cp.structType = sizeof(cp); + + T(YAFFS_TRACE_CHECKPOINT, ( + TSTR("Checkpoint write object %d parent %d type %d chunk %d obj addr %p" TENDSTR), + cp.objectId, cp.parentId, cp.variantType, cp.hdrChunk, obj)); + + ok = (yaffs_CheckpointWrite(dev, &cp, sizeof(cp)) == sizeof(cp)); + + if (ok && obj->variantType == YAFFS_OBJECT_TYPE_FILE) ok = yaffs_WriteCheckpointTnodes(obj); - } } } } - } - - /* Dump end of list */ - memset(&cp,0xFF,sizeof(yaffs_CheckpointObject)); + } + + /* Dump end of list */ + memset(&cp, 0xFF, sizeof(yaffs_CheckpointObject)); cp.structType = sizeof(cp); - - if(ok) - ok = (yaffs_CheckpointWrite(dev,&cp,sizeof(cp)) == sizeof(cp)); - + + if (ok) + ok = (yaffs_CheckpointWrite(dev, &cp, sizeof(cp)) == sizeof(cp)); + return ok ? 1 : 0; } @@ -4492,40 +4711,41 @@ static int yaffs_ReadCheckpointObjects(yaffs_Device *dev) int ok = 1; int done = 0; yaffs_Object *hardList = NULL; - - while(ok && !done) { - ok = (yaffs_CheckpointRead(dev,&cp,sizeof(cp)) == sizeof(cp)); - if(cp.structType != sizeof(cp)) { - T(YAFFS_TRACE_CHECKPOINT,(TSTR("struct size %d instead of %d ok %d"TENDSTR), - cp.structType,sizeof(cp),ok)); + + while (ok && !done) { + ok = (yaffs_CheckpointRead(dev, &cp, sizeof(cp)) == sizeof(cp)); + if (cp.structType != sizeof(cp)) { + T(YAFFS_TRACE_CHECKPOINT, (TSTR("struct size %d instead of %d ok %d"TENDSTR), + cp.structType, (int)sizeof(cp), ok)); ok = 0; } - - T(YAFFS_TRACE_CHECKPOINT,(TSTR("Checkpoint read object %d parent %d type %d chunk %d " TENDSTR), - cp.objectId,cp.parentId,cp.variantType,cp.hdrChunk)); - if(ok && cp.objectId == ~0) + T(YAFFS_TRACE_CHECKPOINT, (TSTR("Checkpoint read object %d parent %d type %d chunk %d " TENDSTR), + cp.objectId, cp.parentId, cp.variantType, cp.hdrChunk)); + + if (ok && cp.objectId == ~0) done = 1; - else if(ok){ - obj = yaffs_FindOrCreateObjectByNumber(dev,cp.objectId, cp.variantType); - if(obj) { - yaffs_CheckpointObjectToObject(obj,&cp); - if(obj->variantType == YAFFS_OBJECT_TYPE_FILE) { - ok = yaffs_ReadCheckpointTnodes(obj); - } else if(obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK) { - obj->hardLinks.next = - (struct ylist_head *) - hardList; - hardList = obj; - } - - } + else if (ok) { + obj = yaffs_FindOrCreateObjectByNumber(dev, cp.objectId, cp.variantType); + if (obj) { + ok = yaffs_CheckpointObjectToObject(obj, &cp); + if (!ok) + break; + if (obj->variantType == YAFFS_OBJECT_TYPE_FILE) { + ok = yaffs_ReadCheckpointTnodes(obj); + } else if (obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK) { + obj->hardLinks.next = + (struct ylist_head *) hardList; + hardList = obj; + } + } else + ok = 0; } } - - if(ok) - yaffs_HardlinkFixup(dev,hardList); - + + if (ok) + yaffs_HardlinkFixup(dev, hardList); + return ok ? 1 : 0; } @@ -4533,14 +4753,14 @@ static int yaffs_WriteCheckpointSum(yaffs_Device *dev) { __u32 checkpointSum; int ok; - - yaffs_GetCheckpointSum(dev,&checkpointSum); - - ok = (yaffs_CheckpointWrite(dev,&checkpointSum,sizeof(checkpointSum)) == sizeof(checkpointSum)); - - if(!ok) + + yaffs_GetCheckpointSum(dev, &checkpointSum); + + ok = (yaffs_CheckpointWrite(dev, &checkpointSum, sizeof(checkpointSum)) == sizeof(checkpointSum)); + + if (!ok) return 0; - + return 1; } @@ -4549,63 +4769,60 @@ static int yaffs_ReadCheckpointSum(yaffs_Device *dev) __u32 checkpointSum0; __u32 checkpointSum1; int ok; - - yaffs_GetCheckpointSum(dev,&checkpointSum0); - - ok = (yaffs_CheckpointRead(dev,&checkpointSum1,sizeof(checkpointSum1)) == sizeof(checkpointSum1)); - - if(!ok) + + yaffs_GetCheckpointSum(dev, &checkpointSum0); + + ok = (yaffs_CheckpointRead(dev, &checkpointSum1, sizeof(checkpointSum1)) == sizeof(checkpointSum1)); + + if (!ok) return 0; - - if(checkpointSum0 != checkpointSum1) + + if (checkpointSum0 != checkpointSum1) return 0; - + return 1; } static int yaffs_WriteCheckpointData(yaffs_Device *dev) { - int ok = 1; - - if(dev->skipCheckpointWrite || !dev->isYaffs2){ - T(YAFFS_TRACE_CHECKPOINT,(TSTR("skipping checkpoint write" TENDSTR))); + + if (dev->param.skipCheckpointWrite || !dev->param.isYaffs2) { + T(YAFFS_TRACE_CHECKPOINT, (TSTR("skipping checkpoint write" TENDSTR))); ok = 0; } - - if(ok) - ok = yaffs_CheckpointOpen(dev,1); - - if(ok){ - T(YAFFS_TRACE_CHECKPOINT,(TSTR("write checkpoint validity" TENDSTR))); - ok = yaffs_WriteCheckpointValidityMarker(dev,1); + + if (ok) + ok = yaffs_CheckpointOpen(dev, 1); + + if (ok) { + T(YAFFS_TRACE_CHECKPOINT, (TSTR("write checkpoint validity" TENDSTR))); + ok = yaffs_WriteCheckpointValidityMarker(dev, 1); } - if(ok){ - T(YAFFS_TRACE_CHECKPOINT,(TSTR("write checkpoint device" TENDSTR))); + if (ok) { + T(YAFFS_TRACE_CHECKPOINT, (TSTR("write checkpoint device" TENDSTR))); ok = yaffs_WriteCheckpointDevice(dev); } - if(ok){ - T(YAFFS_TRACE_CHECKPOINT,(TSTR("write checkpoint objects" TENDSTR))); + if (ok) { + T(YAFFS_TRACE_CHECKPOINT, (TSTR("write checkpoint objects" TENDSTR))); ok = yaffs_WriteCheckpointObjects(dev); } - if(ok){ - T(YAFFS_TRACE_CHECKPOINT,(TSTR("write checkpoint validity" TENDSTR))); - ok = yaffs_WriteCheckpointValidityMarker(dev,0); + if (ok) { + T(YAFFS_TRACE_CHECKPOINT, (TSTR("write checkpoint validity" TENDSTR))); + ok = yaffs_WriteCheckpointValidityMarker(dev, 0); } - - if(ok){ + + if (ok) ok = yaffs_WriteCheckpointSum(dev); - } - - - if(!yaffs_CheckpointClose(dev)) - ok = 0; - - if(ok) - dev->isCheckpointed = 1; - else - dev->isCheckpointed = 0; + + if (!yaffs_CheckpointClose(dev)) + ok = 0; + + if (ok) + dev->isCheckpointed = 1; + else + dev->isCheckpointed = 0; return dev->isCheckpointed; } @@ -4613,44 +4830,44 @@ static int yaffs_WriteCheckpointData(yaffs_Device *dev) static int yaffs_ReadCheckpointData(yaffs_Device *dev) { int ok = 1; - - if(dev->skipCheckpointRead || !dev->isYaffs2){ - T(YAFFS_TRACE_CHECKPOINT,(TSTR("skipping checkpoint read" TENDSTR))); + + if (dev->param.skipCheckpointRead || !dev->param.isYaffs2) { + T(YAFFS_TRACE_CHECKPOINT, (TSTR("skipping checkpoint read" TENDSTR))); ok = 0; } - - if(ok) - ok = yaffs_CheckpointOpen(dev,0); /* open for read */ - - if(ok){ - T(YAFFS_TRACE_CHECKPOINT,(TSTR("read checkpoint validity" TENDSTR))); - ok = yaffs_ReadCheckpointValidityMarker(dev,1); + + if (ok) + ok = yaffs_CheckpointOpen(dev, 0); /* open for read */ + + if (ok) { + T(YAFFS_TRACE_CHECKPOINT, (TSTR("read checkpoint validity" TENDSTR))); + ok = yaffs_ReadCheckpointValidityMarker(dev, 1); } - if(ok){ - T(YAFFS_TRACE_CHECKPOINT,(TSTR("read checkpoint device" TENDSTR))); + if (ok) { + T(YAFFS_TRACE_CHECKPOINT, (TSTR("read checkpoint device" TENDSTR))); ok = yaffs_ReadCheckpointDevice(dev); } - if(ok){ - T(YAFFS_TRACE_CHECKPOINT,(TSTR("read checkpoint objects" TENDSTR))); + if (ok) { + T(YAFFS_TRACE_CHECKPOINT, (TSTR("read checkpoint objects" TENDSTR))); ok = yaffs_ReadCheckpointObjects(dev); } - if(ok){ - T(YAFFS_TRACE_CHECKPOINT,(TSTR("read checkpoint validity" TENDSTR))); - ok = yaffs_ReadCheckpointValidityMarker(dev,0); + if (ok) { + T(YAFFS_TRACE_CHECKPOINT, (TSTR("read checkpoint validity" TENDSTR))); + ok = yaffs_ReadCheckpointValidityMarker(dev, 0); } - - if(ok){ + + if (ok) { ok = yaffs_ReadCheckpointSum(dev); - T(YAFFS_TRACE_CHECKPOINT,(TSTR("read checkpoint checksum %d" TENDSTR),ok)); + T(YAFFS_TRACE_CHECKPOINT, (TSTR("read checkpoint checksum %d" TENDSTR), ok)); } - if(!yaffs_CheckpointClose(dev)) + if (!yaffs_CheckpointClose(dev)) ok = 0; - if(ok) - dev->isCheckpointed = 1; - else - dev->isCheckpointed = 0; + if (ok) + dev->isCheckpointed = 1; + else + dev->isCheckpointed = 0; return ok ? 1 : 0; @@ -4658,31 +4875,31 @@ static int yaffs_ReadCheckpointData(yaffs_Device *dev) static void yaffs_InvalidateCheckpoint(yaffs_Device *dev) { - if(dev->isCheckpointed || - dev->blocksInCheckpoint > 0){ + if (dev->isCheckpointed || + dev->blocksInCheckpoint > 0) { dev->isCheckpointed = 0; yaffs_CheckpointInvalidateStream(dev); - if(dev->superBlock && dev->markSuperBlockDirty) - dev->markSuperBlockDirty(dev->superBlock); } + if (dev->param.markSuperBlockDirty) + dev->param.markSuperBlockDirty(dev); } int yaffs_CheckpointSave(yaffs_Device *dev) { - T(YAFFS_TRACE_CHECKPOINT,(TSTR("save entry: isCheckpointed %d"TENDSTR),dev->isCheckpointed)); + T(YAFFS_TRACE_CHECKPOINT, (TSTR("save entry: isCheckpointed %d"TENDSTR), dev->isCheckpointed)); yaffs_VerifyObjects(dev); yaffs_VerifyBlocks(dev); yaffs_VerifyFreeChunks(dev); - if(!dev->isCheckpointed) { + if (!dev->isCheckpointed) { yaffs_InvalidateCheckpoint(dev); yaffs_WriteCheckpointData(dev); } - - T(YAFFS_TRACE_ALWAYS,(TSTR("save exit: isCheckpointed %d"TENDSTR),dev->isCheckpointed)); + + T(YAFFS_TRACE_ALWAYS, (TSTR("save exit: isCheckpointed %d"TENDSTR), dev->isCheckpointed)); return dev->isCheckpointed; } @@ -4690,18 +4907,18 @@ int yaffs_CheckpointSave(yaffs_Device *dev) int yaffs_CheckpointRestore(yaffs_Device *dev) { int retval; - T(YAFFS_TRACE_CHECKPOINT,(TSTR("restore entry: isCheckpointed %d"TENDSTR),dev->isCheckpointed)); - + T(YAFFS_TRACE_CHECKPOINT, (TSTR("restore entry: isCheckpointed %d"TENDSTR), dev->isCheckpointed)); + retval = yaffs_ReadCheckpointData(dev); - if(dev->isCheckpointed){ + if (dev->isCheckpointed) { yaffs_VerifyObjects(dev); yaffs_VerifyBlocks(dev); yaffs_VerifyFreeChunks(dev); } - T(YAFFS_TRACE_CHECKPOINT,(TSTR("restore exit: isCheckpointed %d"TENDSTR),dev->isCheckpointed)); - + T(YAFFS_TRACE_CHECKPOINT, (TSTR("restore exit: isCheckpointed %d"TENDSTR), dev->isCheckpointed)); + return retval; } @@ -4715,8 +4932,8 @@ int yaffs_CheckpointRestore(yaffs_Device *dev) * Curve-balls: the first chunk might also be the last chunk. */ -int yaffs_ReadDataFromFile(yaffs_Object * in, __u8 * buffer, loff_t offset, - int nBytes) +int yaffs_ReadDataFromFile(yaffs_Object *in, __u8 *buffer, loff_t offset, + int nBytes) { int chunk; @@ -4731,19 +4948,18 @@ int yaffs_ReadDataFromFile(yaffs_Object * in, __u8 * buffer, loff_t offset, dev = in->myDev; while (n > 0) { - //chunk = offset / dev->nDataBytesPerChunk + 1; - //start = offset % dev->nDataBytesPerChunk; - yaffs_AddrToChunk(dev,offset,&chunk,&start); + /* chunk = offset / dev->nDataBytesPerChunk + 1; */ + /* start = offset % dev->nDataBytesPerChunk; */ + yaffs_AddrToChunk(dev, offset, &chunk, &start); chunk++; /* OK now check for the curveball where the start and end are in - * the same chunk. + * the same chunk. */ - if ((start + n) < dev->nDataBytesPerChunk) { + if ((start + n) < dev->nDataBytesPerChunk) nToCopy = n; - } else { + else nToCopy = dev->nDataBytesPerChunk - start; - } cache = yaffs_FindChunkCache(in, chunk); @@ -4751,8 +4967,8 @@ int yaffs_ReadDataFromFile(yaffs_Object * in, __u8 * buffer, loff_t offset, * or we're using inband tags then use the cache (if there is caching) * else bypass the cache. */ - if (cache || nToCopy != dev->nDataBytesPerChunk || dev->inbandTags) { - if (dev->nShortOpCaches > 0) { + if (cache || nToCopy != dev->nDataBytesPerChunk || dev->param.inbandTags) { + if (dev->param.nShortOpCaches > 0) { /* If we can't find the data in the cache, then load it up. */ @@ -4772,14 +4988,9 @@ int yaffs_ReadDataFromFile(yaffs_Object * in, __u8 * buffer, loff_t offset, cache->locked = 1; -#ifdef CONFIG_YAFFS_WINCE - yfsd_UnlockYAFFS(TRUE); -#endif + memcpy(buffer, &cache->data[start], nToCopy); -#ifdef CONFIG_YAFFS_WINCE - yfsd_LockYAFFS(TRUE); -#endif cache->locked = 0; } else { /* Read into the local buffer then copy..*/ @@ -4788,41 +4999,19 @@ int yaffs_ReadDataFromFile(yaffs_Object * in, __u8 * buffer, loff_t offset, yaffs_GetTempBuffer(dev, __LINE__); yaffs_ReadChunkDataFromObject(in, chunk, localBuffer); -#ifdef CONFIG_YAFFS_WINCE - yfsd_UnlockYAFFS(TRUE); -#endif + memcpy(buffer, &localBuffer[start], nToCopy); -#ifdef CONFIG_YAFFS_WINCE - yfsd_LockYAFFS(TRUE); -#endif + yaffs_ReleaseTempBuffer(dev, localBuffer, __LINE__); } } else { -#ifdef CONFIG_YAFFS_WINCE - __u8 *localBuffer = yaffs_GetTempBuffer(dev, __LINE__); - /* Under WinCE can't do direct transfer. Need to use a local buffer. - * This is because we otherwise screw up WinCE's memory mapper - */ - yaffs_ReadChunkDataFromObject(in, chunk, localBuffer); - -#ifdef CONFIG_YAFFS_WINCE - yfsd_UnlockYAFFS(TRUE); -#endif - memcpy(buffer, localBuffer, dev->nDataBytesPerChunk); - -#ifdef CONFIG_YAFFS_WINCE - yfsd_LockYAFFS(TRUE); - yaffs_ReleaseTempBuffer(dev, localBuffer, __LINE__); -#endif - -#else /* A full chunk. Read directly into the supplied buffer. */ yaffs_ReadChunkDataFromObject(in, chunk, buffer); -#endif + } n -= nToCopy; @@ -4835,34 +5024,36 @@ int yaffs_ReadDataFromFile(yaffs_Object * in, __u8 * buffer, loff_t offset, return nDone; } -int yaffs_WriteDataToFile(yaffs_Object * in, const __u8 * buffer, loff_t offset, - int nBytes, int writeThrough) +int yaffs_DoWriteDataToFile(yaffs_Object *in, const __u8 *buffer, loff_t offset, + int nBytes, int writeThrough) { int chunk; __u32 start; int nToCopy; - int n = nBytes; - int nDone = 0; - int nToWriteBack; - int startOfWrite = offset; - int chunkWritten = 0; - __u32 nBytesRead; - __u32 chunkStart; + int n = nBytes; + int nDone = 0; + int nToWriteBack; + int startOfWrite = offset; + int chunkWritten = 0; + __u32 nBytesRead; + __u32 chunkStart; yaffs_Device *dev; dev = in->myDev; while (n > 0 && chunkWritten >= 0) { - //chunk = offset / dev->nDataBytesPerChunk + 1; - //start = offset % dev->nDataBytesPerChunk; - yaffs_AddrToChunk(dev,offset,&chunk,&start); - - if(chunk * dev->nDataBytesPerChunk + start != offset || - start >= dev->nDataBytesPerChunk){ - T(YAFFS_TRACE_ERROR,(TSTR("AddrToChunk of offset %d gives chunk %d start %d"TENDSTR), - (int)offset, chunk,start)); + /* chunk = offset / dev->nDataBytesPerChunk + 1; */ + /* start = offset % dev->nDataBytesPerChunk; */ + yaffs_AddrToChunk(dev, offset, &chunk, &start); + + if (chunk * dev->nDataBytesPerChunk + start != offset || + start >= dev->nDataBytesPerChunk) { + T(YAFFS_TRACE_ERROR, ( + TSTR("AddrToChunk of offset %d gives chunk %d start %d" + TENDSTR), + (int)offset, chunk, start)); } chunk++; @@ -4880,20 +5071,19 @@ int yaffs_WriteDataToFile(yaffs_Object * in, const __u8 * buffer, loff_t offset, chunkStart = ((chunk - 1) * dev->nDataBytesPerChunk); - if(chunkStart > in->variant.fileVariant.fileSize) + if (chunkStart > in->variant.fileVariant.fileSize) nBytesRead = 0; /* Past end of file */ else nBytesRead = in->variant.fileVariant.fileSize - chunkStart; - if (nBytesRead > dev->nDataBytesPerChunk) { + if (nBytesRead > dev->nDataBytesPerChunk) nBytesRead = dev->nDataBytesPerChunk; - } nToWriteBack = (nBytesRead > (start + n)) ? nBytesRead : (start + n); - - if(nToWriteBack < 0 || nToWriteBack > dev->nDataBytesPerChunk) + + if (nToWriteBack < 0 || nToWriteBack > dev->nDataBytesPerChunk) YBUG(); } else { @@ -4901,49 +5091,42 @@ int yaffs_WriteDataToFile(yaffs_Object * in, const __u8 * buffer, loff_t offset, nToWriteBack = dev->nDataBytesPerChunk; } - if (nToCopy != dev->nDataBytesPerChunk || dev->inbandTags) { - /* An incomplete start or end chunk (or maybe both start and end chunk), + if (nToCopy != dev->nDataBytesPerChunk || dev->param.inbandTags) { + /* An incomplete start or end chunk (or maybe both start and end chunk), * or we're using inband tags, so we want to use the cache buffers. */ - if (dev->nShortOpCaches > 0) { + if (dev->param.nShortOpCaches > 0) { yaffs_ChunkCache *cache; /* If we can't find the data in the cache, then load the cache */ cache = yaffs_FindChunkCache(in, chunk); - + if (!cache - && yaffs_CheckSpaceForAllocation(in-> - myDev)) { - cache = yaffs_GrabChunkCache(in->myDev); + && yaffs_CheckSpaceForAllocation(dev, 1)) { + cache = yaffs_GrabChunkCache(dev); cache->object = in; cache->chunkId = chunk; cache->dirty = 0; cache->locked = 0; yaffs_ReadChunkDataFromObject(in, chunk, - cache-> - data); - } - else if(cache && - !cache->dirty && - !yaffs_CheckSpaceForAllocation(in->myDev)){ + cache->data); + } else if (cache && + !cache->dirty && + !yaffs_CheckSpaceForAllocation(dev, 1)) { /* Drop the cache if it was a read cache item and * no space check has been made for it. - */ + */ cache = NULL; } if (cache) { yaffs_UseChunkCache(dev, cache, 1); cache->locked = 1; -#ifdef CONFIG_YAFFS_WINCE - yfsd_UnlockYAFFS(TRUE); -#endif + memcpy(&cache->data[start], buffer, nToCopy); -#ifdef CONFIG_YAFFS_WINCE - yfsd_LockYAFFS(TRUE); -#endif + cache->locked = 0; cache->nBytes = nToWriteBack; @@ -4971,15 +5154,10 @@ int yaffs_WriteDataToFile(yaffs_Object * in, const __u8 * buffer, loff_t offset, yaffs_ReadChunkDataFromObject(in, chunk, localBuffer); -#ifdef CONFIG_YAFFS_WINCE - yfsd_UnlockYAFFS(TRUE); -#endif + memcpy(&localBuffer[start], buffer, nToCopy); -#ifdef CONFIG_YAFFS_WINCE - yfsd_LockYAFFS(TRUE); -#endif chunkWritten = yaffs_WriteChunkDataToObject(in, chunk, localBuffer, @@ -4993,31 +5171,14 @@ int yaffs_WriteDataToFile(yaffs_Object * in, const __u8 * buffer, loff_t offset, } else { /* A full chunk. Write directly from the supplied buffer. */ - -#ifdef CONFIG_YAFFS_WINCE - /* Under WinCE can't do direct transfer. Need to use a local buffer. - * This is because we otherwise screw up WinCE's memory mapper - */ - __u8 *localBuffer = yaffs_GetTempBuffer(dev, __LINE__); -#ifdef CONFIG_YAFFS_WINCE - yfsd_UnlockYAFFS(TRUE); -#endif - memcpy(localBuffer, buffer, dev->nDataBytesPerChunk); -#ifdef CONFIG_YAFFS_WINCE - yfsd_LockYAFFS(TRUE); -#endif - chunkWritten = - yaffs_WriteChunkDataToObject(in, chunk, localBuffer, - dev->nDataBytesPerChunk, - 0); - yaffs_ReleaseTempBuffer(dev, localBuffer, __LINE__); -#else + + chunkWritten = yaffs_WriteChunkDataToObject(in, chunk, buffer, dev->nDataBytesPerChunk, 0); -#endif + /* Since we've overwritten the cached data, we better invalidate it. */ yaffs_InvalidateChunkCache(in, chunk); } @@ -5033,19 +5194,26 @@ int yaffs_WriteDataToFile(yaffs_Object * in, const __u8 * buffer, loff_t offset, /* Update file object */ - if ((startOfWrite + nDone) > in->variant.fileVariant.fileSize) { + if ((startOfWrite + nDone) > in->variant.fileVariant.fileSize) in->variant.fileVariant.fileSize = (startOfWrite + nDone); - } in->dirty = 1; return nDone; } +int yaffs_WriteDataToFile(yaffs_Object *in, const __u8 *buffer, loff_t offset, + int nBytes, int writeThrough) +{ + yaffs_HandleHole(in,offset); + return yaffs_DoWriteDataToFile(in,buffer,offset,nBytes,writeThrough); +} + + /* ---------------------- File resizing stuff ------------------ */ -static void yaffs_PruneResizedChunks(yaffs_Object * in, int newSize) +static void yaffs_PruneResizedChunks(yaffs_Object *in, int newSize) { yaffs_Device *dev = in->myDev; @@ -5070,10 +5238,10 @@ static void yaffs_PruneResizedChunks(yaffs_Object * in, int newSize) chunkId = yaffs_FindAndDeleteChunkInFile(in, i, NULL); if (chunkId > 0) { if (chunkId < - (dev->internalStartBlock * dev->nChunksPerBlock) + (dev->internalStartBlock * dev->param.nChunksPerBlock) || chunkId >= ((dev->internalEndBlock + - 1) * dev->nChunksPerBlock)) { + 1) * dev->param.nChunksPerBlock)) { T(YAFFS_TRACE_ALWAYS, (TSTR("Found daft chunkId %d for %d" TENDSTR), chunkId, i)); @@ -5086,85 +5254,175 @@ static void yaffs_PruneResizedChunks(yaffs_Object * in, int newSize) } -int yaffs_ResizeFile(yaffs_Object * in, loff_t newSize) -{ - int oldFileSize = in->variant.fileVariant.fileSize; - __u32 newSizeOfPartialChunk; +static void yaffs_ResizeDown( yaffs_Object *obj, loff_t newSize) +{ int newFullChunks; - - yaffs_Device *dev = in->myDev; + __u32 newSizeOfPartialChunk; + yaffs_Device *dev = obj->myDev; yaffs_AddrToChunk(dev, newSize, &newFullChunks, &newSizeOfPartialChunk); - yaffs_FlushFilesChunkCache(in); - yaffs_InvalidateWholeChunkCache(in); + yaffs_PruneResizedChunks(obj, newSize); - yaffs_CheckGarbageCollection(dev); + if (newSizeOfPartialChunk != 0) { + int lastChunk = 1 + newFullChunks; + __u8 *localBuffer = yaffs_GetTempBuffer(dev, __LINE__); - if (in->variantType != YAFFS_OBJECT_TYPE_FILE) { - return YAFFS_FAIL; - } + /* Got to read and rewrite the last chunk with its new size and zero pad */ + yaffs_ReadChunkDataFromObject(obj, lastChunk, localBuffer); + memset(localBuffer + newSizeOfPartialChunk, 0, + dev->nDataBytesPerChunk - newSizeOfPartialChunk); - if (newSize == oldFileSize) { - return YAFFS_OK; - } + yaffs_WriteChunkDataToObject(obj, lastChunk, localBuffer, + newSizeOfPartialChunk, 1); - if (newSize < oldFileSize) { + yaffs_ReleaseTempBuffer(dev, localBuffer, __LINE__); + } - yaffs_PruneResizedChunks(in, newSize); + obj->variant.fileVariant.fileSize = newSize; - if (newSizeOfPartialChunk != 0) { - int lastChunk = 1 + newFullChunks; - - __u8 *localBuffer = yaffs_GetTempBuffer(dev, __LINE__); + yaffs_PruneFileStructure(dev, &obj->variant.fileVariant); +} + + +static int yaffs_HandleHole(yaffs_Object *obj, loff_t newSize) +{ + /* if newsSize > oldFileSize. + * We're going to be writing a hole. + * If the hole is small then write zeros otherwise write a start of hole marker. + */ + + + loff_t oldFileSize; + int increase; + int smallHole ; + int result = YAFFS_OK; + yaffs_Device *dev = NULL; + + __u8 *localBuffer = NULL; + + int smallIncreaseOk = 0; + + if(!obj) + return YAFFS_FAIL; - /* Got to read and rewrite the last chunk with its new size and zero pad */ - yaffs_ReadChunkDataFromObject(in, lastChunk, - localBuffer); + if(obj->variantType != YAFFS_OBJECT_TYPE_FILE) + return YAFFS_FAIL; + + dev = obj->myDev; + + /* Bail out if not yaffs2 mode */ + if(!dev->param.isYaffs2) + return YAFFS_OK; + + oldFileSize = obj->variant.fileVariant.fileSize; - memset(localBuffer + newSizeOfPartialChunk, 0, - dev->nDataBytesPerChunk - newSizeOfPartialChunk); + if (newSize <= oldFileSize) + return YAFFS_OK; - yaffs_WriteChunkDataToObject(in, lastChunk, localBuffer, - newSizeOfPartialChunk, 1); + increase = newSize - oldFileSize; - yaffs_ReleaseTempBuffer(dev, localBuffer, __LINE__); + if(increase < YAFFS_SMALL_HOLE_THRESHOLD * dev->nDataBytesPerChunk && + yaffs_CheckSpaceForAllocation(dev, YAFFS_SMALL_HOLE_THRESHOLD + 1)) + smallHole = 1; + else + smallHole = 0; + + if(smallHole) + localBuffer= yaffs_GetTempBuffer(dev, __LINE__); + + if(localBuffer){ + /* fill hole with zero bytes */ + int pos = oldFileSize; + int thisWrite; + int written; + memset(localBuffer,0,dev->nDataBytesPerChunk); + smallIncreaseOk = 1; + + while(increase > 0 && smallIncreaseOk){ + thisWrite = increase; + if(thisWrite > dev->nDataBytesPerChunk) + thisWrite = dev->nDataBytesPerChunk; + written = yaffs_DoWriteDataToFile(obj,localBuffer,pos,thisWrite,0); + if(written == thisWrite){ + pos += thisWrite; + increase -= thisWrite; + } else + smallIncreaseOk = 0; } - in->variant.fileVariant.fileSize = newSize; + yaffs_ReleaseTempBuffer(dev,localBuffer,__LINE__); - yaffs_PruneFileStructure(dev, &in->variant.fileVariant); - } else { - /* newsSize > oldFileSize */ - in->variant.fileVariant.fileSize = newSize; + /* If we were out of space then reverse any chunks we've added */ + if(!smallIncreaseOk) + yaffs_ResizeDown(obj, oldFileSize); + } + + if (!smallIncreaseOk && + obj->parent && + obj->parent->objectId != YAFFS_OBJECTID_UNLINKED && + obj->parent->objectId != YAFFS_OBJECTID_DELETED){ + /* Write a hole start header with the old file size */ + yaffs_UpdateObjectHeader(obj, NULL, 0,1,0); } + return result; + +} + +int yaffs_ResizeFile(yaffs_Object *in, loff_t newSize) +{ + yaffs_Device *dev = in->myDev; + int oldFileSize = in->variant.fileVariant.fileSize; + + yaffs_FlushFilesChunkCache(in); + yaffs_InvalidateWholeChunkCache(in); + + yaffs_CheckGarbageCollection(dev); + + if (in->variantType != YAFFS_OBJECT_TYPE_FILE) + return YAFFS_FAIL; + + if (newSize == oldFileSize) + return YAFFS_OK; - - /* Write a new object header. + if(newSize > oldFileSize){ + yaffs_HandleHole(in,newSize); + in->variant.fileVariant.fileSize = newSize; + } else { + /* newSize < oldFileSize */ + yaffs_ResizeDown(in, 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. + * Do this only if the file is not in the deleted directories + * and is not shadowed. */ if (in->parent && + !in->isShadowed && in->parent->objectId != YAFFS_OBJECTID_UNLINKED && - in->parent->objectId != YAFFS_OBJECTID_DELETED) { - yaffs_UpdateObjectHeader(in, NULL, 0, - (newSize < oldFileSize) ? 1 : 0, 0); - } + in->parent->objectId != YAFFS_OBJECTID_DELETED) + yaffs_UpdateObjectHeader(in, NULL, 0,0,0); + return YAFFS_OK; } -loff_t yaffs_GetFileSize(yaffs_Object * obj) +loff_t yaffs_GetFileSize(yaffs_Object *obj) { + YCHAR *alias = NULL; obj = yaffs_GetEquivalentObject(obj); switch (obj->variantType) { case YAFFS_OBJECT_TYPE_FILE: return obj->variant.fileVariant.fileSize; case YAFFS_OBJECT_TYPE_SYMLINK: - return yaffs_strlen(obj->variant.symLinkVariant.alias); + alias = obj->variant.symLinkVariant.alias; + if(!alias) + return 0; + return yaffs_strnlen(alias,YAFFS_MAX_ALIAS_LENGTH); default: return 0; } @@ -5172,24 +5430,27 @@ loff_t yaffs_GetFileSize(yaffs_Object * obj) -int yaffs_FlushFile(yaffs_Object * in, int updateTime) +int yaffs_FlushFile(yaffs_Object *in, int updateTime, int dataSync) { int retVal; if (in->dirty) { yaffs_FlushFilesChunkCache(in); - if (updateTime) { + if(dataSync) /* Only sync data */ + retVal=YAFFS_OK; + else { + if (updateTime) { #ifdef CONFIG_YAFFS_WINCE - yfsd_WinFileTimeNow(in->win_mtime); + yfsd_WinFileTimeNow(in->win_mtime); #else - in->yst_mtime = Y_CURRENT_TIME; + in->yst_mtime = Y_CURRENT_TIME; #endif - } + } - retVal = - (yaffs_UpdateObjectHeader(in, NULL, 0, 0, 0) >= - 0) ? YAFFS_OK : YAFFS_FAIL; + retVal = (yaffs_UpdateObjectHeader(in, NULL, 0, 0, 0) >= + 0) ? YAFFS_OK : YAFFS_FAIL; + } } else { retVal = YAFFS_OK; } @@ -5198,15 +5459,15 @@ int yaffs_FlushFile(yaffs_Object * in, int updateTime) } -static int yaffs_DoGenericObjectDeletion(yaffs_Object * in) +static int yaffs_DoGenericObjectDeletion(yaffs_Object *in) { /* First off, invalidate the file's data in the cache, without flushing. */ yaffs_InvalidateWholeChunkCache(in); - if (in->myDev->isYaffs2 && (in->parent != in->myDev->deletedDir)) { + if (in->myDev->param.isYaffs2 && (in->parent != in->myDev->deletedDir)) { /* Move to the unlinked directory so we have a record that it was deleted. */ - yaffs_ChangeObjectName(in, in->myDev->deletedDir,_Y("deleted"), 0, 0); + yaffs_ChangeObjectName(in, in->myDev->deletedDir, _Y("deleted"), 0, 0); } @@ -5223,22 +5484,15 @@ static int yaffs_DoGenericObjectDeletion(yaffs_Object * in) * and the inode associated with the file. * It does not delete the links associated with the file. */ - -static int yaffs_UnlinkFile(yaffs_Object * in) +static int yaffs_UnlinkFileIfNeeded(yaffs_Object *in) { int retVal; int immediateDeletion = 0; + yaffs_Device *dev = in->myDev; -#ifdef __KERNEL__ - if (!in->myInode) { - immediateDeletion = 1; - } -#else - if (in->inUse <= 0) { + if (!in->myInode) immediateDeletion = 1; - } -#endif if (immediateDeletion) { retVal = @@ -5249,9 +5503,8 @@ static int yaffs_UnlinkFile(yaffs_Object * in) in->objectId)); in->deleted = 1; in->myDev->nDeletedFiles++; - if (1 || in->myDev->isYaffs2) { + if (dev->param.disableSoftDelete || dev->param.isYaffs2) yaffs_ResizeFile(in, 0); - } yaffs_SoftDeleteFile(in); } else { retVal = @@ -5263,22 +5516,25 @@ static int yaffs_UnlinkFile(yaffs_Object * in) return retVal; } -int yaffs_DeleteFile(yaffs_Object * in) +int yaffs_DeleteFile(yaffs_Object *in) { int retVal = YAFFS_OK; int deleted = in->deleted; - - yaffs_ResizeFile(in,0); + yaffs_Device *dev = in->myDev; + + if (dev->param.disableSoftDelete || dev->param.isYaffs2) + yaffs_ResizeFile(in, 0); if (in->nDataChunks > 0) { /* Use soft deletion if there is data in the file. * That won't be the case if it has been resized to zero. */ - if (!in->unlinked) { - retVal = yaffs_UnlinkFile(in); - } + if (!in->unlinked) + retVal = yaffs_UnlinkFileIfNeeded(in); + if (retVal == YAFFS_OK && in->unlinked && !in->deleted) { - in->deleted = deleted = 1; + in->deleted = 1; + deleted = 1; in->myDev->nDeletedFiles++; yaffs_SoftDeleteFile(in); } @@ -5293,100 +5549,126 @@ int yaffs_DeleteFile(yaffs_Object * in) } } -static int yaffs_DeleteDirectory(yaffs_Object * in) +static int yaffs_IsNonEmptyDirectory(yaffs_Object *obj) { - /* First check that the directory is empty. */ - if (ylist_empty(&in->variant.directoryVariant.children)) { - return yaffs_DoGenericObjectDeletion(in); - } + return (obj->variantType == YAFFS_OBJECT_TYPE_DIRECTORY) && + !(ylist_empty(&obj->variant.directoryVariant.children)); +} - return YAFFS_FAIL; +static int yaffs_DeleteDirectory(yaffs_Object *obj) +{ + /* First check that the directory is empty. */ + if (yaffs_IsNonEmptyDirectory(obj)) + return YAFFS_FAIL; + return yaffs_DoGenericObjectDeletion(obj); } -static int yaffs_DeleteSymLink(yaffs_Object * in) +static int yaffs_DeleteSymLink(yaffs_Object *in) { - YFREE(in->variant.symLinkVariant.alias); + if(in->variant.symLinkVariant.alias) + YFREE(in->variant.symLinkVariant.alias); + in->variant.symLinkVariant.alias=NULL; return yaffs_DoGenericObjectDeletion(in); } -static int yaffs_DeleteHardLink(yaffs_Object * in) +static int yaffs_DeleteHardLink(yaffs_Object *in) { - /* remove this hardlink from the list assocaited with the equivalent - * object - */ - ylist_del_init(&in->hardLinks); - return yaffs_DoGenericObjectDeletion(in); + /* remove this hardlink from the list assocaited with the equivalent + * object + */ + ylist_del_init(&in->hardLinks); + return yaffs_DoGenericObjectDeletion(in); } -static void yaffs_DestroyObject(yaffs_Object * obj) +int yaffs_DeleteObject(yaffs_Object *obj) { +int retVal = -1; switch (obj->variantType) { case YAFFS_OBJECT_TYPE_FILE: - yaffs_DeleteFile(obj); + retVal = yaffs_DeleteFile(obj); break; case YAFFS_OBJECT_TYPE_DIRECTORY: - yaffs_DeleteDirectory(obj); + if(!ylist_empty(&obj->variant.directoryVariant.dirty)){ + T(YAFFS_TRACE_BACKGROUND, (TSTR("Remove object %d from dirty directories" TENDSTR),obj->objectId)); + ylist_del_init(&obj->variant.directoryVariant.dirty); + } + return yaffs_DeleteDirectory(obj); break; case YAFFS_OBJECT_TYPE_SYMLINK: - yaffs_DeleteSymLink(obj); + retVal = yaffs_DeleteSymLink(obj); break; case YAFFS_OBJECT_TYPE_HARDLINK: - yaffs_DeleteHardLink(obj); + retVal = yaffs_DeleteHardLink(obj); break; case YAFFS_OBJECT_TYPE_SPECIAL: - yaffs_DoGenericObjectDeletion(obj); + retVal = yaffs_DoGenericObjectDeletion(obj); break; case YAFFS_OBJECT_TYPE_UNKNOWN: + retVal = 0; break; /* should not happen. */ } + + return retVal; } -static int yaffs_UnlinkWorker(yaffs_Object * obj) +static int yaffs_UnlinkWorker(yaffs_Object *obj) { - if (obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK) { - return yaffs_DeleteHardLink(obj); - } else if (!ylist_empty(&obj->hardLinks)) { - /* Curve ball: We're unlinking an object that has a hardlink. - * - * This problem arises because we are not strictly following + int immediateDeletion = 0; + + if (!obj->myInode) + immediateDeletion = 1; + + if(obj) + yaffs_UpdateParent(obj->parent); + + if (obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK) { + return yaffs_DeleteHardLink(obj); + } else if (!ylist_empty(&obj->hardLinks)) { + /* Curve ball: We're unlinking an object that has a hardlink. + * + * This problem arises because we are not strictly following * The Linux link/inode model. * * We can't really delete the object. * Instead, we do the following: * - Select a hardlink. * - Unhook it from the hard links - * - Unhook it from its parent directory (so that the rename can work) + * - Move it from its parent directory (so that the rename can work) * - Rename the object to the hardlink's name. * - Delete the hardlink */ yaffs_Object *hl; - int retVal; - YCHAR name[YAFFS_MAX_NAME_LENGTH + 1]; + yaffs_Object *parent; + int retVal; + YCHAR name[YAFFS_MAX_NAME_LENGTH + 1]; - hl = ylist_entry(obj->hardLinks.next, yaffs_Object, hardLinks); + hl = ylist_entry(obj->hardLinks.next, yaffs_Object, hardLinks); - ylist_del_init(&hl->hardLinks); - ylist_del_init(&hl->siblings); + yaffs_GetObjectName(hl, name, YAFFS_MAX_NAME_LENGTH + 1); + parent = hl->parent; - yaffs_GetObjectName(hl, name, YAFFS_MAX_NAME_LENGTH + 1); + ylist_del_init(&hl->hardLinks); - retVal = yaffs_ChangeObjectName(obj, hl->parent, name, 0, 0); + yaffs_AddObjectToDirectory(obj->myDev->unlinkedDir, hl); - if (retVal == YAFFS_OK) { + retVal = yaffs_ChangeObjectName(obj,parent, name, 0, 0); + + if (retVal == YAFFS_OK) retVal = yaffs_DoGenericObjectDeletion(hl); - } + return retVal; - } else { + } else if (immediateDeletion) { switch (obj->variantType) { case YAFFS_OBJECT_TYPE_FILE: - return yaffs_UnlinkFile(obj); + return yaffs_DeleteFile(obj); break; case YAFFS_OBJECT_TYPE_DIRECTORY: + ylist_del_init(&obj->variant.directoryVariant.dirty); return yaffs_DeleteDirectory(obj); break; case YAFFS_OBJECT_TYPE_SYMLINK: @@ -5400,21 +5682,24 @@ static int yaffs_UnlinkWorker(yaffs_Object * obj) default: return YAFFS_FAIL; } - } + } else if(yaffs_IsNonEmptyDirectory(obj)) + return YAFFS_FAIL; + else + return yaffs_ChangeObjectName(obj, obj->myDev->unlinkedDir, + _Y("unlinked"), 0, 0); } -static int yaffs_UnlinkObject( yaffs_Object *obj) +static int yaffs_UnlinkObject(yaffs_Object *obj) { - if (obj && obj->unlinkAllowed) { + if (obj && obj->unlinkAllowed) return yaffs_UnlinkWorker(obj); - } return YAFFS_FAIL; } -int yaffs_Unlink(yaffs_Object * dir, const YCHAR * name) +int yaffs_Unlink(yaffs_Object *dir, const YCHAR *name) { yaffs_Object *obj; @@ -5424,8 +5709,8 @@ int yaffs_Unlink(yaffs_Object * dir, const YCHAR * name) /*----------------------- Initialisation Scanning ---------------------- */ -static void yaffs_HandleShadowedObject(yaffs_Device * dev, int objId, - int backwardScanning) +static void yaffs_HandleShadowedObject(yaffs_Device *dev, int objId, + int backwardScanning) { yaffs_Object *obj; @@ -5438,9 +5723,9 @@ static void yaffs_HandleShadowedObject(yaffs_Device * dev, int objId, /* Handle YAFFS2 case (backward scanning) * If the shadowed object exists then ignore. */ - if (yaffs_FindObjectByNumber(dev, objId)) { + obj = yaffs_FindObjectByNumber(dev, objId); + if(obj) return; - } } /* Let's create it (if it does not exist) assuming it is a file so that it can do shrinking etc. @@ -5449,6 +5734,9 @@ static void yaffs_HandleShadowedObject(yaffs_Device * dev, int objId, obj = yaffs_FindOrCreateObjectByNumber(dev, objId, YAFFS_OBJECT_TYPE_FILE); + if (!obj) + return; + obj->isShadowed = 1; yaffs_AddObjectToDirectory(dev->unlinkedDir, obj); obj->variant.fileVariant.shrinkSize = 0; obj->valid = 1; /* So that we don't read any other info for this file */ @@ -5465,7 +5753,7 @@ static void yaffs_HardlinkFixup(yaffs_Device *dev, yaffs_Object *hardList) { yaffs_Object *hl; yaffs_Object *in; - + while (hardList) { hl = hardList; hardList = (yaffs_Object *) (hardList->hardLinks.next); @@ -5474,37 +5762,35 @@ static void yaffs_HardlinkFixup(yaffs_Device *dev, yaffs_Object *hardList) hl->variant.hardLinkVariant. equivalentObjectId); - if (in) { - /* Add the hardlink pointers */ - hl->variant.hardLinkVariant.equivalentObject = in; - ylist_add(&hl->hardLinks, &in->hardLinks); - } else { - /* Todo Need to report/handle this better. - * Got a problem... hardlink to a non-existant object - */ - hl->variant.hardLinkVariant.equivalentObject = NULL; - YINIT_LIST_HEAD(&hl->hardLinks); - - } + if (in) { + /* Add the hardlink pointers */ + hl->variant.hardLinkVariant.equivalentObject = in; + ylist_add(&hl->hardLinks, &in->hardLinks); + } else { + /* Todo Need to report/handle this better. + * Got a problem... hardlink to a non-existant object + */ + hl->variant.hardLinkVariant.equivalentObject = NULL; + YINIT_LIST_HEAD(&hl->hardLinks); + } } - } -static int ybicmp(const void *a, const void *b){ - register int aseq = ((yaffs_BlockIndex *)a)->seq; - register int bseq = ((yaffs_BlockIndex *)b)->seq; - register int ablock = ((yaffs_BlockIndex *)a)->block; - register int bblock = ((yaffs_BlockIndex *)b)->block; - if( aseq == bseq ) - return ablock - bblock; - else - return aseq - bseq; - +static int ybicmp(const void *a, const void *b) +{ + register int aseq = ((yaffs_BlockIndex *)a)->seq; + register int bseq = ((yaffs_BlockIndex *)b)->seq; + register int ablock = ((yaffs_BlockIndex *)a)->block; + register int bblock = ((yaffs_BlockIndex *)b)->block; + if (aseq == bseq) + return ablock - bblock; + else + return aseq - bseq; } @@ -5529,21 +5815,140 @@ static void yaffs_StripDeletedObjects(yaffs_Device *dev) &dev->unlinkedDir->variant.directoryVariant.children) { if (i) { l = ylist_entry(i, yaffs_Object, siblings); - yaffs_DestroyObject(l); + yaffs_DeleteObject(l); } } - + ylist_for_each_safe(i, n, &dev->deletedDir->variant.directoryVariant.children) { if (i) { l = ylist_entry(i, yaffs_Object, siblings); - yaffs_DestroyObject(l); + yaffs_DeleteObject(l); + } + } + +} + +/* + * This code iterates through all the objects making sure that they are rooted. + * Any unrooted objects are re-rooted in lost+found. + * An object needs to be in one of: + * - Directly under deleted, unlinked + * - Directly or indirectly under root. + * + * Note: + * This code assumes that we don't ever change the current relationships between + * directories: + * rootDir->parent == unlinkedDir->parent == deletedDir->parent == NULL + * lostNfound->parent == rootDir + * + * This fixes the problem where directories might have inadvertently been deleted + * leaving the object "hanging" without being rooted in the directory tree. + */ + +static int yaffs_HasNULLParent(yaffs_Device *dev, yaffs_Object *obj) +{ + return (obj == dev->deletedDir || + obj == dev->unlinkedDir|| + obj == dev->rootDir); +} + +static void yaffs_FixHangingObjects(yaffs_Device *dev) +{ + yaffs_Object *obj; + yaffs_Object *parent; + int i; + struct ylist_head *lh; + struct ylist_head *n; + int depthLimit; + int hanging; + + + /* Iterate through the objects in each hash entry, + * looking at each object. + * Make sure it is rooted. + */ + + for (i = 0; i < YAFFS_NOBJECT_BUCKETS; i++) { + ylist_for_each_safe(lh, n, &dev->objectBucket[i].list) { + if (lh) { + obj = ylist_entry(lh, yaffs_Object, hashLink); + parent= obj->parent; + + if(yaffs_HasNULLParent(dev,obj)){ + /* These directories are not hanging */ + hanging = 0; + } + else if(!parent || parent->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) + hanging = 1; + else if(yaffs_HasNULLParent(dev,parent)) + hanging = 0; + else { + /* + * Need to follow the parent chain to see if it is hanging. + */ + hanging = 0; + depthLimit=100; + + while(parent != dev->rootDir && + parent->parent && + parent->parent->variantType == YAFFS_OBJECT_TYPE_DIRECTORY && + depthLimit > 0){ + parent = parent->parent; + depthLimit--; + } + if(parent != dev->rootDir) + hanging = 1; + } + if(hanging){ + T(YAFFS_TRACE_SCAN, + (TSTR("Hanging object %d moved to lost and found" TENDSTR), + obj->objectId)); + yaffs_AddObjectToDirectory(dev->lostNFoundDir,obj); + } + } + } + } +} + + +/* + * Delete directory contents for cleaning up lost and found. + */ +static void yaffs_DeleteDirectoryContents(yaffs_Object *dir) +{ + yaffs_Object *obj; + struct ylist_head *lh; + struct ylist_head *n; + + if(dir->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) + YBUG(); + + ylist_for_each_safe(lh, n, &dir->variant.directoryVariant.children) { + if (lh) { + obj = ylist_entry(lh, yaffs_Object, siblings); + if(obj->variantType == YAFFS_OBJECT_TYPE_DIRECTORY) + yaffs_DeleteDirectoryContents(obj); + + T(YAFFS_TRACE_SCAN, + (TSTR("Deleting lost_found object %d" TENDSTR), + obj->objectId)); + + /* Need to use UnlinkObject since Delete would not handle + * hardlinked objects correctly. + */ + yaffs_UnlinkObject(obj); } } + +} +static void yaffs_EmptyLostAndFound(yaffs_Device *dev) +{ + yaffs_DeleteDirectoryContents(dev->lostNFoundDir); } -static int yaffs_Scan(yaffs_Device * dev) +static int yaffs_Scan(yaffs_Device *dev) { yaffs_ExtendedTags tags; int blk; @@ -5562,16 +5967,16 @@ static int yaffs_Scan(yaffs_Device * dev) yaffs_ObjectHeader *oh; yaffs_Object *in; yaffs_Object *parent; - + int alloc_failed = 0; - + struct yaffs_ShadowFixerStruct *shadowFixerList = NULL; - + __u8 *chunkData; - - + + T(YAFFS_TRACE_SCAN, (TSTR("yaffs_Scan starts intstartblk %d intendblk %d..." TENDSTR), dev->internalStartBlock, dev->internalEndBlock)); @@ -5581,8 +5986,8 @@ static int yaffs_Scan(yaffs_Device * dev) dev->sequenceNumber = YAFFS_LOWEST_SEQUENCE_NUMBER; /* Scan all the blocks to determine their state */ + bi = dev->blockInfo; for (blk = dev->internalStartBlock; blk <= dev->internalEndBlock; blk++) { - bi = yaffs_GetBlockInfo(dev, blk); yaffs_ClearChunkBits(dev, blk); bi->pagesInUse = 0; bi->softDeletions = 0; @@ -5592,6 +5997,9 @@ static int yaffs_Scan(yaffs_Device * dev) bi->blockState = state; bi->sequenceNumber = sequenceNumber; + if (bi->sequenceNumber == YAFFS_SEQUENCE_BAD_BLOCK) + bi->blockState = state = YAFFS_BLOCK_STATE_DEAD; + T(YAFFS_TRACE_SCAN_DEBUG, (TSTR("Block scanning block %d state %d seq %d" TENDSTR), blk, state, sequenceNumber)); @@ -5603,8 +6011,9 @@ static int yaffs_Scan(yaffs_Device * dev) T(YAFFS_TRACE_SCAN_DEBUG, (TSTR("Block empty " TENDSTR))); dev->nErasedBlocks++; - dev->nFreeChunks += dev->nChunksPerBlock; - } + dev->nFreeChunks += dev->param.nChunksPerBlock; + } + bi++; } startIterator = dev->internalStartBlock; @@ -5613,11 +6022,11 @@ static int yaffs_Scan(yaffs_Device * dev) /* For each block.... */ for (blockIterator = startIterator; !alloc_failed && blockIterator <= endIterator; blockIterator++) { - + + YYIELD(); + YYIELD(); - YYIELD(); - blk = blockIterator; bi = yaffs_GetBlockInfo(dev, blk); @@ -5626,10 +6035,10 @@ static int yaffs_Scan(yaffs_Device * dev) deleted = 0; /* For each chunk in each block that needs scanning....*/ - for (c = 0; !alloc_failed && c < dev->nChunksPerBlock && + for (c = 0; !alloc_failed && c < dev->param.nChunksPerBlock && state == YAFFS_BLOCK_STATE_NEEDS_SCANNING; c++) { /* Read the tags and decide what to do */ - chunk = blk * dev->nChunksPerBlock + c; + chunk = blk * dev->param.nChunksPerBlock + c; result = yaffs_ReadChunkWithTagsFromNAND(dev, chunk, NULL, &tags); @@ -5645,7 +6054,7 @@ static int yaffs_Scan(yaffs_Device * dev) /*T((" %d %d deleted\n",blk,c)); */ } else if (!tags.chunkUsed) { /* An unassigned chunk in the block - * This means that either the block is empty or + * This means that either the block is empty or * this is the one being allocated from */ @@ -5662,12 +6071,12 @@ static int yaffs_Scan(yaffs_Device * dev) state = YAFFS_BLOCK_STATE_ALLOCATING; dev->allocationBlock = blk; dev->allocationPage = c; - dev->allocationBlockFinder = blk; - /* Set it to here to encourage the allocator to go forth from here. */ - + dev->allocationBlockFinder = blk; + /* Set block finder here to encourage the allocator to go forth from here. */ + } - dev->nFreeChunks += (dev->nChunksPerBlock - c); + dev->nFreeChunks += (dev->param.nChunksPerBlock - c); } else if (tags.chunkId > 0) { /* chunkId > 0 so it is a data chunk... */ unsigned int endpos; @@ -5682,25 +6091,25 @@ static int yaffs_Scan(yaffs_Device * dev) /* PutChunkIntoFile checks for a clash (two data chunks with * the same chunkId). */ - - if(!in) + + if (!in) alloc_failed = 1; - if(in){ - if(!yaffs_PutChunkIntoFile(in, tags.chunkId, chunk,1)) + if (in) { + if (!yaffs_PutChunkIntoFile(in, tags.chunkId, chunk, 1)) alloc_failed = 1; } - + endpos = (tags.chunkId - 1) * dev->nDataBytesPerChunk + tags.byteCount; - if (in && + if (in && in->variantType == YAFFS_OBJECT_TYPE_FILE && in->variant.fileVariant.scannedFileSize < endpos) { in->variant.fileVariant. scannedFileSize = endpos; - if (!dev->useHeaderFileSize) { + if (!dev->param.useHeaderFileSize) { in->variant.fileVariant. fileSize = in->variant.fileVariant. @@ -5726,11 +6135,11 @@ static int yaffs_Scan(yaffs_Device * dev) tags.objectId); if (in && in->variantType != oh->type) { /* This should not happen, but somehow - * Wev'e ended up with an objectId that has been reused but not yet + * Wev'e ended up with an objectId that has been reused but not yet * deleted, and worse still it has changed type. Delete the old object. */ - yaffs_DestroyObject(in); + yaffs_DeleteObject(in); in = 0; } @@ -5740,20 +6149,20 @@ static int yaffs_Scan(yaffs_Device * dev) objectId, oh->type); - if(!in) + if (!in) alloc_failed = 1; - + if (in && oh->shadowsObject > 0) { - + struct yaffs_ShadowFixerStruct *fixer; fixer = YMALLOC(sizeof(struct yaffs_ShadowFixerStruct)); - if(fixer){ - fixer-> next = shadowFixerList; + if (fixer) { + fixer->next = shadowFixerList; shadowFixerList = fixer; fixer->objectId = tags.objectId; fixer->shadowedId = oh->shadowsObject; } - + } if (in && in->valid) { @@ -5837,17 +6246,18 @@ static int yaffs_Scan(yaffs_Device * dev) yaffs_FindOrCreateObjectByNumber (dev, oh->parentObjectId, YAFFS_OBJECT_TYPE_DIRECTORY); - if (parent->variantType == + if (!parent) + alloc_failed = 1; + if (parent && parent->variantType == YAFFS_OBJECT_TYPE_UNKNOWN) { - /* Set up as a directory */ - parent->variantType = - YAFFS_OBJECT_TYPE_DIRECTORY; - YINIT_LIST_HEAD(&parent->variant. - directoryVariant. - children); - } else if (parent->variantType != - YAFFS_OBJECT_TYPE_DIRECTORY) - { + /* Set up as a directory */ + parent->variantType = + YAFFS_OBJECT_TYPE_DIRECTORY; + YINIT_LIST_HEAD(&parent->variant. + directoryVariant. + children); + } else if (!parent || parent->variantType != + YAFFS_OBJECT_TYPE_DIRECTORY) { /* Hoosterman, another problem.... * We're trying to use a non-directory as a directory */ @@ -5870,15 +6280,15 @@ static int yaffs_Scan(yaffs_Device * dev) * Since we might scan a hardlink before its equivalent object is scanned * we put them all in a list. * After scanning is complete, we should have all the objects, so we run through this - * list and fix up all the chains. + * list and fix up all the chains. */ switch (in->variantType) { - case YAFFS_OBJECT_TYPE_UNKNOWN: + case YAFFS_OBJECT_TYPE_UNKNOWN: /* Todo got a problem */ break; case YAFFS_OBJECT_TYPE_FILE: - if (dev->useHeaderFileSize) + if (dev->param.useHeaderFileSize) in->variant.fileVariant. fileSize = @@ -5887,33 +6297,27 @@ static int yaffs_Scan(yaffs_Device * dev) break; case YAFFS_OBJECT_TYPE_HARDLINK: in->variant.hardLinkVariant. - equivalentObjectId = - oh->equivalentObjectId; - in->hardLinks.next = - (struct ylist_head *) - hardList; - hardList = in; - break; + equivalentObjectId = + oh->equivalentObjectId; + in->hardLinks.next = + (struct ylist_head *) + hardList; + hardList = in; + break; case YAFFS_OBJECT_TYPE_DIRECTORY: /* Do nothing */ break; case YAFFS_OBJECT_TYPE_SPECIAL: /* Do nothing */ break; - case YAFFS_OBJECT_TYPE_SYMLINK: + case YAFFS_OBJECT_TYPE_SYMLINK: in->variant.symLinkVariant.alias = yaffs_CloneString(oh->alias); - if(!in->variant.symLinkVariant.alias) + if (!in->variant.symLinkVariant.alias) alloc_failed = 1; break; } -/* - if (parent == dev->deletedDir) { - yaffs_DestroyObject(in); - bi->hasShrinkHeader = 1; - } -*/ } } } @@ -5923,6 +6327,12 @@ static int yaffs_Scan(yaffs_Device * dev) state = YAFFS_BLOCK_STATE_FULL; } + if (state == YAFFS_BLOCK_STATE_ALLOCATING) { + /* If the block was partially allocated then treat it as fully allocated.*/ + state = YAFFS_BLOCK_STATE_FULL; + dev->allocationBlock = -1; + } + bi->blockState = state; /* Now let's see if it was dirty */ @@ -5934,47 +6344,46 @@ static int yaffs_Scan(yaffs_Device * dev) } - + /* Ok, we've done all the scanning. * Fix up the hard link chains. - * We should now have scanned all the objects, now it's time to add these + * We should now have scanned all the objects, now it's time to add these * hardlinks. */ - yaffs_HardlinkFixup(dev,hardList); - + yaffs_HardlinkFixup(dev, hardList); + /* Fix up any shadowed objects */ { struct yaffs_ShadowFixerStruct *fixer; yaffs_Object *obj; - - while(shadowFixerList){ + + while (shadowFixerList) { fixer = shadowFixerList; shadowFixerList = fixer->next; /* Complete the rename transaction by deleting the shadowed object * then setting the object header to unshadowed. */ - obj = yaffs_FindObjectByNumber(dev,fixer->shadowedId); - if(obj) - yaffs_DestroyObject(obj); - - obj = yaffs_FindObjectByNumber(dev,fixer->objectId); - if(obj){ - yaffs_UpdateObjectHeader(obj,NULL,1,0,0); - } - + obj = yaffs_FindObjectByNumber(dev, fixer->shadowedId); + if (obj) + yaffs_DeleteObject(obj); + + obj = yaffs_FindObjectByNumber(dev, fixer->objectId); + + if (obj) + yaffs_UpdateObjectHeader(obj, NULL, 1, 0, 0); + YFREE(fixer); } } yaffs_ReleaseTempBuffer(dev, chunkData, __LINE__); - if(alloc_failed){ + if (alloc_failed) return YAFFS_FAIL; - } - + T(YAFFS_TRACE_SCAN, (TSTR("yaffs_Scan ends" TENDSTR))); - + return YAFFS_OK; } @@ -5988,22 +6397,22 @@ static void yaffs_CheckObjectDetailsLoaded(yaffs_Object *in) int result; int alloc_failed = 0; - if(!in) + if (!in) return; - + dev = in->myDev; - + #if 0 - T(YAFFS_TRACE_SCAN,(TSTR("details for object %d %s loaded" TENDSTR), + T(YAFFS_TRACE_SCAN, (TSTR("details for object %d %s loaded" TENDSTR), in->objectId, in->lazyLoaded ? "not yet" : "already")); #endif - if(in->lazyLoaded && in->hdrChunk > 0){ + if (in->lazyLoaded && in->hdrChunk > 0) { in->lazyLoaded = 0; chunkData = yaffs_GetTempBuffer(dev, __LINE__); - result = yaffs_ReadChunkWithTagsFromNAND(dev,in->hdrChunk,chunkData,&tags); + result = yaffs_ReadChunkWithTagsFromNAND(dev, in->hdrChunk, chunkData, &tags); oh = (yaffs_ObjectHeader *) chunkData; in->yst_mode = oh->yst_mode; @@ -6021,22 +6430,22 @@ static void yaffs_CheckObjectDetailsLoaded(yaffs_Object *in) in->yst_mtime = oh->yst_mtime; in->yst_ctime = oh->yst_ctime; in->yst_rdev = oh->yst_rdev; - + #endif yaffs_SetObjectName(in, oh->name); - - if(in->variantType == YAFFS_OBJECT_TYPE_SYMLINK){ - in->variant.symLinkVariant.alias = + + if (in->variantType == YAFFS_OBJECT_TYPE_SYMLINK) { + in->variant.symLinkVariant.alias = yaffs_CloneString(oh->alias); - if(!in->variant.symLinkVariant.alias) + if (!in->variant.symLinkVariant.alias) alloc_failed = 1; /* Not returned to caller */ } - - yaffs_ReleaseTempBuffer(dev,chunkData, __LINE__); + + yaffs_ReleaseTempBuffer(dev, chunkData, __LINE__); } } -static int yaffs_ScanBackwards(yaffs_Device * dev) +static int yaffs_ScanBackwards(yaffs_Device *dev) { yaffs_ExtendedTags tags; int blk; @@ -6059,18 +6468,18 @@ static int yaffs_ScanBackwards(yaffs_Device * dev) int nBlocks = dev->internalEndBlock - dev->internalStartBlock + 1; int itsUnlinked; __u8 *chunkData; - + int fileSize; int isShrink; int foundChunksInBlock; int equivalentObjectId; int alloc_failed = 0; - + yaffs_BlockIndex *blockIndex = NULL; int altBlockIndex = 0; - if (!dev->isYaffs2) { + if (!dev->param.isYaffs2) { T(YAFFS_TRACE_SCAN, (TSTR("yaffs_ScanBackwards is only for YAFFS2!" TENDSTR))); return YAFFS_FAIL; @@ -6085,25 +6494,25 @@ static int yaffs_ScanBackwards(yaffs_Device * dev) dev->sequenceNumber = YAFFS_LOWEST_SEQUENCE_NUMBER; blockIndex = YMALLOC(nBlocks * sizeof(yaffs_BlockIndex)); - - if(!blockIndex) { + + if (!blockIndex) { blockIndex = YMALLOC_ALT(nBlocks * sizeof(yaffs_BlockIndex)); altBlockIndex = 1; } - - if(!blockIndex) { + + if (!blockIndex) { T(YAFFS_TRACE_SCAN, (TSTR("yaffs_Scan() could not allocate block index!" TENDSTR))); return YAFFS_FAIL; } - + dev->blocksInCheckpoint = 0; - + chunkData = yaffs_GetTempBuffer(dev, __LINE__); /* Scan all the blocks to determine their state */ + bi = dev->blockInfo; for (blk = dev->internalStartBlock; blk <= dev->internalEndBlock; blk++) { - bi = yaffs_GetBlockInfo(dev, blk); yaffs_ClearChunkBits(dev, blk); bi->pagesInUse = 0; bi->softDeletions = 0; @@ -6113,17 +6522,19 @@ static int yaffs_ScanBackwards(yaffs_Device * dev) bi->blockState = state; bi->sequenceNumber = sequenceNumber; - if(bi->sequenceNumber == YAFFS_SEQUENCE_CHECKPOINT_DATA) + if (bi->sequenceNumber == YAFFS_SEQUENCE_CHECKPOINT_DATA) bi->blockState = state = YAFFS_BLOCK_STATE_CHECKPOINT; - + if (bi->sequenceNumber == YAFFS_SEQUENCE_BAD_BLOCK) + bi->blockState = state = YAFFS_BLOCK_STATE_DEAD; + T(YAFFS_TRACE_SCAN_DEBUG, (TSTR("Block scanning block %d state %d seq %d" TENDSTR), blk, state, sequenceNumber)); - - if(state == YAFFS_BLOCK_STATE_CHECKPOINT){ + + if (state == YAFFS_BLOCK_STATE_CHECKPOINT) { dev->blocksInCheckpoint++; - + } else if (state == YAFFS_BLOCK_STATE_DEAD) { T(YAFFS_TRACE_BAD_BLOCKS, (TSTR("block %d is bad" TENDSTR), blk)); @@ -6131,7 +6542,7 @@ static int yaffs_ScanBackwards(yaffs_Device * dev) T(YAFFS_TRACE_SCAN_DEBUG, (TSTR("Block empty " TENDSTR))); dev->nErasedBlocks++; - dev->nFreeChunks += dev->nChunksPerBlock; + dev->nFreeChunks += dev->param.nChunksPerBlock; } else if (state == YAFFS_BLOCK_STATE_NEEDS_SCANNING) { /* Determine the highest sequence number */ @@ -6143,9 +6554,8 @@ static int yaffs_ScanBackwards(yaffs_Device * dev) nBlocksToScan++; - if (sequenceNumber >= dev->sequenceNumber) { + if (sequenceNumber >= dev->sequenceNumber) dev->sequenceNumber = sequenceNumber; - } } else { /* TODO: Nasty sequence number! */ T(YAFFS_TRACE_SCAN, @@ -6155,6 +6565,7 @@ static int yaffs_ScanBackwards(yaffs_Device * dev) } } + bi++; } T(YAFFS_TRACE_SCAN, @@ -6172,8 +6583,8 @@ static int yaffs_ScanBackwards(yaffs_Device * dev) } #else { - /* Dungy old bubble sort... */ - + /* Dungy old bubble sort... */ + yaffs_BlockIndex temp; int i; int j; @@ -6190,7 +6601,7 @@ static int yaffs_ScanBackwards(yaffs_Device * dev) YYIELD(); - T(YAFFS_TRACE_SCAN, (TSTR("...done" TENDSTR))); + T(YAFFS_TRACE_SCAN, (TSTR("...done" TENDSTR))); /* Now scan the blocks looking at the data. */ startIterator = 0; @@ -6200,32 +6611,32 @@ static int yaffs_ScanBackwards(yaffs_Device * dev) /* For each block.... backwards */ for (blockIterator = endIterator; !alloc_failed && blockIterator >= startIterator; - blockIterator--) { - /* Cooperative multitasking! This loop can run for so + blockIterator--) { + /* Cooperative multitasking! This loop can run for so long that watchdog timers expire. */ - YYIELD(); + YYIELD(); /* get the block to scan in the correct order */ blk = blockIndex[blockIterator].block; bi = yaffs_GetBlockInfo(dev, blk); - - + + state = bi->blockState; deleted = 0; /* For each chunk in each block that needs scanning.... */ foundChunksInBlock = 0; - for (c = dev->nChunksPerBlock - 1; + for (c = dev->param.nChunksPerBlock - 1; !alloc_failed && c >= 0 && (state == YAFFS_BLOCK_STATE_NEEDS_SCANNING || state == YAFFS_BLOCK_STATE_ALLOCATING); c--) { - /* Scan backwards... + /* Scan backwards... * Read the tags and decide what to do */ - - chunk = blk * dev->nChunksPerBlock + c; + + chunk = blk * dev->param.nChunksPerBlock + c; result = yaffs_ReadChunkWithTagsFromNAND(dev, chunk, NULL, &tags); @@ -6238,14 +6649,12 @@ static int yaffs_ScanBackwards(yaffs_Device * dev) * it is a chunk that was skipped due to failing the erased * check. Just skip it so that it can be deleted. * But, more typically, We get here when this is an unallocated - * chunk and his means that either the block is empty or + * chunk and his means that either the block is empty or * this is the one being allocated from */ - if(foundChunksInBlock) - { + if (foundChunksInBlock) { /* This is a chunk that was skipped due to failing the erased check */ - } else if (c == 0) { /* We're looking at the first chunk in the block so the block is unused */ state = YAFFS_BLOCK_STATE_EMPTY; @@ -6253,9 +6662,9 @@ static int yaffs_ScanBackwards(yaffs_Device * dev) } else { if (state == YAFFS_BLOCK_STATE_NEEDS_SCANNING || state == YAFFS_BLOCK_STATE_ALLOCATING) { - if(dev->sequenceNumber == bi->sequenceNumber) { + if (dev->sequenceNumber == bi->sequenceNumber) { /* this is the block being allocated from */ - + T(YAFFS_TRACE_SCAN, (TSTR (" Allocating from %d %d" @@ -6264,34 +6673,34 @@ static int yaffs_ScanBackwards(yaffs_Device * dev) state = YAFFS_BLOCK_STATE_ALLOCATING; dev->allocationBlock = blk; dev->allocationPage = c; - dev->allocationBlockFinder = blk; - } - else { + dev->allocationBlockFinder = blk; + } else { /* This is a partially written block that is not - * the current allocation block. This block must have - * had a write failure, so set up for retirement. + * the current allocation block. */ - - /* bi->needsRetiring = 1; ??? TODO */ - bi->gcPrioritise = 1; - + T(YAFFS_TRACE_ALWAYS, (TSTR("Partially written block %d detected" TENDSTR), blk)); } - } - } dev->nFreeChunks++; - + + } else if (tags.eccResult == YAFFS_ECC_RESULT_UNFIXED) { + T(YAFFS_TRACE_SCAN, + (TSTR(" Unfixed ECC in chunk(%d:%d), chunk ignored"TENDSTR), + blk, c)); + + dev->nFreeChunks++; + } else if (tags.chunkId > 0) { /* chunkId > 0 so it is a data chunk... */ unsigned int endpos; __u32 chunkBase = (tags.chunkId - 1) * dev->nDataBytesPerChunk; - + foundChunksInBlock = 1; @@ -6302,42 +6711,33 @@ static int yaffs_ScanBackwards(yaffs_Device * dev) tags. objectId, YAFFS_OBJECT_TYPE_FILE); - if(!in){ + if (!in) { /* Out of memory */ alloc_failed = 1; } - + if (in && in->variantType == YAFFS_OBJECT_TYPE_FILE - && chunkBase < - in->variant.fileVariant.shrinkSize) { + && chunkBase < in->variant.fileVariant.shrinkSize) { /* This has not been invalidated by a resize */ - if(!yaffs_PutChunkIntoFile(in, tags.chunkId, - chunk, -1)){ + if (!yaffs_PutChunkIntoFile(in, tags.chunkId, chunk, -1)) { alloc_failed = 1; } - /* File size is calculated by looking at the data chunks if we have not + /* File size is calculated by looking at the data chunks if we have not * seen an object header yet. Stop this practice once we find an object header. */ - endpos = - (tags.chunkId - - 1) * dev->nDataBytesPerChunk + - tags.byteCount; - + endpos = chunkBase + tags.byteCount; + if (!in->valid && /* have not got an object header yet */ - in->variant.fileVariant. - scannedFileSize < endpos) { - in->variant.fileVariant. - scannedFileSize = endpos; - in->variant.fileVariant. - fileSize = - in->variant.fileVariant. - scannedFileSize; + in->variant.fileVariant.scannedFileSize < endpos) { + in->variant.fileVariant.scannedFileSize = endpos; + in->variant.fileVariant.fileSize = endpos; } - } else if(in) { - /* This chunk has been invalidated by a resize, so delete */ + } else if (in) { + /* This chunk has been invalidated by a resize, or a past file deletion + * so delete the chunk*/ yaffs_DeleteChunk(dev, chunk, 1, __LINE__); } @@ -6354,23 +6754,22 @@ static int yaffs_ScanBackwards(yaffs_Device * dev) in = NULL; if (tags.extraHeaderInfoAvailable) { - in = yaffs_FindOrCreateObjectByNumber - (dev, tags.objectId, - tags.extraObjectType); + in = yaffs_FindOrCreateObjectByNumber(dev, + tags.objectId, + tags.extraObjectType); + if (!in) + alloc_failed = 1; } if (!in || -#ifdef CONFIG_YAFFS_DISABLE_LAZY_LOAD - !in->valid || -#endif + (!in->valid && dev->param.disableLazyLoad) || tags.extraShadows || (!in->valid && (tags.objectId == YAFFS_OBJECTID_ROOT || - tags.objectId == YAFFS_OBJECTID_LOSTNFOUND)) - ) { + tags.objectId == YAFFS_OBJECTID_LOSTNFOUND))) { /* If we don't have valid info then we need to read the chunk - * TODO In future we can probably defer reading the chunk and + * TODO In future we can probably defer reading the chunk and * living with invalid data until needed. */ @@ -6380,15 +6779,18 @@ static int yaffs_ScanBackwards(yaffs_Device * dev) NULL); oh = (yaffs_ObjectHeader *) chunkData; - - if(dev->inbandTags){ + + if (dev->param.inbandTags) { /* Fix up the header if they got corrupted by inband tags */ oh->shadowsObject = oh->inbandShadowsObject; oh->isShrink = oh->inbandIsShrink; } - if (!in) + if (!in) { in = yaffs_FindOrCreateObjectByNumber(dev, tags.objectId, oh->type); + if (!in) + alloc_failed = 1; + } } @@ -6398,21 +6800,20 @@ static int yaffs_ScanBackwards(yaffs_Device * dev) (TSTR ("yaffs tragedy: Could not make object for object %d at chunk %d during scan" TENDSTR), tags.objectId, chunk)); - + continue; } if (in->valid) { /* We have already filled this one. - * We have a duplicate that will be discarded, but + * We have a duplicate that will be discarded, but * we first have to suck out resize info if it is a file. */ - if ((in->variantType == YAFFS_OBJECT_TYPE_FILE) && - ((oh && - oh-> type == YAFFS_OBJECT_TYPE_FILE)|| + if ((in->variantType == YAFFS_OBJECT_TYPE_FILE) && + ((oh && + oh->type == YAFFS_OBJECT_TYPE_FILE) || (tags.extraHeaderInfoAvailable && - tags.extraObjectType == YAFFS_OBJECT_TYPE_FILE)) - ) { + tags.extraObjectType == YAFFS_OBJECT_TYPE_FILE))) { __u32 thisSize = (oh) ? oh->fileSize : tags. extraFileLength; @@ -6420,8 +6821,8 @@ static int yaffs_ScanBackwards(yaffs_Device * dev) (oh) ? oh-> parentObjectId : tags. extraParentObjectId; - - + + isShrink = (oh) ? oh->isShrink : tags. extraIsShrinkHeader; @@ -6437,17 +6838,11 @@ static int yaffs_ScanBackwards(yaffs_Device * dev) isShrink = 1; } - if (isShrink && - in->variant.fileVariant. - shrinkSize > thisSize) { - in->variant.fileVariant. - shrinkSize = - thisSize; - } + if (isShrink && in->variant.fileVariant.shrinkSize > thisSize) + in->variant.fileVariant.shrinkSize = thisSize; - if (isShrink) { + if (isShrink) bi->hasShrinkHeader = 1; - } } /* Use existing - destroy this one. */ @@ -6455,14 +6850,25 @@ static int yaffs_ScanBackwards(yaffs_Device * dev) } + if (!in->valid && in->variantType != + (oh ? oh->type : tags.extraObjectType)) + T(YAFFS_TRACE_ERROR, ( + TSTR("yaffs tragedy: Bad object type, " + TCONT("%d != %d, for object %d at chunk ") + TCONT("%d during scan") + TENDSTR), oh ? + oh->type : tags.extraObjectType, + in->variantType, tags.objectId, + chunk)); + if (!in->valid && (tags.objectId == YAFFS_OBJECTID_ROOT || tags.objectId == YAFFS_OBJECTID_LOSTNFOUND)) { /* We only load some info, don't fiddle with directory structure */ in->valid = 1; - - if(oh) { + + if (oh) { in->variantType = oh->type; in->yst_mode = oh->yst_mode; @@ -6480,7 +6886,7 @@ static int yaffs_ScanBackwards(yaffs_Device * dev) in->yst_mtime = oh->yst_mtime; in->yst_ctime = oh->yst_ctime; in->yst_rdev = oh->yst_rdev; - + #endif } else { in->variantType = tags.extraObjectType; @@ -6495,7 +6901,7 @@ static int yaffs_ScanBackwards(yaffs_Device * dev) in->valid = 1; in->hdrChunk = chunk; - if(oh) { + if (oh) { in->variantType = oh->type; in->yst_mode = oh->yst_mode; @@ -6515,30 +6921,30 @@ static int yaffs_ScanBackwards(yaffs_Device * dev) in->yst_rdev = oh->yst_rdev; #endif - if (oh->shadowsObject > 0) + if (oh->shadowsObject > 0) yaffs_HandleShadowedObject(dev, oh-> shadowsObject, 1); - + + yaffs_SetObjectName(in, oh->name); parent = yaffs_FindOrCreateObjectByNumber - (dev, oh->parentObjectId, - YAFFS_OBJECT_TYPE_DIRECTORY); + (dev, oh->parentObjectId, + YAFFS_OBJECT_TYPE_DIRECTORY); fileSize = oh->fileSize; - isShrink = oh->isShrink; + isShrink = oh->isShrink; equivalentObjectId = oh->equivalentObjectId; - } - else { + } else { in->variantType = tags.extraObjectType; parent = yaffs_FindOrCreateObjectByNumber - (dev, tags.extraParentObjectId, - YAFFS_OBJECT_TYPE_DIRECTORY); + (dev, tags.extraParentObjectId, + YAFFS_OBJECT_TYPE_DIRECTORY); fileSize = tags.extraFileLength; isShrink = tags.extraIsShrinkHeader; equivalentObjectId = tags.extraEquivalentObjectId; @@ -6547,21 +6953,23 @@ static int yaffs_ScanBackwards(yaffs_Device * dev) } in->dirty = 0; + if (!parent) + alloc_failed = 1; + /* directory stuff... * hook up to parent */ - if (parent->variantType == + if (parent && parent->variantType == YAFFS_OBJECT_TYPE_UNKNOWN) { - /* Set up as a directory */ - parent->variantType = - YAFFS_OBJECT_TYPE_DIRECTORY; - YINIT_LIST_HEAD(&parent->variant. - directoryVariant. - children); - } else if (parent->variantType != - YAFFS_OBJECT_TYPE_DIRECTORY) - { + /* Set up as a directory */ + parent->variantType = + YAFFS_OBJECT_TYPE_DIRECTORY; + YINIT_LIST_HEAD(&parent->variant. + directoryVariant. + children); + } else if (!parent || parent->variantType != + YAFFS_OBJECT_TYPE_DIRECTORY) { /* Hoosterman, another problem.... * We're trying to use a non-directory as a directory */ @@ -6587,11 +6995,11 @@ static int yaffs_ScanBackwards(yaffs_Device * dev) * Since we might scan a hardlink before its equivalent object is scanned * we put them all in a list. * After scanning is complete, we should have all the objects, so we run - * through this list and fix up all the chains. + * through this list and fix up all the chains. */ switch (in->variantType) { - case YAFFS_OBJECT_TYPE_UNKNOWN: + case YAFFS_OBJECT_TYPE_UNKNOWN: /* Todo got a problem */ break; case YAFFS_OBJECT_TYPE_FILE: @@ -6600,29 +7008,27 @@ static int yaffs_ScanBackwards(yaffs_Device * dev) scannedFileSize < fileSize) { /* This covers the case where the file size is greater * than where the data is - * This will happen if the file is resized to be larger + * This will happen if the file is resized to be larger * than its current data extents. */ in->variant.fileVariant.fileSize = fileSize; - in->variant.fileVariant.scannedFileSize = - in->variant.fileVariant.fileSize; + in->variant.fileVariant.scannedFileSize = fileSize; } - if (isShrink && - in->variant.fileVariant.shrinkSize > fileSize) { + if (in->variant.fileVariant.shrinkSize > fileSize) in->variant.fileVariant.shrinkSize = fileSize; - } + break; case YAFFS_OBJECT_TYPE_HARDLINK: - if(!itsUnlinked) { - in->variant.hardLinkVariant.equivalentObjectId = - equivalentObjectId; - in->hardLinks.next = - (struct ylist_head *) hardList; - hardList = in; - } - break; + if (!itsUnlinked) { + in->variant.hardLinkVariant.equivalentObjectId = + equivalentObjectId; + in->hardLinks.next = + (struct ylist_head *) hardList; + hardList = in; + } + break; case YAFFS_OBJECT_TYPE_DIRECTORY: /* Do nothing */ break; @@ -6630,18 +7036,17 @@ static int yaffs_ScanBackwards(yaffs_Device * dev) /* Do nothing */ break; case YAFFS_OBJECT_TYPE_SYMLINK: - if(oh){ - in->variant.symLinkVariant.alias = - yaffs_CloneString(oh-> - alias); - if(!in->variant.symLinkVariant.alias) - alloc_failed = 1; + if (oh) { + in->variant.symLinkVariant.alias = + yaffs_CloneString(oh->alias); + if (!in->variant.symLinkVariant.alias) + alloc_failed = 1; } break; } } - + } } /* End of scanning for each chunk */ @@ -6651,6 +7056,7 @@ static int yaffs_ScanBackwards(yaffs_Device * dev) state = YAFFS_BLOCK_STATE_FULL; } + bi->blockState = state; /* Now let's see if it was dirty */ @@ -6661,25 +7067,26 @@ static int yaffs_ScanBackwards(yaffs_Device * dev) } } + + yaffs_SkipRestOfBlock(dev); - if (altBlockIndex) + if (altBlockIndex) YFREE_ALT(blockIndex); else YFREE(blockIndex); - + /* Ok, we've done all the scanning. * Fix up the hard link chains. - * We should now have scanned all the objects, now it's time to add these + * We should now have scanned all the objects, now it's time to add these * hardlinks. */ - yaffs_HardlinkFixup(dev,hardList); - + yaffs_HardlinkFixup(dev, hardList); + yaffs_ReleaseTempBuffer(dev, chunkData, __LINE__); - - if(alloc_failed){ + + if (alloc_failed) return YAFFS_FAIL; - } T(YAFFS_TRACE_SCAN, (TSTR("yaffs_ScanBackwards ends" TENDSTR))); @@ -6690,113 +7097,171 @@ static int yaffs_ScanBackwards(yaffs_Device * dev) static void yaffs_VerifyObjectInDirectory(yaffs_Object *obj) { - struct ylist_head *lh; - yaffs_Object *listObj; - - int count = 0; + struct ylist_head *lh; + yaffs_Object *listObj; - if(!obj){ + int count = 0; + + if (!obj) { T(YAFFS_TRACE_ALWAYS, (TSTR("No object to verify" TENDSTR))); YBUG(); + return; } - if(yaffs_SkipVerification(obj->myDev)) - return; + if (yaffs_SkipVerification(obj->myDev)) + return; - if(!obj->parent){ + if (!obj->parent) { T(YAFFS_TRACE_ALWAYS, (TSTR("Object does not have parent" TENDSTR))); YBUG(); + return; } - - if(obj->parent->variantType != YAFFS_OBJECT_TYPE_DIRECTORY){ + + if (obj->parent->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) { T(YAFFS_TRACE_ALWAYS, (TSTR("Parent is not directory" TENDSTR))); YBUG(); } - - /* Iterate through the objects in each hash entry */ - - ylist_for_each(lh, &obj->parent->variant.directoryVariant.children) { + + /* Iterate through the objects in each hash entry */ + + ylist_for_each(lh, &obj->parent->variant.directoryVariant.children) { if (lh) { - listObj = ylist_entry(lh, yaffs_Object, siblings); + listObj = ylist_entry(lh, yaffs_Object, siblings); yaffs_VerifyObject(listObj); - if(obj == listObj) - count ++; - } + if (obj == listObj) + count++; + } } - - if(count != 1){ - T(YAFFS_TRACE_ALWAYS, (TSTR("Object in directory %d times" TENDSTR),count)); + + if (count != 1) { + T(YAFFS_TRACE_ALWAYS, (TSTR("Object in directory %d times" TENDSTR), count)); YBUG(); } - } static void yaffs_VerifyDirectory(yaffs_Object *directory) { + struct ylist_head *lh; + yaffs_Object *listObj; - struct ylist_head *lh; - yaffs_Object *listObj; - - if(!directory) + if (!directory) { YBUG(); + return; + } - if(yaffs_SkipFullVerification(directory->myDev)) - return; + if (yaffs_SkipFullVerification(directory->myDev)) + return; - - if(directory->variantType != YAFFS_OBJECT_TYPE_DIRECTORY){ - T(YAFFS_TRACE_ALWAYS, (TSTR("Directory has wrong type: %d" TENDSTR),directory->variantType)); + if (directory->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) { + T(YAFFS_TRACE_ALWAYS, (TSTR("Directory has wrong type: %d" TENDSTR), directory->variantType)); YBUG(); } - - /* Iterate through the objects in each hash entry */ - - ylist_for_each(lh, &directory->variant.directoryVariant.children) { + + /* Iterate through the objects in each hash entry */ + + ylist_for_each(lh, &directory->variant.directoryVariant.children) { if (lh) { - listObj = ylist_entry(lh, yaffs_Object, siblings); - if(listObj->parent != directory){ - T(YAFFS_TRACE_ALWAYS, (TSTR("Object in directory list has wrong parent %p" TENDSTR),listObj->parent)); + listObj = ylist_entry(lh, yaffs_Object, siblings); + if (listObj->parent != directory) { + T(YAFFS_TRACE_ALWAYS, (TSTR("Object in directory list has wrong parent %p" TENDSTR), listObj->parent)); YBUG(); } yaffs_VerifyObjectInDirectory(listObj); - } - } - + } + } +} + +/* + *yaffs_UpdateParent() handles fixing a directories mtime and ctime when a new + * link (ie. name) is created or deleted in the directory. + * + * ie. + * create dir/a : update dir's mtime/ctime + * rm dir/a: update dir's mtime/ctime + * modify dir/a: don't update dir's mtimme/ctime + * + * This can be handled immediately or defered. Defering helps reduce the number + * of updates when many files in a directory are changed within a brief period. + * + * If the directory updating is defered then yaffs_UpdateDirtyDirecories must be + * called periodically. + */ + +static void yaffs_UpdateParent(yaffs_Object *obj) +{ + yaffs_Device *dev; + if(!obj) + return; + + dev = obj->myDev; + obj->dirty = 1; + obj->yst_mtime = obj->yst_ctime = Y_CURRENT_TIME; + if(dev->param.deferDirectoryUpdate){ + struct ylist_head *link = &obj->variant.directoryVariant.dirty; + + if(ylist_empty(link)){ + ylist_add(link,&dev->dirtyDirectories); + T(YAFFS_TRACE_BACKGROUND, (TSTR("Added object %d to dirty directories" TENDSTR),obj->objectId)); + } + + } else + yaffs_UpdateObjectHeader(obj,NULL,0,0,0); } +void yaffs_UpdateDirtyDirectories(yaffs_Device *dev) +{ + struct ylist_head *link; + yaffs_Object *obj; + yaffs_DirectoryStructure *dS; + yaffs_ObjectVariant *oV; + + T(YAFFS_TRACE_BACKGROUND, (TSTR("Update dirty directories" TENDSTR))); + + while(!ylist_empty(&dev->dirtyDirectories)){ + link = dev->dirtyDirectories.next; + ylist_del_init(link); + + dS=ylist_entry(link,yaffs_DirectoryStructure,dirty); + oV = ylist_entry(dS,yaffs_ObjectVariant,directoryVariant); + obj = ylist_entry(oV,yaffs_Object,variant); + + T(YAFFS_TRACE_BACKGROUND, (TSTR("Update directory %d" TENDSTR), obj->objectId)); + + if(obj->dirty) + yaffs_UpdateObjectHeader(obj,NULL,0,0,0); + } +} -static void yaffs_RemoveObjectFromDirectory(yaffs_Object * obj) +static void yaffs_RemoveObjectFromDirectory(yaffs_Object *obj) { yaffs_Device *dev = obj->myDev; yaffs_Object *parent; - - yaffs_VerifyObjectInDirectory(obj); + + yaffs_VerifyObjectInDirectory(obj); parent = obj->parent; - + yaffs_VerifyDirectory(parent); - if(dev && dev->removeObjectCallback) - dev->removeObjectCallback(obj); + if (dev && dev->param.removeObjectCallback) + dev->param.removeObjectCallback(obj); - - ylist_del_init(&obj->siblings); - obj->parent = NULL; + ylist_del_init(&obj->siblings); + obj->parent = NULL; + yaffs_VerifyDirectory(parent); - } - -static void yaffs_AddObjectToDirectory(yaffs_Object * directory, - yaffs_Object * obj) +static void yaffs_AddObjectToDirectory(yaffs_Object *directory, + yaffs_Object *obj) { - if (!directory) { T(YAFFS_TRACE_ALWAYS, (TSTR ("tragedy: Trying to add an object to a null pointer directory" TENDSTR))); YBUG(); + return; } if (directory->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) { T(YAFFS_TRACE_ALWAYS, @@ -6806,50 +7271,44 @@ static void yaffs_AddObjectToDirectory(yaffs_Object * directory, YBUG(); } - if (obj->siblings.prev == NULL) { - /* Not initialised */ - YBUG(); - - } else if (ylist_empty(&obj->siblings)) { - YBUG(); - } + if (obj->siblings.prev == NULL) { + /* Not initialised */ + YBUG(); + } yaffs_VerifyDirectory(directory); yaffs_RemoveObjectFromDirectory(obj); - - - /* Now add it */ - ylist_add(&obj->siblings, &directory->variant.directoryVariant.children); - obj->parent = directory; - - if (directory == obj->myDev->unlinkedDir - || directory == obj->myDev->deletedDir) { + + + /* Now add it */ + ylist_add(&obj->siblings, &directory->variant.directoryVariant.children); + obj->parent = directory; + + if (directory == obj->myDev->unlinkedDir + || directory == obj->myDev->deletedDir) { obj->unlinked = 1; obj->myDev->nUnlinkedFiles++; obj->renameAllowed = 0; } yaffs_VerifyDirectory(directory); - yaffs_VerifyObjectInDirectory(obj); - - + yaffs_VerifyObjectInDirectory(obj); } -yaffs_Object *yaffs_FindObjectByName(yaffs_Object * directory, - const YCHAR * name) +yaffs_Object *yaffs_FindObjectByName(yaffs_Object *directory, + const YCHAR *name) { - int sum; + int sum; - struct ylist_head *i; - YCHAR buffer[YAFFS_MAX_NAME_LENGTH + 1]; + struct ylist_head *i; + YCHAR buffer[YAFFS_MAX_NAME_LENGTH + 1]; - yaffs_Object *l; + yaffs_Object *l; - if (!name) { + if (!name) return NULL; - } if (!directory) { T(YAFFS_TRACE_ALWAYS, @@ -6857,6 +7316,7 @@ yaffs_Object *yaffs_FindObjectByName(yaffs_Object * directory, ("tragedy: yaffs_FindObjectByName: null pointer directory" TENDSTR))); YBUG(); + return NULL; } if (directory->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) { T(YAFFS_TRACE_ALWAYS, @@ -6865,32 +7325,29 @@ yaffs_Object *yaffs_FindObjectByName(yaffs_Object * directory, YBUG(); } - sum = yaffs_CalcNameSum(name); + sum = yaffs_CalcNameSum(name); + + ylist_for_each(i, &directory->variant.directoryVariant.children) { + if (i) { + l = ylist_entry(i, yaffs_Object, siblings); + + if (l->parent != directory) + YBUG(); - ylist_for_each(i, &directory->variant.directoryVariant.children) { - if (i) { - l = ylist_entry(i, yaffs_Object, siblings); - - if(l->parent != directory) - YBUG(); - - yaffs_CheckObjectDetailsLoaded(l); + yaffs_CheckObjectDetailsLoaded(l); /* Special case for lost-n-found */ if (l->objectId == YAFFS_OBJECTID_LOSTNFOUND) { - if (yaffs_strcmp(name, YAFFS_LOSTNFOUND_NAME) == 0) { + if (yaffs_strcmp(name, YAFFS_LOSTNFOUND_NAME) == 0) return l; - } - } else if (yaffs_SumCompare(l->sum, sum) || l->hdrChunk <= 0){ + } else if (yaffs_SumCompare(l->sum, sum) || l->hdrChunk <= 0) { /* LostnFound chunk called Objxxx * Do a real check */ yaffs_GetObjectName(l, buffer, - YAFFS_MAX_NAME_LENGTH); - if (yaffs_strncmp(name, buffer,YAFFS_MAX_NAME_LENGTH) == 0) { + YAFFS_MAX_NAME_LENGTH + 1); + if (yaffs_strncmp(name, buffer, YAFFS_MAX_NAME_LENGTH) == 0) return l; - } - } } } @@ -6900,32 +7357,33 @@ yaffs_Object *yaffs_FindObjectByName(yaffs_Object * directory, #if 0 -int yaffs_ApplyToDirectoryChildren(yaffs_Object * theDir, - int (*fn) (yaffs_Object *)) +int yaffs_ApplyToDirectoryChildren(yaffs_Object *theDir, + int (*fn) (yaffs_Object *)) { - struct ylist_head *i; - yaffs_Object *l; + struct ylist_head *i; + yaffs_Object *l; - if (!theDir) { + if (!theDir) { T(YAFFS_TRACE_ALWAYS, (TSTR ("tragedy: yaffs_FindObjectByName: null pointer directory" TENDSTR))); YBUG(); + return YAFFS_FAIL; } if (theDir->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) { T(YAFFS_TRACE_ALWAYS, (TSTR ("tragedy: yaffs_FindObjectByName: non-directory" TENDSTR))); - YBUG(); - } - - ylist_for_each(i, &theDir->variant.directoryVariant.children) { - if (i) { - l = ylist_entry(i, yaffs_Object, siblings); - if (l && !fn(l)) { - return YAFFS_FAIL; - } + YBUG(); + return YAFFS_FAIL; + } + + ylist_for_each(i, &theDir->variant.directoryVariant.children) { + if (i) { + l = ylist_entry(i, yaffs_Object, siblings); + if (l && !fn(l)) + return YAFFS_FAIL; } } @@ -6938,7 +7396,7 @@ int yaffs_ApplyToDirectoryChildren(yaffs_Object * theDir, * actual object. */ -yaffs_Object *yaffs_GetEquivalentObject(yaffs_Object * obj) +yaffs_Object *yaffs_GetEquivalentObject(yaffs_Object *obj) { if (obj && obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK) { /* We want the object id of the equivalent object, not this one */ @@ -6946,13 +7404,12 @@ yaffs_Object *yaffs_GetEquivalentObject(yaffs_Object * obj) yaffs_CheckObjectDetailsLoaded(obj); } return obj; - } -int yaffs_GetObjectName(yaffs_Object * obj, YCHAR * name, int buffSize) +int yaffs_GetObjectName(yaffs_Object *obj, YCHAR *name, int buffSize) { memset(name, 0, buffSize * sizeof(YCHAR)); - + yaffs_CheckObjectDetailsLoaded(obj); if (obj->objectId == YAFFS_OBJECTID_LOSTNFOUND) { @@ -6963,21 +7420,20 @@ int yaffs_GetObjectName(yaffs_Object * obj, YCHAR * name, int buffSize) YCHAR *x = &numString[19]; unsigned v = obj->objectId; numString[19] = 0; - while(v>0){ + while (v > 0) { x--; *x = '0' + (v % 10); v /= 10; } /* make up a name */ yaffs_strcpy(locName, YAFFS_LOSTNFOUND_PREFIX); - yaffs_strcat(locName,x); + yaffs_strcat(locName, x); yaffs_strncpy(name, locName, buffSize - 1); } #ifdef CONFIG_YAFFS_SHORT_NAMES_IN_RAM - else if (obj->shortName[0]) { - yaffs_strcpy(name, obj->shortName); - } + else if (obj->shortName[0]) + yaffs_strncpy(name, obj->shortName,YAFFS_SHORT_NAME_LENGTH+1); #endif else { int result; @@ -6993,53 +7449,53 @@ int yaffs_GetObjectName(yaffs_Object * obj, YCHAR * name, int buffSize) NULL); } yaffs_strncpy(name, oh->name, buffSize - 1); + name[buffSize-1]=0; yaffs_ReleaseTempBuffer(obj->myDev, buffer, __LINE__); } - return yaffs_strlen(name); + return yaffs_strnlen(name,buffSize-1); } -int yaffs_GetObjectFileLength(yaffs_Object * obj) +int yaffs_GetObjectFileLength(yaffs_Object *obj) { - /* Dereference any hard linking */ obj = yaffs_GetEquivalentObject(obj); - if (obj->variantType == YAFFS_OBJECT_TYPE_FILE) { + if (obj->variantType == YAFFS_OBJECT_TYPE_FILE) return obj->variant.fileVariant.fileSize; - } - if (obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK) { - return yaffs_strlen(obj->variant.symLinkVariant.alias); + if (obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK){ + if(!obj->variant.symLinkVariant.alias) + return 0; + return yaffs_strnlen(obj->variant.symLinkVariant.alias,YAFFS_MAX_ALIAS_LENGTH); } else { /* Only a directory should drop through to here */ return obj->myDev->nDataBytesPerChunk; } } -int yaffs_GetObjectLinkCount(yaffs_Object * obj) +int yaffs_GetObjectLinkCount(yaffs_Object *obj) { - int count = 0; - struct ylist_head *i; + int count = 0; + struct ylist_head *i; - if (!obj->unlinked) { - count++; /* the object itself */ - } - ylist_for_each(i, &obj->hardLinks) { - count++; /* add the hard links; */ - } - return count; + if (!obj->unlinked) + count++; /* the object itself */ + ylist_for_each(i, &obj->hardLinks) + count++; /* add the hard links; */ + + return count; } -int yaffs_GetObjectInode(yaffs_Object * obj) +int yaffs_GetObjectInode(yaffs_Object *obj) { obj = yaffs_GetEquivalentObject(obj); return obj->objectId; } -unsigned yaffs_GetObjectType(yaffs_Object * obj) +unsigned yaffs_GetObjectType(yaffs_Object *obj) { obj = yaffs_GetEquivalentObject(obj); @@ -7071,19 +7527,18 @@ unsigned yaffs_GetObjectType(yaffs_Object * obj) } } -YCHAR *yaffs_GetSymlinkAlias(yaffs_Object * obj) +YCHAR *yaffs_GetSymlinkAlias(yaffs_Object *obj) { obj = yaffs_GetEquivalentObject(obj); - if (obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK) { + if (obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK) return yaffs_CloneString(obj->variant.symLinkVariant.alias); - } else { + else return yaffs_CloneString(_Y("")); - } } #ifndef CONFIG_YAFFS_WINCE -int yaffs_SetAttributes(yaffs_Object * obj, struct iattr *attr) +int yaffs_SetAttributes(yaffs_Object *obj, struct iattr *attr) { unsigned int valid = attr->ia_valid; @@ -7109,7 +7564,7 @@ int yaffs_SetAttributes(yaffs_Object * obj, struct iattr *attr) return YAFFS_OK; } -int yaffs_GetAttributes(yaffs_Object * obj, struct iattr *attr) +int yaffs_GetAttributes(yaffs_Object *obj, struct iattr *attr) { unsigned int valid = 0; @@ -7133,17 +7588,16 @@ int yaffs_GetAttributes(yaffs_Object * obj, struct iattr *attr) attr->ia_valid = valid; return YAFFS_OK; - } #endif #if 0 -int yaffs_DumpObject(yaffs_Object * obj) +int yaffs_DumpObject(yaffs_Object *obj) { YCHAR name[257]; - yaffs_GetObjectName(obj, name, 256); + yaffs_GetObjectName(obj, name, YAFFS_MAX_NAME_LENGTH + 1); T(YAFFS_TRACE_ALWAYS, (TSTR @@ -7159,47 +7613,49 @@ int yaffs_DumpObject(yaffs_Object * obj) /*---------------------------- Initialisation code -------------------------------------- */ -static int yaffs_CheckDevFunctions(const yaffs_Device * dev) +static int yaffs_CheckDevFunctions(const yaffs_Device *dev) { /* Common functions, gotta have */ - if (!dev->eraseBlockInNAND || !dev->initialiseNAND) + if (!dev->param.eraseBlockInNAND || !dev->param.initialiseNAND) return 0; #ifdef CONFIG_YAFFS_YAFFS2 /* Can use the "with tags" style interface for yaffs1 or yaffs2 */ - if (dev->writeChunkWithTagsToNAND && - dev->readChunkWithTagsFromNAND && - !dev->writeChunkToNAND && - !dev->readChunkFromNAND && - dev->markNANDBlockBad && dev->queryNANDBlock) + if (dev->param.writeChunkWithTagsToNAND && + dev->param.readChunkWithTagsFromNAND && + !dev->param.writeChunkToNAND && + !dev->param.readChunkFromNAND && + dev->param.markNANDBlockBad && + dev->param.queryNANDBlock) return 1; #endif /* Can use the "spare" style interface for yaffs1 */ - if (!dev->isYaffs2 && - !dev->writeChunkWithTagsToNAND && - !dev->readChunkWithTagsFromNAND && - dev->writeChunkToNAND && - dev->readChunkFromNAND && - !dev->markNANDBlockBad && !dev->queryNANDBlock) + if (!dev->param.isYaffs2 && + !dev->param.writeChunkWithTagsToNAND && + !dev->param.readChunkWithTagsFromNAND && + dev->param.writeChunkToNAND && + dev->param.readChunkFromNAND && + !dev->param.markNANDBlockBad && + !dev->param.queryNANDBlock) return 1; - return 0; /* bad */ + return 0; /* bad */ } static int yaffs_CreateInitialDirectories(yaffs_Device *dev) { /* Initialise the unlinked, deleted, root and lost and found directories */ - + dev->lostNFoundDir = dev->rootDir = NULL; dev->unlinkedDir = dev->deletedDir = NULL; dev->unlinkedDir = yaffs_CreateFakeDirectory(dev, YAFFS_OBJECTID_UNLINKED, S_IFDIR); - + dev->deletedDir = yaffs_CreateFakeDirectory(dev, YAFFS_OBJECTID_DELETED, S_IFDIR); @@ -7209,16 +7665,16 @@ static int yaffs_CreateInitialDirectories(yaffs_Device *dev) dev->lostNFoundDir = yaffs_CreateFakeDirectory(dev, YAFFS_OBJECTID_LOSTNFOUND, YAFFS_LOSTNFOUND_MODE | S_IFDIR); - - if(dev->lostNFoundDir && dev->rootDir && dev->unlinkedDir && dev->deletedDir){ + + if (dev->lostNFoundDir && dev->rootDir && dev->unlinkedDir && dev->deletedDir) { yaffs_AddObjectToDirectory(dev->rootDir, dev->lostNFoundDir); return YAFFS_OK; } - + return YAFFS_FAIL; } -int yaffs_GutsInitialise(yaffs_Device * dev) +int yaffs_GutsInitialise(yaffs_Device *dev) { int init_failed = 0; unsigned x; @@ -7233,36 +7689,35 @@ int yaffs_GutsInitialise(yaffs_Device * dev) return YAFFS_FAIL; } - dev->internalStartBlock = dev->startBlock; - dev->internalEndBlock = dev->endBlock; + dev->internalStartBlock = dev->param.startBlock; + dev->internalEndBlock = dev->param.endBlock; dev->blockOffset = 0; dev->chunkOffset = 0; dev->nFreeChunks = 0; - + dev->gcBlock = -1; - if (dev->startBlock == 0) { - dev->internalStartBlock = dev->startBlock + 1; - dev->internalEndBlock = dev->endBlock + 1; + if (dev->param.startBlock == 0) { + dev->internalStartBlock = dev->param.startBlock + 1; + dev->internalEndBlock = dev->param.endBlock + 1; dev->blockOffset = 1; - dev->chunkOffset = dev->nChunksPerBlock; + dev->chunkOffset = dev->param.nChunksPerBlock; } /* Check geometry parameters. */ - if ((!dev->inbandTags && dev->isYaffs2 && dev->totalBytesPerChunk < 1024) || - (!dev->isYaffs2 && dev->totalBytesPerChunk < 512) || - (dev->inbandTags && !dev->isYaffs2 ) || - dev->nChunksPerBlock < 2 || - dev->nReservedBlocks < 2 || - dev->internalStartBlock <= 0 || - dev->internalEndBlock <= 0 || - dev->internalEndBlock <= (dev->internalStartBlock + dev->nReservedBlocks + 2) // otherwise it is too small - ) { + if ((!dev->param.inbandTags && dev->param.isYaffs2 && dev->param.totalBytesPerChunk < 1024) || + (!dev->param.isYaffs2 && dev->param.totalBytesPerChunk < 512) || + (dev->param.inbandTags && !dev->param.isYaffs2) || + dev->param.nChunksPerBlock < 2 || + dev->param.nReservedBlocks < 2 || + dev->internalStartBlock <= 0 || + dev->internalEndBlock <= 0 || + dev->internalEndBlock <= (dev->internalStartBlock + dev->param.nReservedBlocks + 2)) { /* otherwise it is too small */ T(YAFFS_TRACE_ALWAYS, (TSTR ("yaffs: NAND geometry problems: chunk size %d, type is yaffs%s, inbandTags %d " - TENDSTR), dev->totalBytesPerChunk, dev->isYaffs2 ? "2" : "", dev->inbandTags)); + TENDSTR), dev->param.totalBytesPerChunk, dev->param.isYaffs2 ? "2" : "", dev->param.inbandTags)); return YAFFS_FAIL; } @@ -7271,12 +7726,12 @@ int yaffs_GutsInitialise(yaffs_Device * dev) (TSTR("yaffs: InitialiseNAND failed" TENDSTR))); return YAFFS_FAIL; } - + /* Sort out space for inband tags, if required */ - if(dev->inbandTags) - dev->nDataBytesPerChunk = dev->totalBytesPerChunk - sizeof(yaffs_PackedTags2TagsPart); - else - dev->nDataBytesPerChunk = dev->totalBytesPerChunk; + if (dev->param.inbandTags) + dev->nDataBytesPerChunk = dev->param.totalBytesPerChunk - sizeof(yaffs_PackedTags2TagsPart); + else + dev->nDataBytesPerChunk = dev->param.totalBytesPerChunk; /* Got the right mix of functions? */ if (!yaffs_CheckDevFunctions(dev)) { @@ -7306,9 +7761,9 @@ int yaffs_GutsInitialise(yaffs_Device * dev) dev->isMounted = 1; /* OK now calculate a few things for the device */ - + /* - * Calculate all the chunk size manipulation numbers: + * Calculate all the chunk size manipulation numbers: */ x = dev->nDataBytesPerChunk; /* We always use dev->chunkShift and dev->chunkDiv */ @@ -7317,46 +7772,45 @@ int yaffs_GutsInitialise(yaffs_Device * dev) dev->chunkDiv = x; /* We only use chunk mask if chunkDiv is 1 */ dev->chunkMask = (1<chunkShift) - 1; - + /* * Calculate chunkGroupBits. * We need to find the next power of 2 > than internalEndBlock */ - x = dev->nChunksPerBlock * (dev->internalEndBlock + 1); - + x = dev->param.nChunksPerBlock * (dev->internalEndBlock + 1); + bits = ShiftsGE(x); - + /* Set up tnode width if wide tnodes are enabled. */ - if(!dev->wideTnodesDisabled){ + if (!dev->param.wideTnodesDisabled) { /* bits must be even so that we end up with 32-bit words */ - if(bits & 1) + if (bits & 1) bits++; - if(bits < 16) + if (bits < 16) dev->tnodeWidth = 16; else dev->tnodeWidth = bits; - } - else + } else dev->tnodeWidth = 16; - + dev->tnodeMask = (1<tnodeWidth)-1; - + /* Level0 Tnodes are 16 bits or wider (if wide tnodes are enabled), * so if the bitwidth of the * chunk range we're using is greater than 16 we need * to figure out chunk shift and chunkGroupSize */ - + if (bits <= dev->tnodeWidth) dev->chunkGroupBits = 0; else dev->chunkGroupBits = bits - dev->tnodeWidth; - + dev->chunkGroupSize = 1 << dev->chunkGroupBits; - if (dev->nChunksPerBlock < dev->chunkGroupSize) { + if (dev->param.nChunksPerBlock < dev->chunkGroupSize) { /* We have a problem because the soft delete won't work if * the chunk group size > chunks per block. * This can be remedied by using larger "virtual blocks". @@ -7386,82 +7840,83 @@ 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 */ + YINIT_LIST_HEAD(&dev->dirtyDirectories); + dev->oldestDirtySequence = 0; /* Initialise temporary buffers and caches. */ - if(!yaffs_InitialiseTempBuffers(dev)) + if (!yaffs_InitialiseTempBuffers(dev)) init_failed = 1; - + dev->srCache = NULL; dev->gcCleanupList = NULL; - - + + if (!init_failed && - dev->nShortOpCaches > 0) { + dev->param.nShortOpCaches > 0) { int i; void *buf; - int srCacheBytes = dev->nShortOpCaches * sizeof(yaffs_ChunkCache); + int srCacheBytes = dev->param.nShortOpCaches * sizeof(yaffs_ChunkCache); - if (dev->nShortOpCaches > YAFFS_MAX_SHORT_OP_CACHES) { - dev->nShortOpCaches = YAFFS_MAX_SHORT_OP_CACHES; - } + if (dev->param.nShortOpCaches > YAFFS_MAX_SHORT_OP_CACHES) + dev->param.nShortOpCaches = YAFFS_MAX_SHORT_OP_CACHES; dev->srCache = YMALLOC(srCacheBytes); - + buf = (__u8 *) dev->srCache; - - if(dev->srCache) - memset(dev->srCache,0,srCacheBytes); - - for (i = 0; i < dev->nShortOpCaches && buf; i++) { + + if (dev->srCache) + memset(dev->srCache, 0, srCacheBytes); + + for (i = 0; i < dev->param.nShortOpCaches && buf; i++) { dev->srCache[i].object = NULL; dev->srCache[i].lastUse = 0; dev->srCache[i].dirty = 0; - dev->srCache[i].data = buf = YMALLOC_DMA(dev->totalBytesPerChunk); + dev->srCache[i].data = buf = YMALLOC_DMA(dev->param.totalBytesPerChunk); } - if(!buf) + if (!buf) init_failed = 1; - + dev->srLastUse = 0; } dev->cacheHits = 0; - - if(!init_failed){ - dev->gcCleanupList = YMALLOC(dev->nChunksPerBlock * sizeof(__u32)); - if(!dev->gcCleanupList) + + if (!init_failed) { + dev->gcCleanupList = YMALLOC(dev->param.nChunksPerBlock * sizeof(__u32)); + if (!dev->gcCleanupList) init_failed = 1; } - if (dev->isYaffs2) { - dev->useHeaderFileSize = 1; - } - if(!init_failed && !yaffs_InitialiseBlocks(dev)) + if (dev->param.isYaffs2) + dev->param.useHeaderFileSize = 1; + + if (!init_failed && !yaffs_InitialiseBlocks(dev)) init_failed = 1; - + yaffs_InitialiseTnodes(dev); yaffs_InitialiseObjects(dev); - if(!init_failed && !yaffs_CreateInitialDirectories(dev)) + if (!init_failed && !yaffs_CreateInitialDirectories(dev)) init_failed = 1; - if(!init_failed){ + if (!init_failed) { /* Now scan the flash. */ - if (dev->isYaffs2) { - if(yaffs_CheckpointRestore(dev)) { + if (dev->param.isYaffs2) { + if (yaffs_CheckpointRestore(dev)) { yaffs_CheckObjectDetailsLoaded(dev->rootDir); T(YAFFS_TRACE_ALWAYS, (TSTR("yaffs: restored from checkpoint" TENDSTR))); } else { - /* Clean up the mess caused by an aborted checkpoint load - * and scan backwards. + /* Clean up the mess caused by an aborted checkpoint load + * and scan backwards. */ yaffs_DeinitialiseBlocks(dev); yaffs_DeinitialiseTnodes(dev); yaffs_DeinitialiseObjects(dev); - - + + dev->nErasedBlocks = 0; dev->nFreeChunks = 0; dev->allocationBlock = -1; @@ -7469,28 +7924,29 @@ int yaffs_GutsInitialise(yaffs_Device * dev) dev->nDeletedFiles = 0; dev->nUnlinkedFiles = 0; dev->nBackgroundDeletions = 0; - dev->oldestDirtySequence = 0; - if(!init_failed && !yaffs_InitialiseBlocks(dev)) + if (!init_failed && !yaffs_InitialiseBlocks(dev)) init_failed = 1; - + yaffs_InitialiseTnodes(dev); yaffs_InitialiseObjects(dev); - if(!init_failed && !yaffs_CreateInitialDirectories(dev)) + if (!init_failed && !yaffs_CreateInitialDirectories(dev)) init_failed = 1; - if(!init_failed && !yaffs_ScanBackwards(dev)) + if (!init_failed && !yaffs_ScanBackwards(dev)) init_failed = 1; } - }else - if(!yaffs_Scan(dev)) + } else if (!yaffs_Scan(dev)) init_failed = 1; yaffs_StripDeletedObjects(dev); + yaffs_FixHangingObjects(dev); + if(dev->param.emptyLostAndFound) + yaffs_EmptyLostAndFound(dev); } - - if(init_failed){ + + if (init_failed) { /* Clean up the mess */ T(YAFFS_TRACE_TRACING, (TSTR("yaffs: yaffs_GutsInitialise() aborted.\n" TENDSTR))); @@ -7510,7 +7966,10 @@ int yaffs_GutsInitialise(yaffs_Device * dev) yaffs_VerifyFreeChunks(dev); yaffs_VerifyBlocks(dev); - + + /* Clean up any aborted checkpoint data */ + if(!dev->isCheckpointed && dev->blocksInCheckpoint > 0) + yaffs_InvalidateCheckpoint(dev); T(YAFFS_TRACE_TRACING, (TSTR("yaffs: yaffs_GutsInitialise() done.\n" TENDSTR))); @@ -7518,7 +7977,7 @@ int yaffs_GutsInitialise(yaffs_Device * dev) } -void yaffs_Deinitialise(yaffs_Device * dev) +void yaffs_Deinitialise(yaffs_Device *dev) { if (dev->isMounted) { int i; @@ -7526,11 +7985,11 @@ void yaffs_Deinitialise(yaffs_Device * dev) yaffs_DeinitialiseBlocks(dev); yaffs_DeinitialiseTnodes(dev); yaffs_DeinitialiseObjects(dev); - if (dev->nShortOpCaches > 0 && + if (dev->param.nShortOpCaches > 0 && dev->srCache) { - for (i = 0; i < dev->nShortOpCaches; i++) { - if(dev->srCache[i].data) + for (i = 0; i < dev->param.nShortOpCaches; i++) { + if (dev->srCache[i].data) YFREE(dev->srCache[i].data); dev->srCache[i].data = NULL; } @@ -7541,55 +8000,51 @@ void yaffs_Deinitialise(yaffs_Device * dev) YFREE(dev->gcCleanupList); - for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) { + for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) YFREE(dev->tempBuffer[i].buffer); - } - dev->isMounted = 0; - - if(dev->deinitialiseNAND) - dev->deinitialiseNAND(dev); - } + if (dev->param.deinitialiseNAND) + dev->param.deinitialiseNAND(dev); + } } -static int yaffs_CountFreeChunks(yaffs_Device * dev) +static int yaffs_CountFreeChunks(yaffs_Device *dev) { - int nFree; + int nFree=0; int b; yaffs_BlockInfo *blk; - for (nFree = 0, b = dev->internalStartBlock; b <= dev->internalEndBlock; - b++) { - blk = yaffs_GetBlockInfo(dev, b); - + blk = dev->blockInfo; + for (b = dev->internalStartBlock; b <= dev->internalEndBlock; b++) { switch (blk->blockState) { case YAFFS_BLOCK_STATE_EMPTY: case YAFFS_BLOCK_STATE_ALLOCATING: case YAFFS_BLOCK_STATE_COLLECTING: case YAFFS_BLOCK_STATE_FULL: nFree += - (dev->nChunksPerBlock - blk->pagesInUse + + (dev->param.nChunksPerBlock - blk->pagesInUse + blk->softDeletions); break; default: break; } - + blk++; } return nFree; } -int yaffs_GetNumberOfFreeChunks(yaffs_Device * dev) +int yaffs_GetNumberOfFreeChunks(yaffs_Device *dev) { /* This is what we report to the outside world */ int nFree; int nDirtyCacheChunks; int blocksForCheckpoint; + int i; #if 1 nFree = dev->nFreeChunks; @@ -7598,27 +8053,24 @@ int yaffs_GetNumberOfFreeChunks(yaffs_Device * dev) #endif nFree += dev->nDeletedFiles; - + /* Now count the number of dirty chunks in the cache and subtract those */ - { - int i; - for (nDirtyCacheChunks = 0, i = 0; i < dev->nShortOpCaches; i++) { - if (dev->srCache[i].dirty) - nDirtyCacheChunks++; - } + for (nDirtyCacheChunks = 0, i = 0; i < dev->param.nShortOpCaches; i++) { + if (dev->srCache[i].dirty) + nDirtyCacheChunks++; } nFree -= nDirtyCacheChunks; - nFree -= ((dev->nReservedBlocks + 1) * dev->nChunksPerBlock); - + nFree -= ((dev->param.nReservedBlocks + 1) * dev->param.nChunksPerBlock); + /* Now we figure out how much to reserve for the checkpoint and report that... */ blocksForCheckpoint = yaffs_CalcCheckpointBlocksRequired(dev) - dev->blocksInCheckpoint; - if(blocksForCheckpoint < 0) + if (blocksForCheckpoint < 0) blocksForCheckpoint = 0; - - nFree -= (blocksForCheckpoint * dev->nChunksPerBlock); + + nFree -= (blocksForCheckpoint * dev->param.nChunksPerBlock); if (nFree < 0) nFree = 0; @@ -7629,14 +8081,14 @@ int yaffs_GetNumberOfFreeChunks(yaffs_Device * dev) static int yaffs_freeVerificationFailures; -static void yaffs_VerifyFreeChunks(yaffs_Device * dev) +static void yaffs_VerifyFreeChunks(yaffs_Device *dev) { int counted; int difference; - - if(yaffs_SkipVerification(dev)) + + if (yaffs_SkipVerification(dev)) return; - + counted = yaffs_CountFreeChunks(dev); difference = dev->nFreeChunks - counted; @@ -7651,15 +8103,14 @@ static void yaffs_VerifyFreeChunks(yaffs_Device * dev) /*---------------------------------------- YAFFS test code ----------------------*/ -#define yaffs_CheckStruct(structure,syze, name) \ +#define yaffs_CheckStruct(structure, syze, name) \ do { \ - if(sizeof(structure) != syze) \ - { \ - T(YAFFS_TRACE_ALWAYS,(TSTR("%s should be %d but is %d\n" TENDSTR),\ - name,syze,sizeof(structure))); \ - return YAFFS_FAIL; \ + if (sizeof(structure) != syze) { \ + T(YAFFS_TRACE_ALWAYS, (TSTR("%s should be %d but is %d\n" TENDSTR),\ + name, syze, (int) sizeof(structure))); \ + return YAFFS_FAIL; \ } \ - } while(0) + } while (0) static int yaffs_CheckStructures(void) { @@ -7667,10 +8118,10 @@ static int yaffs_CheckStructures(void) /* yaffs_CheckStruct(yaffs_TagsUnion,8,"yaffs_TagsUnion"); */ /* yaffs_CheckStruct(yaffs_Spare,16,"yaffs_Spare"); */ #ifndef CONFIG_YAFFS_TNODE_LIST_DEBUG - yaffs_CheckStruct(yaffs_Tnode, 2 * YAFFS_NTNODES_LEVEL0, "yaffs_Tnode"); +/* yaffs_CheckStruct(yaffs_Tnode, 2 * YAFFS_NTNODES_LEVEL0, "yaffs_Tnode"); */ #endif #ifndef CONFIG_YAFFS_WINCE - yaffs_CheckStruct(yaffs_ObjectHeader, 512, "yaffs_ObjectHeader"); + yaffs_CheckStruct(yaffs_ObjectHeader, 512, "yaffs_ObjectHeader"); #endif - return YAFFS_OK; + return YAFFS_OK; }