Mercurial > yaffs-ecoscentric-gpl
changeset 79:12aa40971d25
lindent
| author | charles <charles> |
|---|---|
| date | Tue, 16 Aug 2005 02:28:04 +0000 |
| parents | 232695c0d081 |
| children | 82fbfedb0261 |
| files | yaffs_guts.c |
| diffstat | 1 files changed, 3752 insertions(+), 3868 deletions(-) [+] |
line wrap: on
line diff
--- a/yaffs_guts.c +++ b/yaffs_guts.c @@ -11,9 +11,9 @@ * published by the Free Software Foundation. * */ - //yaffs_guts.c - -const char *yaffs_guts_c_version="$Id: yaffs_guts.c,v 1.17 2005-08-09 04:17:30 charles Exp $"; + +const char *yaffs_guts_c_version = + "$Id: yaffs_guts.c,v 1.18 2005-08-16 02:28:04 charles Exp $"; #include "yportenv.h" @@ -21,7 +21,6 @@ const char *yaffs_guts_c_version="$Id: y #include "yaffs_guts.h" #include "yaffs_tagsvalidity.h" - #include "yaffs_tagscompat.h" #ifdef CONFIG_YAFFS_WINCE @@ -31,133 +30,179 @@ void yfsd_UnlockYAFFS(BOOL fsLockOnly); #define YAFFS_PASSIVE_GC_CHUNKS 2 - #include "yaffs_ecc.h" - - -// NAND access - - -static Y_INLINE int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device *dev,int chunkInNAND, __u8 *buffer, yaffs_ExtendedTags *tags); -static Y_INLINE int yaffs_WriteChunkWithTagsToNAND(yaffs_Device *dev,int chunkInNAND, const __u8 *data, yaffs_ExtendedTags *tags); -static Y_INLINE int yaffs_MarkBlockBad(yaffs_Device *dev, int blockNo); -static Y_INLINE int yaffs_QueryInitialBlockState(yaffs_Device *dev,int blockNo, yaffs_BlockState *state,unsigned *sequenceNumber); -// Local prototypes -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); +/* NAND access */ + +static Y_INLINE int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device * dev, + int chunkInNAND, + __u8 * buffer, + yaffs_ExtendedTags * tags); +static Y_INLINE int yaffs_WriteChunkWithTagsToNAND(yaffs_Device * dev, + int chunkInNAND, + const __u8 * data, + yaffs_ExtendedTags * tags); +static Y_INLINE int yaffs_MarkBlockBad(yaffs_Device * dev, int blockNo); +static Y_INLINE int yaffs_QueryInitialBlockState(yaffs_Device * dev, + int blockNo, + yaffs_BlockState * state, + unsigned *sequenceNumber); +/* Robustification (if it ever comes about...) */ +static void yaffs_RetireBlock(yaffs_Device * dev, int blockInNAND); +static void yaffs_HandleWriteChunkError(yaffs_Device * dev, int chunkInNAND); +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_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 yaffs_BlockInfo *yaffs_GetBlockInfo(yaffs_Device *dev,int blockNo); - -static __u8 *yaffs_GetTempBuffer(yaffs_Device *dev,int lineNo); -static void yaffs_ReleaseTempBuffer(yaffs_Device *dev, __u8 *buffer, int lineNo); - - -// Robustification (if it ever comes about...) -static void yaffs_RetireBlock(yaffs_Device *dev,int blockInNAND); -static void yaffs_HandleWriteChunkError(yaffs_Device *dev,int chunkInNAND); -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 int yaffs_CheckChunkErased(struct yaffs_DeviceStruct *dev,int chunkInNAND); - -static int yaffs_UnlinkWorker(yaffs_Object *obj); -static void yaffs_DestroyObject(yaffs_Object *obj); - - -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); - -static void yaffs_VerifyFreeChunks(yaffs_Device *dev); +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 __u8 *yaffs_GetTempBuffer(yaffs_Device * dev, int lineNo); +static void yaffs_ReleaseTempBuffer(yaffs_Device * dev, __u8 * buffer, + int lineNo); + +static int yaffs_CheckChunkErased(struct yaffs_DeviceStruct *dev, + int chunkInNAND); + +static int yaffs_UnlinkWorker(yaffs_Object * obj); +static void yaffs_DestroyObject(yaffs_Object * obj); + +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); + +static void yaffs_VerifyFreeChunks(yaffs_Device * dev); #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 int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device *dev,int chunkInNAND, __u8 *buffer, yaffs_ExtendedTags *tags) +static void yaffs_InvalidateWholeChunkCache(yaffs_Object * in); +static void yaffs_InvalidateChunkCache(yaffs_Object * object, int chunkId); + + +/* + * Start of real code. + */ + +/* + * NAND access layer + */ + + + +static int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND, + __u8 * buffer, + yaffs_ExtendedTags * tags) { chunkInNAND -= dev->chunkOffset; - - if(dev->readChunkWithTagsFromNAND) - return dev->readChunkWithTagsFromNAND(dev,chunkInNAND,buffer,tags); + + if (dev->readChunkWithTagsFromNAND) + return dev->readChunkWithTagsFromNAND(dev, chunkInNAND, buffer, + tags); else - return yaffs_TagsCompatabilityReadChunkWithTagsFromNAND(dev,chunkInNAND,buffer,tags); + return yaffs_TagsCompatabilityReadChunkWithTagsFromNAND(dev, + chunkInNAND, + buffer, + tags); } -static Y_INLINE int yaffs_WriteChunkWithTagsToNAND(yaffs_Device *dev,int chunkInNAND, const __u8 *buffer, yaffs_ExtendedTags *tags) +static Y_INLINE int yaffs_WriteChunkWithTagsToNAND(yaffs_Device * dev, + int chunkInNAND, + const __u8 * buffer, + yaffs_ExtendedTags * tags) { chunkInNAND -= dev->chunkOffset; - - if(tags) - { + + if (tags) { tags->sequenceNumber = dev->sequenceNumber; tags->chunkUsed = 1; - if(!yaffs_ValidateTags(tags)) - { - T(YAFFS_TRACE_ERROR,(TSTR("Writing uninitialised tags" TENDSTR))); + if (!yaffs_ValidateTags(tags)) { + T(YAFFS_TRACE_ERROR, + (TSTR("Writing uninitialised tags" TENDSTR))); YBUG(); } - T(YAFFS_TRACE_WRITE,(TSTR("Writing chunk %d tags %d %d"TENDSTR),chunkInNAND,tags->objectId,tags->chunkId)); - } + T(YAFFS_TRACE_WRITE, + (TSTR("Writing chunk %d tags %d %d" TENDSTR), chunkInNAND, + tags->objectId, tags->chunkId)); + } else { + T(YAFFS_TRACE_ERROR, (TSTR("Writing with no tags" TENDSTR))); + YBUG(); + } + + if (dev->writeChunkWithTagsToNAND) + return dev->writeChunkWithTagsToNAND(dev, chunkInNAND, buffer, + tags); else - { - T(YAFFS_TRACE_ERROR,(TSTR("Writing with no tags" TENDSTR))); - YBUG(); - } - - if(dev->writeChunkWithTagsToNAND) - return dev->writeChunkWithTagsToNAND(dev,chunkInNAND,buffer,tags); - else - return yaffs_TagsCompatabilityWriteChunkWithTagsToNAND(dev,chunkInNAND,buffer,tags); + return yaffs_TagsCompatabilityWriteChunkWithTagsToNAND(dev, + chunkInNAND, + buffer, + tags); } -static Y_INLINE int yaffs_MarkBlockBad(yaffs_Device *dev, int blockNo) +static Y_INLINE int yaffs_MarkBlockBad(yaffs_Device * dev, int blockNo) { blockNo -= dev->blockOffset; - - if(dev->markNANDBlockBad) - return dev->markNANDBlockBad(dev,blockNo); + + if (dev->markNANDBlockBad) + return dev->markNANDBlockBad(dev, blockNo); else - return yaffs_TagsCompatabilityMarkNANDBlockBad(dev,blockNo); + return yaffs_TagsCompatabilityMarkNANDBlockBad(dev, blockNo); } -static Y_INLINE int yaffs_QueryInitialBlockState(yaffs_Device *dev,int blockNo, yaffs_BlockState *state, unsigned *sequenceNumber) +static Y_INLINE int yaffs_QueryInitialBlockState(yaffs_Device * dev, + int blockNo, + yaffs_BlockState * state, + unsigned *sequenceNumber) { blockNo -= dev->blockOffset; - - if(dev->queryNANDBlock) - return dev->queryNANDBlock(dev,blockNo,state,sequenceNumber); + + if (dev->queryNANDBlock) + return dev->queryNANDBlock(dev, blockNo, state, sequenceNumber); else - return yaffs_TagsCompatabilityQueryNANDBlock(dev,blockNo,state,sequenceNumber); + return yaffs_TagsCompatabilityQueryNANDBlock(dev, blockNo, + state, + sequenceNumber); } -static int yaffs_EraseBlockInNAND(struct yaffs_DeviceStruct *dev,int blockInNAND) +static int yaffs_EraseBlockInNAND(struct yaffs_DeviceStruct *dev, + int blockInNAND) { int result; - + blockInNAND -= dev->blockOffset; dev->nBlockErasures++; - result = dev->eraseBlockInNAND(dev,blockInNAND); - - if(!result)result = dev->eraseBlockInNAND(dev,blockInNAND); // If at first we don't succeed, try again *once*. + result = dev->eraseBlockInNAND(dev, blockInNAND); + + /* If at first we don't succeed, try again *once*.*/ + if (!result) + result = dev->eraseBlockInNAND(dev, blockInNAND); return result; } @@ -166,291 +211,291 @@ static int yaffs_InitialiseNAND(struct y return dev->initialiseNAND(dev); } - - - -// Temporary buffer manipulations - -static __u8 *yaffs_GetTempBuffer(yaffs_Device *dev,int lineNo) +/* + * Temporary buffer manipulations. + */ + +static __u8 *yaffs_GetTempBuffer(yaffs_Device * dev, int lineNo) { - int i,j; - for(i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) - { - if(dev->tempBuffer[i].line == 0) - { + int i, j; + for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) { + if (dev->tempBuffer[i].line == 0) { dev->tempBuffer[i].line = lineNo; - if((i+1) > dev->maxTemp) - { + if ((i + 1) > dev->maxTemp) { dev->maxTemp = i + 1; - for(j = 0; j <= i; j++) - dev->tempBuffer[j].maxLine = dev->tempBuffer[j].line; - } - + for (j = 0; j <= i; j++) + dev->tempBuffer[j].maxLine = + dev->tempBuffer[j].line; + } + return dev->tempBuffer[i].buffer; } } - 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++) - { - T(YAFFS_TRACE_BUFFERS,(TSTR(" %d "),dev->tempBuffer[i].line)); - } - T(YAFFS_TRACE_BUFFERS,(TSTR(" "TENDSTR))); - + 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++) { + T(YAFFS_TRACE_BUFFERS, (TSTR(" %d "), dev->tempBuffer[i].line)); + } + T(YAFFS_TRACE_BUFFERS, (TSTR(" " TENDSTR))); + + /* + * If we got here then we have to allocate an unmanaged one + * This is not good. + */ + dev->unmanagedTempAllocations++; - // Get an unmanaged one - return YMALLOC(dev->nBytesPerChunk); - - + return YMALLOC(dev->nBytesPerChunk); + } -static void yaffs_ReleaseTempBuffer(yaffs_Device *dev, __u8 *buffer, int lineNo) +static void yaffs_ReleaseTempBuffer(yaffs_Device * dev, __u8 * buffer, + int lineNo) { int i; - for(i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) - { - if(dev->tempBuffer[i].buffer == buffer) - { + for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) { + if (dev->tempBuffer[i].buffer == buffer) { dev->tempBuffer[i].line = 0; return; } } - - if(buffer) - { - // assume it is an unmanaged one. - T(YAFFS_TRACE_BUFFERS,(TSTR("Releasing unmanaged temp buffer in line %d" TENDSTR),lineNo)); + + if (buffer) { + /* assume it is an unmanaged one. */ + T(YAFFS_TRACE_BUFFERS, + (TSTR("Releasing unmanaged temp buffer in line %d" TENDSTR), + lineNo)); YFREE(buffer); dev->unmanagedTempDeallocations++; } } - -// Chunk bitmap manipulations - -static Y_INLINE __u8 *yaffs_BlockBits(yaffs_Device *dev, int blk) +/* + * Chunk bitmap manipulations + */ + +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)); + if (blk < dev->internalStartBlock || blk > dev->internalEndBlock) { + T(YAFFS_TRACE_ERROR, + (TSTR("**>> yaffs: BlockBits block %d is not valid" TENDSTR), + blk)); YBUG(); } - return dev->chunkBits + (dev->chunkBitmapStride * (blk - dev->internalStartBlock)); + return dev->chunkBits + + (dev->chunkBitmapStride * (blk - dev->internalStartBlock)); } -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); + __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); - - blkBits[chunk/8] &= ~ (1<<(chunk & 7)); + __u8 *blkBits = yaffs_BlockBits(dev, blk); + + 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); - - blkBits[chunk/8] |= (1<<(chunk & 7)); + __u8 *blkBits = yaffs_BlockBits(dev, blk); + + 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); - return (blkBits[chunk/8] & (1<<(chunk & 7))) ? 1 :0; + __u8 *blkBits = yaffs_BlockBits(dev, blk); + 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); + __u8 *blkBits = yaffs_BlockBits(dev, blk); int i; - for(i = 0; i < dev->chunkBitmapStride; i++) - { - if(*blkBits) return 1; + for (i = 0; i < dev->chunkBitmapStride; i++) { + if (*blkBits) + return 1; blkBits++; } return 0; } - -static Y_INLINE int yaffs_HashFunction(int n) +/* + * Simple hash function. Needs to have a reasonable spread + */ + +static Y_INLINE int yaffs_HashFunction(int n) { return (n % YAFFS_NOBJECT_BUCKETS); } - -yaffs_Object *yaffs_Root(yaffs_Device *dev) +/* + * Access functions to useful fake objects + */ + +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; } - - -int yaffs_CheckFF(__u8 *buffer,int nBytes) +/* + * Erased NAND checking functions + */ + +int yaffs_CheckFF(__u8 * buffer, int nBytes) { - //Horrible, slow implementation - while(nBytes--) - { - if(*buffer != 0xFF) return 0; + /* Horrible, slow implementation */ + while (nBytes--) { + if (*buffer != 0xFF) + return 0; buffer++; } return 1; } -static int yaffs_CheckChunkErased(struct yaffs_DeviceStruct *dev,int chunkInNAND) +static int yaffs_CheckChunkErased(struct yaffs_DeviceStruct *dev, + int chunkInNAND) { int retval = YAFFS_OK; - __u8 *data = yaffs_GetTempBuffer(dev,__LINE__); + __u8 *data = yaffs_GetTempBuffer(dev, __LINE__); yaffs_ExtendedTags tags; -// NCB dev->readChunkWithTagsFromNAND(dev,chunkInNAND,data,&tags); - yaffs_ReadChunkWithTagsFromNAND(dev,chunkInNAND,data,&tags); - - if(!yaffs_CheckFF(data,dev->nBytesPerChunk) || tags.chunkUsed) - { - T(YAFFS_TRACE_NANDACCESS,(TSTR("Chunk %d not erased" TENDSTR),chunkInNAND)); + yaffs_ReadChunkWithTagsFromNAND(dev, chunkInNAND, data, &tags); + + if (!yaffs_CheckFF(data, dev->nBytesPerChunk) || tags.chunkUsed) { + T(YAFFS_TRACE_NANDACCESS, + (TSTR("Chunk %d not erased" TENDSTR), chunkInNAND)); retval = YAFFS_FAIL; } - yaffs_ReleaseTempBuffer(dev,data,__LINE__); - + yaffs_ReleaseTempBuffer(dev, data, __LINE__); + return retval; - + } - - -static int yaffs_WriteNewChunkWithTagsToNAND(struct yaffs_DeviceStruct *dev, const __u8 *data, yaffs_ExtendedTags *tags,int useReserve) +static int yaffs_WriteNewChunkWithTagsToNAND(struct yaffs_DeviceStruct *dev, + const __u8 * data, + yaffs_ExtendedTags * tags, + int useReserve) { int chunk; - + int writeOk = 1; int attempts = 0; - - - - do{ - chunk = yaffs_AllocateChunk(dev,useReserve); - - if(chunk >= 0) - { - - // First check this chunk is erased... + + do { + chunk = yaffs_AllocateChunk(dev, useReserve); + + if (chunk >= 0) { + + /* First check this chunk is erased... */ #ifndef CONFIG_YAFFS_DISABLE_CHUNK_ERASED_CHECK - writeOk = yaffs_CheckChunkErased(dev,chunk); -#endif - if(!writeOk) - { - T(YAFFS_TRACE_ERROR,(TSTR("**>> yaffs chunk %d was not erased" TENDSTR),chunk)); - } - else - { - writeOk = yaffs_WriteChunkWithTagsToNAND(dev,chunk,data,tags); + writeOk = yaffs_CheckChunkErased(dev, chunk); +#endif + if (!writeOk) { + T(YAFFS_TRACE_ERROR, + (TSTR + ("**>> yaffs chunk %d was not erased" + TENDSTR), chunk)); + } else { + writeOk = + yaffs_WriteChunkWithTagsToNAND(dev, chunk, + data, tags); } attempts++; - if(writeOk) - { - // Copy the data into the robustification buffer. - // NB We do this at the end to prevent duplicates in the case of a write error. - //Todo - yaffs_HandleWriteChunkOk(dev,chunk,data,tags); - } - else - { - yaffs_HandleWriteChunkError(dev,chunk); + if (writeOk) { + /* + * Copy the data into the robustification buffer. + * NB We do this at the end to prevent duplicates in the case of a write error. + * Todo + */ + yaffs_HandleWriteChunkOk(dev, chunk, data, + tags); + } else { + yaffs_HandleWriteChunkError(dev, chunk); } } - - } while(chunk >= 0 && ! writeOk); - - if(attempts > 1) - { - T(YAFFS_TRACE_ERROR,(TSTR("**>> yaffs write required %d attempts" TENDSTR),attempts)); - dev->nRetriedWrites+= (attempts - 1); - } - - - + + } while (chunk >= 0 && !writeOk); + + if (attempts > 1) { + T(YAFFS_TRACE_ERROR, + (TSTR("**>> yaffs write required %d attempts" TENDSTR), + attempts)); + dev->nRetriedWrites += (attempts - 1); + } + return chunk; } - - -/// -// Functions for robustisizing -// -// - -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_MarkBlockBad(dev,blockInNAND); - - yaffs_GetBlockInfo(dev,blockInNAND)->blockState = YAFFS_BLOCK_STATE_DEAD; + + yaffs_MarkBlockBad(dev, blockInNAND); + + yaffs_GetBlockInfo(dev, blockInNAND)->blockState = + YAFFS_BLOCK_STATE_DEAD; dev->nRetiredBlocks++; } - - -static void yaffs_HandleWriteChunkOk(yaffs_Device *dev,int chunkInNAND,const __u8 *data, const yaffs_ExtendedTags *tags) +/* + * Functions for robustisizing TODO + * + */ + +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_HandleUpdateChunk(yaffs_Device * dev, int chunkInNAND, + const yaffs_ExtendedTags * tags) { } -static void yaffs_HandleWriteChunkError(yaffs_Device *dev,int chunkInNAND) +static void yaffs_HandleWriteChunkError(yaffs_Device * dev, int chunkInNAND) { - int blockInNAND = chunkInNAND/dev->nChunksPerBlock; - - // Mark the block for retirement - yaffs_GetBlockInfo(dev,blockInNAND)->needsRetiring = 1; - // Delete the chunk - yaffs_DeleteChunk(dev,chunkInNAND,1,__LINE__); + int blockInNAND = chunkInNAND / dev->nChunksPerBlock; + + /* Mark the block for retirement */ + yaffs_GetBlockInfo(dev, blockInNAND)->needsRetiring = 1; + /* Delete the chunk */ + yaffs_DeleteChunk(dev, chunkInNAND, 1, __LINE__); } - -///////////////////////// Object management ////////////////// -// List of spare objects -// The list is hooked together using the first pointer -// in the object - -// static yaffs_Object *yaffs_freeObjects = NULL; - -// static int yaffs_nFreeObjects; - -// static yaffs_ObjectList *yaffs_allocatedObjectList = NULL; - -// static yaffs_ObjectBucket yaffs_objectBucket[YAFFS_NOBJECT_BUCKETS]; - - -static __u16 yaffs_CalcNameSum(const YCHAR *name) +/*---------------- Name handling functions ------------*/ + +static __u16 yaffs_CalcNameSum(const YCHAR * name) { __u16 sum = 0; __u16 i = 1; - - YUCHAR *bname = (YUCHAR *)name; - if(bname) - { - while ((*bname) && (i <=YAFFS_MAX_NAME_LENGTH)) - { + + YUCHAR *bname = (YUCHAR *) name; + if (bname) { + while ((*bname) && (i <= YAFFS_MAX_NAME_LENGTH)) { #ifdef CONFIG_YAFFS_CASE_INSENSITIVE sum += yaffs_toupper(*bname) * i; @@ -464,142 +509,125 @@ static __u16 yaffs_CalcNameSum(const YCH 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 - if(name && yaffs_strlen(name) <= YAFFS_SHORT_NAME_LENGTH) - { - yaffs_strcpy(obj->shortName,name); - } - else - { - obj->shortName[0]=_Y('\0'); - } + if (name && yaffs_strlen(name) <= YAFFS_SHORT_NAME_LENGTH) { + yaffs_strcpy(obj->shortName, name); + } else { + obj->shortName[0] = _Y('\0'); + } #endif - obj->sum = yaffs_CalcNameSum(name); + obj->sum = yaffs_CalcNameSum(name); } - - -///////////////////////// TNODES /////////////////////// - -// List of spare tnodes -// The list is hooked together using the first pointer -// in the tnode. - -//static yaffs_Tnode *yaffs_freeTnodes = NULL; - -// static int yaffs_nFreeTnodes; - -//static yaffs_TnodeList *yaffs_allocatedTnodeList = NULL; - - - -// yaffs_CreateTnodes creates a bunch more tnodes and -// adds them to the tnode free list. -// Don't use this function directly - -static int yaffs_CreateTnodes(yaffs_Device *dev,int nTnodes) +/*-------------------- TNODES ------------------- + + * List of spare tnodes + * 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 int yaffs_CreateTnodes(yaffs_Device * dev, int nTnodes) { - int i; - yaffs_Tnode *newTnodes; - yaffs_TnodeList *tnl; - - if(nTnodes < 1) return YAFFS_OK; - - // make these things - - newTnodes = YMALLOC(nTnodes * sizeof(yaffs_Tnode)); - - if (!newTnodes) - { - T(YAFFS_TRACE_ERROR,(TSTR("yaffs: Could not allocate Tnodes"TENDSTR))); + int i; + yaffs_Tnode *newTnodes; + yaffs_TnodeList *tnl; + + if (nTnodes < 1) + return YAFFS_OK; + + /* make these things */ + + newTnodes = YMALLOC(nTnodes * sizeof(yaffs_Tnode)); + + if (!newTnodes) { + T(YAFFS_TRACE_ERROR, + (TSTR("yaffs: Could not allocate Tnodes" TENDSTR))); return YAFFS_FAIL; - } - - // Hook them into the free list - for(i = 0; i < nTnodes - 1; i++) - { - newTnodes[i].internal[0] = &newTnodes[i+1]; + } + + /* Hook them into the free list */ + for (i = 0; i < nTnodes - 1; i++) { + newTnodes[i].internal[0] = &newTnodes[i + 1]; #ifdef CONFIG_YAFFS_TNODE_LIST_DEBUG - newTnodes[i].internal[YAFFS_NTNODES_INTERNAL] = (void *)1; + newTnodes[i].internal[YAFFS_NTNODES_INTERNAL] = (void *)1; #endif - } - + } + newTnodes[nTnodes - 1].internal[0] = dev->freeTnodes; #ifdef CONFIG_YAFFS_TNODE_LIST_DEBUG - newTnodes[nTnodes - 1].internal[YAFFS_NTNODES_INTERNAL] = (void *)1; + newTnodes[nTnodes - 1].internal[YAFFS_NTNODES_INTERNAL] = (void *)1; #endif dev->freeTnodes = newTnodes; - dev->nFreeTnodes+= nTnodes; + dev->nFreeTnodes += nTnodes; dev->nTnodesCreated += nTnodes; - // Now add this bunch of tnodes to a list for freeing up. - // 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. + /* Now add this bunch of tnodes to a list for freeing up. + * 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))); - - } - else - { + if (!tnl) { + T(YAFFS_TRACE_ERROR, + (TSTR + ("yaffs: Could not add tnodes to management list" TENDSTR))); + + } else { tnl->tnodes = newTnodes; tnl->next = dev->allocatedTnodeList; dev->allocatedTnodeList = tnl; } - - T(YAFFS_TRACE_ALLOCATE,(TSTR("yaffs: Tnodes added" TENDSTR))); - + T(YAFFS_TRACE_ALLOCATE, (TSTR("yaffs: Tnodes added" TENDSTR))); return YAFFS_OK; } - -// GetTnode gets us a clean tnode. Tries to make allocate more if we run out -static yaffs_Tnode *yaffs_GetTnode(yaffs_Device *dev) +/* GetTnode gets us a clean tnode. Tries to make allocate more if we run out */ + +static yaffs_Tnode *yaffs_GetTnode(yaffs_Device * dev) { yaffs_Tnode *tn = NULL; - - // If there are none left make more - if(!dev->freeTnodes) - { - yaffs_CreateTnodes(dev,YAFFS_ALLOCATION_NTNODES); - } - - if(dev->freeTnodes) - { + + /* If there are none left make more */ + if (!dev->freeTnodes) { + yaffs_CreateTnodes(dev, YAFFS_ALLOCATION_NTNODES); + } + + if (dev->freeTnodes) { tn = dev->freeTnodes; #ifdef CONFIG_YAFFS_TNODE_LIST_DEBUG - if(tn->internal[YAFFS_NTNODES_INTERNAL] != (void *)1) - { - // Hoosterman, this thing looks like it isn't in the list - T(YAFFS_TRACE_ALWAYS,(TSTR("yaffs: Tnode list bug 1" TENDSTR))); + if (tn->internal[YAFFS_NTNODES_INTERNAL] != (void *)1) { + /* Hoosterman, this thing looks like it isn't in the list */ + T(YAFFS_TRACE_ALWAYS, + (TSTR("yaffs: Tnode list bug 1" TENDSTR))); } #endif dev->freeTnodes = dev->freeTnodes->internal[0]; dev->nFreeTnodes--; - // zero out - memset(tn,0,sizeof(yaffs_Tnode)); - } - + /* zero out */ + memset(tn, 0, sizeof(yaffs_Tnode)); + } 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) +/* FreeTnode frees up a tnode and puts it back on the free list */ +static void yaffs_FreeTnode(yaffs_Device * dev, yaffs_Tnode * tn) { - if(tn) - { + if (tn) { #ifdef CONFIG_YAFFS_TNODE_LIST_DEBUG - if(tn->internal[YAFFS_NTNODES_INTERNAL] != 0) - { - // Hoosterman, this thing looks like it is already in the list - T(YAFFS_TRACE_ALWAYS,(TSTR("yaffs: Tnode list bug 2" TENDSTR))); + if (tn->internal[YAFFS_NTNODES_INTERNAL] != 0) { + /* Hoosterman, this thing looks like it is already in the list */ + T(YAFFS_TRACE_ALWAYS, + (TSTR("yaffs: Tnode list bug 2" TENDSTR))); } tn->internal[YAFFS_NTNODES_INTERNAL] = (void *)1; #endif @@ -609,27 +637,25 @@ static void yaffs_FreeTnode(yaffs_Device } } - -static void yaffs_DeinitialiseTnodes(yaffs_Device*dev) +static void yaffs_DeinitialiseTnodes(yaffs_Device * dev) { - // Free the list of allocated tnodes + /* Free the list of allocated tnodes */ yaffs_TnodeList *tmp; - - while(dev->allocatedTnodeList) - { - tmp = dev->allocatedTnodeList->next; + + while (dev->allocatedTnodeList) { + tmp = dev->allocatedTnodeList->next; YFREE(dev->allocatedTnodeList->tnodes); YFREE(dev->allocatedTnodeList); - dev->allocatedTnodeList = tmp; - - } - + dev->allocatedTnodeList = tmp; + + } + dev->freeTnodes = NULL; dev->nFreeTnodes = 0; } -static void yaffs_InitialiseTnodes(yaffs_Device*dev) +static void yaffs_InitialiseTnodes(yaffs_Device * dev) { dev->allocatedTnodeList = NULL; dev->freeTnodes = NULL; @@ -638,191 +664,160 @@ static void yaffs_InitialiseTnodes(yaffs } - - -////////////////// END OF TNODE MANIPULATION /////////////////////////// - -/////////////// Functions to manipulate the look-up tree (made up of tnodes) -// The look up tree is represented by the top tnode and the number of topLevel -// in the tree. 0 means only the level 0 tnode is in the tree. - - -// FindLevel0Tnode finds the level 0 tnode, if one exists. -// Used when reading..... -static yaffs_Tnode *yaffs_FindLevel0Tnode(yaffs_Device *dev,yaffs_FileStructure *fStruct, __u32 chunkId) +/* ------------------- End of individual tnode manipulation -----------------*/ + +/* ---------Functions to manipulate the look-up tree (made up of tnodes) ------ + * The look up tree is represented by the top tnode and the number of topLevel + * in the tree. 0 means only the level 0 tnode is in the tree. + */ + +/* FindLevel0Tnode finds the level 0 tnode, if one exists. */ +static yaffs_Tnode *yaffs_FindLevel0Tnode(yaffs_Device * dev, + yaffs_FileStructure * fStruct, + __u32 chunkId) { - + yaffs_Tnode *tn = fStruct->top; __u32 i; - int requiredTallness; + int requiredTallness; int level = fStruct->topLevel; - - // Check sane level and chunk Id - if(level < 0 || level > YAFFS_TNODES_MAX_LEVEL) - { -// char str[50]; -// sprintf(str,"Bad level %d",level); -// YALERT(str); + + /* Check sane level and chunk Id */ + if (level < 0 || level > YAFFS_TNODES_MAX_LEVEL) { return NULL; } - - if(chunkId > YAFFS_MAX_CHUNK_ID) - { -// char str[50]; -// sprintf(str,"Bad chunkId %d",chunkId); -// YALERT(str); + + if (chunkId > YAFFS_MAX_CHUNK_ID) { return NULL; } - // First check we're tall enough (ie enough topLevel) - - i = chunkId >> (/*dev->chunkGroupBits + */YAFFS_TNODES_LEVEL0_BITS); + /* First check we're tall enough (ie enough topLevel) */ + + i = chunkId >> YAFFS_TNODES_LEVEL0_BITS; requiredTallness = 0; - while(i) - { + while (i) { i >>= YAFFS_TNODES_INTERNAL_BITS; requiredTallness++; } - - - if(requiredTallness > fStruct->topLevel) - { - // Not tall enough, so we can't find it, return NULL. + + if (requiredTallness > fStruct->topLevel) { + /* Not tall enough, so we can't find it, return NULL. */ return NULL; } - - - // Traverse down to level 0 - while (level > 0 && tn) - { - tn = tn->internal[(chunkId >>(/* dev->chunkGroupBits + */ YAFFS_TNODES_LEVEL0_BITS + (level-1) * YAFFS_TNODES_INTERNAL_BITS)) & - YAFFS_TNODES_INTERNAL_MASK]; + + /* 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]; level--; - - } - - return tn; + + } + + return tn; } -// AddOrFindLevel0Tnode finds the level 0 tnode if it exists, otherwise first expands the tree. -// This happens in two steps: -// 1. If the tree isn't tall enough, then make it taller. -// 2. Scan down the tree towards the level 0 tnode adding tnodes if required. -// -// Used when modifying the tree. -// -static yaffs_Tnode *yaffs_AddOrFindLevel0Tnode(yaffs_Device *dev, yaffs_FileStructure *fStruct, __u32 chunkId) +/* AddOrFindLevel0Tnode finds the level 0 tnode if it exists, otherwise first expands the tree. + * This happens in two steps: + * 1. If the tree isn't tall enough, then make it taller. + * 2. Scan down the tree towards the level 0 tnode adding tnodes if required. + * + * Used when modifying the tree. + */ + +static yaffs_Tnode *yaffs_AddOrFindLevel0Tnode(yaffs_Device * dev, + yaffs_FileStructure * fStruct, + __u32 chunkId) { - - yaffs_Tnode *tn; - + + yaffs_Tnode *tn; + int requiredTallness; int i; int l; - + __u32 x; - - - //T((TSTR("AddOrFind topLevel=%d, chunk=%d"),fStruct->topLevel,chunkId)); - - // Check sane level and page Id - if(fStruct->topLevel < 0 || fStruct->topLevel > YAFFS_TNODES_MAX_LEVEL) - { -// char str[50]; -// sprintf(str,"Bad level %d",fStruct->topLevel); -// YALERT(str); + + + /* Check sane level and page Id */ + if (fStruct->topLevel < 0 || fStruct->topLevel > YAFFS_TNODES_MAX_LEVEL) { return NULL; } - - if(chunkId > YAFFS_MAX_CHUNK_ID) - { -// char str[50]; -// sprintf(str,"Bad chunkId %d",chunkId); -// YALERT(str); + + if (chunkId > YAFFS_MAX_CHUNK_ID) { return NULL; } - - // First check we're tall enough (ie enough topLevel) - - x = chunkId >> (/*dev->chunkGroupBits + */YAFFS_TNODES_LEVEL0_BITS); + + /* First check we're tall enough (ie enough topLevel) */ + + x = chunkId >> YAFFS_TNODES_LEVEL0_BITS; requiredTallness = 0; - while(x) - { + while (x) { x >>= YAFFS_TNODES_INTERNAL_BITS; requiredTallness++; } - - //T((TSTR(" required=%d"),requiredTallness)); - - - if(requiredTallness > fStruct->topLevel) - { - // Not tall enough,gotta make the tree taller - for(i = fStruct->topLevel; i < requiredTallness; i++) - { - //T((TSTR(" add new top"))); - + + + if (requiredTallness > fStruct->topLevel) { + /* Not tall enough,gotta make the tree taller */ + for (i = fStruct->topLevel; i < requiredTallness; i++) { + tn = yaffs_GetTnode(dev); - - if(tn) - { + + if (tn) { tn->internal[0] = fStruct->top; fStruct->top = tn; - } - else - { - T(YAFFS_TRACE_ERROR,(TSTR("yaffs: no more tnodes" TENDSTR))); + } else { + T(YAFFS_TRACE_ERROR, + (TSTR("yaffs: no more tnodes" TENDSTR))); } } - + fStruct->topLevel = requiredTallness; } - - - // Traverse down to level 0, adding anything we need - + + /* Traverse down to level 0, adding anything we need */ + l = fStruct->topLevel; tn = fStruct->top; - while (l > 0 && tn) - { - x = (chunkId >> (/*dev->chunkGroupBits + */YAFFS_TNODES_LEVEL0_BITS + (l-1) * YAFFS_TNODES_INTERNAL_BITS)) & - YAFFS_TNODES_INTERNAL_MASK; - - //T((TSTR(" [%d:%d]"),l,i)); - - if(!tn->internal[x]) - { - //T((TSTR(" added"))); - - tn->internal[x] = yaffs_GetTnode(dev); - } - - tn = tn->internal[x]; + while (l > 0 && tn) { + x = (chunkId >> + ( YAFFS_TNODES_LEVEL0_BITS + + (l - 1) * YAFFS_TNODES_INTERNAL_BITS)) & + YAFFS_TNODES_INTERNAL_MASK; + + + if (!tn->internal[x]) + tn->internal[x] = yaffs_GetTnode(dev); + + tn = tn->internal[x]; l--; - - } - - //TSTR(TENDSTR))); - - return tn; + + } + + 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; + + 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; */ return theChunk; - + } } theChunk++; @@ -830,11 +825,15 @@ static int yaffs_FindChunkInGroup(yaffs_ return -1; } -// 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 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, int chunkOffset,int *limit) + +/* 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 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, + int chunkOffset, int *limit) { int i; int chunkInInode; @@ -844,633 +843,590 @@ static int yaffs_DeleteWorker(yaffs_Obje yaffs_Device *dev = in->myDev; int allDone = 1; - - - if(tn) - { - if(level > 0) - { - - for(i = YAFFS_NTNODES_INTERNAL -1; allDone && i >= 0; i--) - { - if(tn->internal[i]) - { - if(limit && (*limit) < 0) - { + + if (tn) { + if (level > 0) { + + for (i = YAFFS_NTNODES_INTERNAL - 1; allDone && i >= 0; + i--) { + if (tn->internal[i]) { + if (limit && (*limit) < 0) { allDone = 0; - } - else - { - allDone = yaffs_DeleteWorker(in,tn->internal[i],level - 1, - (chunkOffset << YAFFS_TNODES_INTERNAL_BITS ) + i ,limit); + } else { + allDone = + yaffs_DeleteWorker(in, + tn-> + internal + [i], + level - + 1, + (chunkOffset + << + YAFFS_TNODES_INTERNAL_BITS) + + i, + limit); } - if(allDone) - { - yaffs_FreeTnode(dev,tn->internal[i]); - tn->internal[i] = NULL; + if (allDone) { + yaffs_FreeTnode(dev, + tn-> + internal[i]); + tn->internal[i] = NULL; } - } - + } + } return (allDone) ? 1 : 0; - } - else if(level == 0) - { + } else if (level == 0) { int hitLimit = 0; - - for(i = YAFFS_NTNODES_LEVEL0 -1; i >= 0 && !hitLimit; i--) - { - if(tn->level0[i]) - { - - chunkInInode = (chunkOffset << YAFFS_TNODES_LEVEL0_BITS ) + i; - - theChunk = tn->level0[i] << dev->chunkGroupBits; - - foundChunk = yaffs_FindChunkInGroup(dev,theChunk,&tags,in->objectId,chunkInInode); - - if(foundChunk > 0) - { - yaffs_DeleteChunk(dev,foundChunk,1,__LINE__); + + for (i = YAFFS_NTNODES_LEVEL0 - 1; i >= 0 && !hitLimit; + i--) { + if (tn->level0[i]) { + + chunkInInode = + (chunkOffset << + YAFFS_TNODES_LEVEL0_BITS) + i; + + theChunk = + tn->level0[i] << dev-> + chunkGroupBits; + + foundChunk = + yaffs_FindChunkInGroup(dev, + theChunk, + &tags, + in->objectId, + chunkInInode); + + if (foundChunk > 0) { + yaffs_DeleteChunk(dev, + foundChunk, 1, + __LINE__); in->nDataChunks--; - if(limit) - { - *limit = *limit-1; - if(*limit <= 0) - { + if (limit) { + *limit = *limit - 1; + if (*limit <= 0) { hitLimit = 1; } } - + } - - tn->level0[i] = 0; - } - + + tn->level0[i] = 0; + } + } return (i < 0) ? 1 : 0; - } - - } - + + } + return 1; - + } - -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); - if(theBlock) - { + yaffs_BlockInfo *theBlock; + + T(YAFFS_TRACE_DELETION, (TSTR("soft delete chunk %d" TENDSTR), chunk)); + + theBlock = yaffs_GetBlockInfo(dev, chunk / dev->nChunksPerBlock); + if (theBlock) { theBlock->softDeletions++; dev->nFreeChunks++; } } -// SoftDeleteWorker scans backwards through the tnode tree and soft deletes all the chunks in the file. -// All soft deleting does is increment the block's softdelete count and pulls the chunk out -// 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, __u32 level, int chunkOffset) +/* SoftDeleteWorker scans backwards through the tnode tree and soft deletes all the chunks in the file. + * All soft deleting does is increment the block's softdelete count and pulls the chunk out + * 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, + __u32 level, int chunkOffset) { int i; int theChunk; int allDone = 1; yaffs_Device *dev = in->myDev; - - - if(tn) - { - if(level > 0) - { - - for(i = YAFFS_NTNODES_INTERNAL -1; allDone && i >= 0; i--) - { - if(tn->internal[i]) - { - allDone = yaffs_SoftDeleteWorker(in,tn->internal[i],level - 1, - (chunkOffset << YAFFS_TNODES_INTERNAL_BITS ) + i); - if(allDone) - { - yaffs_FreeTnode(dev,tn->internal[i]); - tn->internal[i] = NULL; + + if (tn) { + if (level > 0) { + + for (i = YAFFS_NTNODES_INTERNAL - 1; allDone && i >= 0; + i--) { + if (tn->internal[i]) { + allDone = + yaffs_SoftDeleteWorker(in, + tn-> + internal[i], + level - 1, + (chunkOffset + << + YAFFS_TNODES_INTERNAL_BITS) + + i); + if (allDone) { + yaffs_FreeTnode(dev, + tn-> + internal[i]); + tn->internal[i] = NULL; + } else { + /* Hoosterman... how could this happen? */ } - else - { - //Hoosterman... how could this happen. - } - } + } } return (allDone) ? 1 : 0; - } - else if(level == 0) - { - - for(i = YAFFS_NTNODES_LEVEL0 -1; i >=0; i--) - { - if(tn->level0[i]) - { - // Note this does not find the real chunk, only the chunk group. - // We make an assumption that a chunk group is niot larger than a block. - theChunk = (tn->level0[i] << dev->chunkGroupBits); - - yaffs_SoftDeleteChunk(dev,theChunk); - tn->level0[i] = 0; - } - + } else if (level == 0) { + + for (i = YAFFS_NTNODES_LEVEL0 - 1; i >= 0; i--) { + if (tn->level0[i]) { + /* Note this does not find the real chunk, only the chunk group. + * We make an assumption that a chunk group is not larger than + * a block. + */ + theChunk = + (tn->level0[i] << dev-> + chunkGroupBits); + + yaffs_SoftDeleteChunk(dev, theChunk); + tn->level0[i] = 0; + } + } return 1; - + } - - } - + + } + return 1; - + } - - -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) - { - if(obj->nDataChunks <= 0) - { - // Empty file with no duplicate object headers, just delete it immediately - yaffs_FreeTnode(obj->myDev,obj->variant.fileVariant.top); - obj->variant.fileVariant.top = NULL; - T(YAFFS_TRACE_TRACING,(TSTR("yaffs: Deleting empty file %d" TENDSTR),obj->objectId)); - yaffs_DoGenericObjectDeletion(obj); - } - else - { - yaffs_SoftDeleteWorker(obj, obj->variant.fileVariant.top, obj->variant.fileVariant.topLevel, 0); + if (obj->deleted && + obj->variantType == YAFFS_OBJECT_TYPE_FILE && !obj->softDeleted) { + if (obj->nDataChunks <= 0) { + /* Empty file with no duplicate object headers, just delete it immediately */ + yaffs_FreeTnode(obj->myDev, + obj->variant.fileVariant.top); + obj->variant.fileVariant.top = NULL; + T(YAFFS_TRACE_TRACING, + (TSTR("yaffs: Deleting empty file %d" TENDSTR), + obj->objectId)); + yaffs_DoGenericObjectDeletion(obj); + } else { + yaffs_SoftDeleteWorker(obj, + obj->variant.fileVariant.top, + obj->variant.fileVariant. + topLevel, 0); obj->softDeleted = 1; } } } - - - - -// Pruning removes any part of the file structure tree that is beyond the -// bounds of the file (ie that does not point to chunks). -// -// A file should only get pruned when its size is reduced. -// -// Before pruning, the chunks must be pulled from the tree and the -// 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. - -// yaffs_PruneWorker should only be called by yaffs_PruneFileStructure() - -static yaffs_Tnode *yaffs_PruneWorker(yaffs_Device *dev, yaffs_Tnode *tn, __u32 level, int del0) +/* Pruning removes any part of the file structure tree that is beyond the + * bounds of the file (ie that does not point to chunks). + * + * A file should only get pruned when its size is reduced. + * + * Before pruning, the chunks must be pulled from the tree and the + * 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. + */ + +static yaffs_Tnode *yaffs_PruneWorker(yaffs_Device * dev, yaffs_Tnode * tn, + __u32 level, int del0) { int i; int hasData; - - if(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(tn->internal[i]) - { - hasData++; + + 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 (tn->internal[i]) { + hasData++; } } - - if(hasData == 0 && del0) - { - // Free and return NULL - - yaffs_FreeTnode(dev,tn); + + if (hasData == 0 && del0) { + /* Free and return NULL */ + + yaffs_FreeTnode(dev, tn); tn = NULL; } - + } return 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; int done = 0; yaffs_Tnode *tn; - - if(fStruct->topLevel > 0) - { - fStruct->top = yaffs_PruneWorker(dev,fStruct->top, fStruct->topLevel,0); - - // 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 - // (ie all the non-zero are NULL) - - while(fStruct->topLevel && !done) - { + + if (fStruct->topLevel > 0) { + fStruct->top = + yaffs_PruneWorker(dev, fStruct->top, fStruct->topLevel, 0); + + /* 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 + * (ie all the non-zero are NULL) + */ + + while (fStruct->topLevel && !done) { tn = fStruct->top; - + hasData = 0; - for(i = 1; i <YAFFS_NTNODES_INTERNAL; i++) - { - if(tn->internal[i]) - { - hasData++; + for (i = 1; i < YAFFS_NTNODES_INTERNAL; i++) { + if (tn->internal[i]) { + hasData++; } } - - if(!hasData) - { + + if (!hasData) { fStruct->top = tn->internal[0]; fStruct->topLevel--; - yaffs_FreeTnode(dev,tn); - } - else - { + yaffs_FreeTnode(dev, tn); + } else { done = 1; } } } - + return YAFFS_OK; } - - - - -/////////////////////// End of File Structure functions. ///////////////// - -// yaffs_CreateFreeObjects creates a bunch more objects and -// adds them to the object free list. -static int yaffs_CreateFreeObjects(yaffs_Device *dev, int nObjects) +/*-------------------- End of File Structure functions.-------------------*/ + +/* yaffs_CreateFreeObjects creates a bunch more objects and + * adds them to the object free list. + */ +static int yaffs_CreateFreeObjects(yaffs_Device * dev, int nObjects) { - int i; - yaffs_Object *newObjects; - yaffs_ObjectList *list; - - if(nObjects < 1) return YAFFS_OK; - - // make these things + int i; + yaffs_Object *newObjects; + yaffs_ObjectList *list; + + if (nObjects < 1) + return YAFFS_OK; + + /* make these things */ + newObjects = YMALLOC(nObjects * sizeof(yaffs_Object)); + + if (!newObjects) { + T(YAFFS_TRACE_ALLOCATE, + (TSTR("yaffs: Could not allocate more objects" TENDSTR))); + return YAFFS_FAIL; + } - newObjects = YMALLOC(nObjects * sizeof(yaffs_Object)); - - if (!newObjects) - { - 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 list_head *)(&newObjects[i+1]); - } - + /* Hook them into the free list */ + for (i = 0; i < nObjects - 1; i++) { + newObjects[i].siblings.next = + (struct list_head *)(&newObjects[i + 1]); + } + newObjects[nObjects - 1].siblings.next = (void *)dev->freeObjects; dev->freeObjects = newObjects; - dev->nFreeObjects+= nObjects; - dev->nObjectsCreated+= nObjects; - - // Now add this bunch of Objects to a list for freeing up. - + dev->nFreeObjects += nObjects; + dev->nObjectsCreated += nObjects; + + /* Now add this bunch of Objects to a list for freeing up. */ + list = YMALLOC(sizeof(yaffs_ObjectList)); - if(!list) - { - T(YAFFS_TRACE_ALLOCATE,(TSTR("Could not add objects to management list" TENDSTR))); - } - else - { + if (!list) { + T(YAFFS_TRACE_ALLOCATE, + (TSTR("Could not add objects to management list" TENDSTR))); + } else { list->objects = newObjects; list->next = dev->allocatedObjectList; dev->allocatedObjectList = list; } - - - + return YAFFS_OK; } -// AllocateEmptyObject gets us a clean Object. Tries to make allocate more if we run out -static yaffs_Object *yaffs_AllocateEmptyObject(yaffs_Device *dev) +/* AllocateEmptyObject gets us a clean Object. Tries to make allocate more if we run out */ +static yaffs_Object *yaffs_AllocateEmptyObject(yaffs_Device * dev) { yaffs_Object *tn = NULL; - - // If there are none left make more - if(!dev->freeObjects) - { - yaffs_CreateFreeObjects(dev,YAFFS_ALLOCATION_NOBJECTS); - } - - if(dev->freeObjects) - { + + /* If there are none left make more */ + if (!dev->freeObjects) { + yaffs_CreateFreeObjects(dev, YAFFS_ALLOCATION_NOBJECTS); + } + + if (dev->freeObjects) { tn = dev->freeObjects; - dev->freeObjects = (yaffs_Object *)(dev->freeObjects->siblings.next); + dev->freeObjects = + (yaffs_Object *) (dev->freeObjects->siblings.next); dev->nFreeObjects--; - - // Now sweeten it up... - - memset(tn,0,sizeof(yaffs_Object)); + + /* Now sweeten it up... */ + + memset(tn, 0, sizeof(yaffs_Object)); tn->myDev = dev; tn->chunkId = -1; tn->variantType = YAFFS_OBJECT_TYPE_UNKNOWN; INIT_LIST_HEAD(&(tn->hardLinks)); INIT_LIST_HEAD(&(tn->hashLink)); INIT_LIST_HEAD(&tn->siblings); - - // 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) - { - yaffs_AddObjectToDirectory(dev->lostNFoundDir,tn); + + /* 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) { + yaffs_AddObjectToDirectory(dev->lostNFoundDir, tn); } } - return tn; } -static yaffs_Object *yaffs_CreateFakeDirectory(yaffs_Device *dev,int number,__u32 mode) +static yaffs_Object *yaffs_CreateFakeDirectory(yaffs_Device * dev, int number, + __u32 mode) { - yaffs_Object *obj = yaffs_CreateNewObject(dev,number,YAFFS_OBJECT_TYPE_DIRECTORY); - if(obj) - { - obj->fake = 1; // it is fake so it has no NAND presence... - obj->renameAllowed= 0; // ... and we're not allowed to rename it... - obj->unlinkAllowed= 0; // ... or unlink it + yaffs_Object *obj = + yaffs_CreateNewObject(dev, number, YAFFS_OBJECT_TYPE_DIRECTORY); + if (obj) { + obj->fake = 1; /* it is fake so it has no NAND presence... */ + obj->renameAllowed = 0; /* ... and we're not allowed to rename it... */ + obj->unlinkAllowed = 0; /* ... or unlink it */ obj->deleted = 0; obj->unlinked = 0; obj->yst_mode = mode; obj->myDev = dev; - obj->chunkId = 0; // Not a valid chunk. - } - + obj->chunkId = 0; /* Not a valid chunk. */ + } + return obj; - + } - -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(!list_empty(&tn->hashLink)) - { + + /* If it is still linked into the bucket list, free from the list */ + if (!list_empty(&tn->hashLink)) { list_del_init(&tn->hashLink); - bucket = yaffs_HashFunction(tn->objectId); + 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) +/* FreeObject frees up a Object and puts it back on the free list */ +static void yaffs_FreeObject(yaffs_Object * tn) { yaffs_Device *dev = tn->myDev; - + #ifdef __KERNEL__ - if(tn->myInode) - { - // We're still hooked up to a cached inode. - // Don't delete now, but mark for later deletion + if (tn->myInode) { + /* We're still hooked up to a cached inode. + * Don't delete now, but mark for later deletion + */ tn->deferedFree = 1; return; } #endif - + yaffs_UnhashObject(tn); - - // Link into the free list. + + /* Link into the free list. */ tn->siblings.next = (struct list_head *)(dev->freeObjects); dev->freeObjects = tn; dev->nFreeObjects++; } - - #ifdef __KERNEL__ -void yaffs_HandleDeferedFree(yaffs_Object *obj) +void yaffs_HandleDeferedFree(yaffs_Object * obj) { - if(obj->deferedFree) - { - yaffs_FreeObject(obj); + 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 - + /* Free the list of allocated Objects */ + yaffs_ObjectList *tmp; - - while( dev->allocatedObjectList) - { - tmp = dev->allocatedObjectList->next; + + while (dev->allocatedObjectList) { + tmp = dev->allocatedObjectList->next; YFREE(dev->allocatedObjectList->objects); YFREE(dev->allocatedObjectList); - - dev->allocatedObjectList = tmp; - } - + + dev->allocatedObjectList = tmp; + } + dev->freeObjects = NULL; dev->nFreeObjects = 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++) - { + + for (i = 0; i < YAFFS_NOBJECT_BUCKETS; i++) { INIT_LIST_HEAD(&dev->objectBucket[i].list); - dev->objectBucket[i].count = 0; + 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++) - { + /* 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) - { + 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 - - for(i = 0; i < 10 && lowest > 3; i++) - { + + } + + /* If we didn't find an empty list, then try + * looking a bit further for a short one + */ + + for (i = 0; i < 10 && lowest > 3; i++) { x++; - x %= YAFFS_NOBJECT_BUCKETS; - if(dev->objectBucket[x].count < lowest) - { + x %= YAFFS_NOBJECT_BUCKETS; + if (dev->objectBucket[x].count < lowest) { lowest = dev->objectBucket[x].count; l = x; } - - } - + + } + 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. - + + /* Now find an object value that has not already been taken + * by scanning the list. + */ + int found = 0; struct list_head *i; - - __u32 n = (__u32)bucket; - - //yaffs_CheckObjectHashSanity(); - - while(!found) - { + + __u32 n = (__u32) bucket; + + /* yaffs_CheckObjectHashSanity(); */ + + while (!found) { found = 1; - n += YAFFS_NOBJECT_BUCKETS; - if(1 ||dev->objectBucket[bucket].count > 0) - { - list_for_each(i,&dev->objectBucket[bucket].list) - { - // If there is already one in the list - if(i && list_entry(i, yaffs_Object,hashLink)->objectId == n) - { + n += YAFFS_NOBJECT_BUCKETS; + if (1 || dev->objectBucket[bucket].count > 0) { + list_for_each(i, &dev->objectBucket[bucket].list) { + /* If there is already one in the list */ + if (i + && list_entry(i, yaffs_Object, + hashLink)->objectId == n) { found = 0; } } } } - - //T(("bucket %d count %d inode %d\n",bucket,yaffs_objectBucket[bucket].count,n); - - return n; + + + 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; - - if(!list_empty(&in->hashLink)) - { - //YINFO("!!!"); - } - - - list_add(&in->hashLink,&dev->objectBucket[bucket].list); + + list_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 list_head *i; yaffs_Object *in; - - list_for_each(i,&dev->objectBucket[bucket].list) - { - // Look if it is in the list - if(i) - { - in = list_entry(i, yaffs_Object,hashLink); - if(in->objectId == number) - { + + list_for_each(i, &dev->objectBucket[bucket].list) { + /* Look if it is in the list */ + if (i) { + in = list_entry(i, yaffs_Object, hashLink); + if (in->objectId == number) { #ifdef __KERNEL__ - // Don't tell the VFS about this one if it is defered free - if(in->deferedFree) - return NULL; + /* Don't tell the VFS about this one if it is defered free */ + if (in->deferedFree) + return NULL; #endif - + return in; } } } - + return NULL; } - - -yaffs_Object *yaffs_CreateNewObject(yaffs_Device *dev,int number,yaffs_ObjectType type) +yaffs_Object *yaffs_CreateNewObject(yaffs_Device * dev, int number, + yaffs_ObjectType type) { - + yaffs_Object *theObject; - if(number < 0) - { + if (number < 0) { number = yaffs_CreateNewObjectNumber(dev); } - + theObject = yaffs_AllocateEmptyObject(dev); - - if(theObject) - { + + if (theObject) { theObject->fake = 0; theObject->renameAllowed = 1; theObject->unlinkAllowed = 1; @@ -1479,332 +1435,331 @@ yaffs_Object *yaffs_CreateNewObject(yaff theObject->variantType = type; #ifdef CONFIG_YAFFS_WINCE yfsd_WinFileTimeNow(theObject->win_atime); - theObject->win_ctime[0] = theObject->win_mtime[0] = theObject->win_atime[0]; - theObject->win_ctime[1] = theObject->win_mtime[1] = theObject->win_atime[1]; + theObject->win_ctime[0] = theObject->win_mtime[0] = + theObject->win_atime[0]; + theObject->win_ctime[1] = theObject->win_mtime[1] = + theObject->win_atime[1]; #else - theObject->yst_atime = theObject->yst_mtime = theObject->yst_ctime = Y_CURRENT_TIME; + theObject->yst_atime = theObject->yst_mtime = + theObject->yst_ctime = Y_CURRENT_TIME; #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 = yaffs_GetTnode(dev); - break; - case YAFFS_OBJECT_TYPE_DIRECTORY: - INIT_LIST_HEAD(&theObject->variant.directoryVariant.children); - break; - case YAFFS_OBJECT_TYPE_SYMLINK: - // No action required - break; - case YAFFS_OBJECT_TYPE_HARDLINK: - // No action required - break; - case YAFFS_OBJECT_TYPE_SPECIAL: - // No action required - break; - case YAFFS_OBJECT_TYPE_UNKNOWN: - // todo this should not happen - break; + 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 = + yaffs_GetTnode(dev); + break; + case YAFFS_OBJECT_TYPE_DIRECTORY: + INIT_LIST_HEAD(&theObject->variant.directoryVariant. + children); + break; + case YAFFS_OBJECT_TYPE_SYMLINK: + case YAFFS_OBJECT_TYPE_HARDLINK: + case YAFFS_OBJECT_TYPE_SPECIAL: + /* No action required */ + break; + case YAFFS_OBJECT_TYPE_UNKNOWN: + /* todo this should not happen */ + break; } } - + return theObject; } -static yaffs_Object *yaffs_FindOrCreateObjectByNumber(yaffs_Device *dev, int number,yaffs_ObjectType type) +static yaffs_Object *yaffs_FindOrCreateObjectByNumber(yaffs_Device * dev, + int number, + yaffs_ObjectType type) { yaffs_Object *theObject = NULL; - - if(number > 0) - { - theObject = yaffs_FindObjectByNumber(dev,number); - } - - if(!theObject) - { - theObject = yaffs_CreateNewObject(dev,number,type); - } - + + if (number > 0) { + theObject = yaffs_FindObjectByNumber(dev, number); + } + + 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; - - if(str && *str) - { + + if (str && *str) { newStr = YMALLOC((yaffs_strlen(str) + 1) * sizeof(YCHAR)); - yaffs_strcpy(newStr,str); + yaffs_strcpy(newStr, str); } return newStr; - + } -// -// Mknod (create) a new object. -// equivalentObject only has meaning for a hard link; -// aliasString only has meaning for a sumlink. -// 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, - __u32 mode, - __u32 uid, - __u32 gid, - yaffs_Object *equivalentObject, - const YCHAR *aliasString, - __u32 rdev) +/* + * Mknod (create) a new object. + * equivalentObject only has meaning for a hard link; + * aliasString only has meaning for a sumlink. + * 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, + __u32 mode, + __u32 uid, + __u32 gid, + yaffs_Object * equivalentObject, + const YCHAR * aliasString, __u32 rdev) { yaffs_Object *in; 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)) - { + + /* Check if the entry exists. If it does then fail the call since we don't want a dup.*/ + if (yaffs_FindObjectByName(parent, name)) { return NULL; } - - in = yaffs_CreateNewObject(dev,-1,type); - - if(in) - { + + in = yaffs_CreateNewObject(dev, -1, type); + + if (in) { in->chunkId = -1; in->valid = 1; in->variantType = type; - in->yst_mode = mode; - + in->yst_mode = mode; + #ifdef CONFIG_YAFFS_WINCE yfsd_WinFileTimeNow(in->win_atime); in->win_ctime[0] = in->win_mtime[0] = in->win_atime[0]; in->win_ctime[1] = in->win_mtime[1] = in->win_atime[1]; - + #else in->yst_atime = in->yst_mtime = in->yst_ctime = Y_CURRENT_TIME; - in->yst_rdev = rdev; - in->yst_uid = uid; - in->yst_gid = gid; -#endif + in->yst_rdev = rdev; + in->yst_uid = uid; + in->yst_gid = gid; +#endif in->nDataChunks = 0; - yaffs_SetObjectName(in,name); + yaffs_SetObjectName(in, name); in->dirty = 1; - - yaffs_AddObjectToDirectory(parent,in); - + + yaffs_AddObjectToDirectory(parent, in); + in->myDev = parent->myDev; - - - switch(type) - { - case YAFFS_OBJECT_TYPE_SYMLINK: - in->variant.symLinkVariant.alias = yaffs_CloneString(aliasString); - break; - case YAFFS_OBJECT_TYPE_HARDLINK: - in->variant.hardLinkVariant.equivalentObject = equivalentObject; - in->variant.hardLinkVariant.equivalentObjectId = equivalentObject->objectId; - list_add(&in->hardLinks,&equivalentObject->hardLinks); - break; - case YAFFS_OBJECT_TYPE_FILE: // do nothing - case YAFFS_OBJECT_TYPE_DIRECTORY: // do nothing - case YAFFS_OBJECT_TYPE_SPECIAL: // do nothing - case YAFFS_OBJECT_TYPE_UNKNOWN: - break; + + switch (type) { + case YAFFS_OBJECT_TYPE_SYMLINK: + in->variant.symLinkVariant.alias = + yaffs_CloneString(aliasString); + break; + case YAFFS_OBJECT_TYPE_HARDLINK: + in->variant.hardLinkVariant.equivalentObject = + equivalentObject; + in->variant.hardLinkVariant.equivalentObjectId = + equivalentObject->objectId; + list_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 */ + break; } - if(/*yaffs_GetNumberOfFreeChunks(dev) <= 0 || */ - yaffs_UpdateObjectHeader(in,name,0,0,0) < 0) - { - // Could not create the object header, fail the creation + if (yaffs_UpdateObjectHeader(in, name, 0, 0, 0) < 0) { + /* Could not create the object header, fail the creation */ yaffs_DestroyObject(in); in = NULL; } } - + 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); -} - -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); + return yaffs_MknodObject(YAFFS_OBJECT_TYPE_FILE, 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_MknodDirectory(yaffs_Object * parent, const YCHAR * name, + __u32 mode, __u32 uid, __u32 gid) { - return yaffs_MknodObject(YAFFS_OBJECT_TYPE_SPECIAL,parent,name,mode,uid,gid,NULL,NULL,rdev); + return yaffs_MknodObject(YAFFS_OBJECT_TYPE_DIRECTORY, parent, name, + mode, uid, gid, NULL, NULL, 0); } -yaffs_Object *yaffs_MknodSymLink(yaffs_Object *parent,const YCHAR *name, __u32 mode, __u32 uid, __u32 gid,const YCHAR *alias) +yaffs_Object *yaffs_MknodSpecial(yaffs_Object * parent, const YCHAR * name, + __u32 mode, __u32 uid, __u32 gid, __u32 rdev) { - return yaffs_MknodObject(YAFFS_OBJECT_TYPE_SYMLINK,parent,name,mode,uid,gid,NULL,alias,0); + return yaffs_MknodObject(YAFFS_OBJECT_TYPE_SPECIAL, parent, name, mode, + uid, gid, NULL, NULL, rdev); } -// NB 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_MknodSymLink(yaffs_Object * parent, const YCHAR * name, + __u32 mode, __u32 uid, __u32 gid, + const YCHAR * alias) { - // Get the real object in case we were fed a hard link as an equivalent object + return yaffs_MknodObject(YAFFS_OBJECT_TYPE_SYMLINK, parent, name, mode, + 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) +{ + /* Get the real object in case we were fed a hard link as an equivalent object */ equivalentObject = yaffs_GetEquivalentObject(equivalentObject); - - if(yaffs_MknodObject(YAFFS_OBJECT_TYPE_HARDLINK,parent,name,0,0,0,equivalentObject,NULL,0)) - { + + if (yaffs_MknodObject + (YAFFS_OBJECT_TYPE_HARDLINK, parent, name, 0, 0, 0, + equivalentObject, NULL, 0)) { return equivalentObject; - } - else - { + } else { return NULL; } - + } - -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) - { - newDir = obj->parent; // use the old directory + + yaffs_Object *existingTarget; + + if (newDir == NULL) { + newDir = obj->parent; /* use the old directory */ + } + + if (newDir->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) { + T(YAFFS_TRACE_ALWAYS, + (TSTR + ("tragendy: yaffs_ChangeObjectName: newDir is not a directory" + TENDSTR))); + YBUG(); } - if(newDir->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) - { - T(YAFFS_TRACE_ALWAYS,(TSTR("tragendy: yaffs_ChangeObjectName: newDir is not a directory"TENDSTR))); - YBUG(); - } - - // TODO: Do we need this different handling for YAFFS2 and YAFFS1?? - if(obj->myDev->isYaffs2) - { + /* TODO: Do we need this different handling for YAFFS2 and YAFFS1?? */ + if (obj->myDev->isYaffs2) { unlinkOp = (newDir == obj->myDev->unlinkedDir); - } - else - { - unlinkOp = (newDir == obj->myDev->unlinkedDir && obj->variantType == YAFFS_OBJECT_TYPE_FILE); + } 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, then it is OK to just stuff it in since - // duplicate names are allowed. - // Otherwise only proceed if the new name does not exist and if we're putting it into a directory. - if( (unlinkOp|| - deleteOp || - force || - (shadows > 0) || - !existingTarget) && - newDir->variantType == YAFFS_OBJECT_TYPE_DIRECTORY) - { - yaffs_SetObjectName(obj,newName); + + existingTarget = yaffs_FindObjectByName(newDir, newName); + + /* 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 + * it into a directory. + */ + if ((unlinkOp || + deleteOp || + force || + (shadows > 0) || + !existingTarget) && + newDir->variantType == YAFFS_OBJECT_TYPE_DIRECTORY) { + yaffs_SetObjectName(obj, newName); obj->dirty = 1; - - yaffs_AddObjectToDirectory(newDir,obj); - - if(unlinkOp) 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) - { + + yaffs_AddObjectToDirectory(newDir, obj); + + if (unlinkOp) + 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) 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; yaffs_Object *existingTarget; int force = 0; - + #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) - { + /* 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) { force = 1; - } + } #endif - - obj = yaffs_FindObjectByName(oldDir,oldName); - - if(obj && obj->renameAllowed) - { - - // 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 && - !list_empty(&existingTarget->variant.directoryVariant.children)) - { - // There is a target that is a non-empty directory, so we have to 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 - yaffs_ChangeObjectName(obj,newDir,newName,force,existingTarget->objectId); - yaffs_Unlink(newDir,newName); - } - - - return yaffs_ChangeObjectName(obj,newDir,newName,force,0); + + obj = yaffs_FindObjectByName(oldDir, oldName); + + if (obj && obj->renameAllowed) { + + /* 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 && + !list_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 + */ + yaffs_ChangeObjectName(obj, newDir, newName, force, + existingTarget->objectId); + yaffs_Unlink(newDir, newName); + } + + return yaffs_ChangeObjectName(obj, newDir, newName, force, 0); } return YAFFS_FAIL; } - - -/////////////////////////// Block Management and Page Allocation /////////////////// - - -static int yaffs_InitialiseBlocks(yaffs_Device *dev,int nBlocks) +/*------------------------- Block Management and Page Allocation ----------------*/ + +static int yaffs_InitialiseBlocks(yaffs_Device * dev, int nBlocks) { - dev->allocationBlock = -1; // force it to get a new one - //Todo we're assuming the malloc will pass. + dev->allocationBlock = -1; /* force it to get a new one */ + + /* Todo we're assuming the malloc will pass. */ dev->blockInfo = YMALLOC(nBlocks * sizeof(yaffs_BlockInfo)); - // Set up dynamic blockinfo stuff. - dev->chunkBitmapStride = (dev->nChunksPerBlock+7)/8; + + /* Set up dynamic blockinfo stuff. */ + dev->chunkBitmapStride = (dev->nChunksPerBlock + 7) / 8; dev->chunkBits = YMALLOC(dev->chunkBitmapStride * nBlocks); - if(dev->blockInfo && dev->chunkBits) - { - memset(dev->blockInfo,0,nBlocks * sizeof(yaffs_BlockInfo)); - memset(dev->chunkBits,0,dev->chunkBitmapStride * nBlocks); + if (dev->blockInfo && dev->chunkBits) { + memset(dev->blockInfo, 0, nBlocks * sizeof(yaffs_BlockInfo)); + memset(dev->chunkBits, 0, dev->chunkBitmapStride * nBlocks); return YAFFS_OK; } - + return YAFFS_FAIL; - + } -static void yaffs_DeinitialiseBlocks(yaffs_Device *dev) +static void yaffs_DeinitialiseBlocks(yaffs_Device * dev) { YFREE(dev->blockInfo); dev->blockInfo = NULL; @@ -1812,323 +1767,303 @@ static void yaffs_DeinitialiseBlocks(yaf 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) 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) - { + + if (!dev->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; + 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; } - - // Can't do gc of this block if there are any blocks older than this one that have - // discarded pages. + /* 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); - - + return 1; } -// FindDiretiestBlock is used to select the dirtiest block (or close enough) -// for garbage collection. -// - - - -static int yaffs_FindBlockForGarbageCollection(yaffs_Device *dev,int aggressive) +/* FindDiretiestBlock is used to select the dirtiest block (or close enough) + * for garbage collection. + */ + +static int yaffs_FindBlockForGarbageCollection(yaffs_Device * dev, + int aggressive) { int b = dev->currentDirtyChecker; - + int i; int iterations; int dirtiest = -1; - int pagesInUse; + int pagesInUse; yaffs_BlockInfo *bi; - static int nonAggressiveSkip = 0; - - // If we're doing aggressive GC then we are happy to take a less-dirty block, and - // search harder. - // else (we're doing a leasurely gc), then we only bother to do this if the - // block has only a few pages in use. - + static int nonAggressiveSkip = 0; + + /* If we're doing aggressive GC then we are happy to take a less-dirty block, and + * search harder. + * else (we're doing a leasurely gc), then we only bother to do this if the + * block has only a few pages in use. + */ nonAggressiveSkip--; - if(!aggressive &&(nonAggressiveSkip > 0)) - { + if (!aggressive && (nonAggressiveSkip > 0)) { return -1; } - pagesInUse = (aggressive)? dev->nChunksPerBlock : YAFFS_PASSIVE_GC_CHUNKS + 1; - - if(aggressive) - { - iterations = dev->internalEndBlock - dev->internalStartBlock + 1; - } - else - { - iterations = dev->internalEndBlock - dev->internalStartBlock + 1; - iterations = iterations / 16; - if(iterations > 200) - { + pagesInUse = + (aggressive) ? dev->nChunksPerBlock : YAFFS_PASSIVE_GC_CHUNKS + 1; + + if (aggressive) { + iterations = + dev->internalEndBlock - dev->internalStartBlock + 1; + } else { + iterations = + dev->internalEndBlock - dev->internalStartBlock + 1; + iterations = iterations / 16; + if (iterations > 200) { iterations = 200; } } - - for(i = 0; i <= iterations && pagesInUse > 0 ; i++) - { + + for (i = 0; i <= iterations && pagesInUse > 0; i++) { b++; - if ( b < dev->internalStartBlock || b > dev->internalEndBlock) - { - b = dev->internalStartBlock; + if (b < dev->internalStartBlock || b > dev->internalEndBlock) { + b = dev->internalStartBlock; } - if(b < dev->internalStartBlock || b > dev->internalEndBlock) - { - T(YAFFS_TRACE_ERROR,(TSTR("**>> Block %d is not valid" TENDSTR),b)); + if (b < dev->internalStartBlock || b > dev->internalEndBlock) { + T(YAFFS_TRACE_ERROR, + (TSTR("**>> Block %d is not valid" TENDSTR), b)); YBUG(); } - - bi = yaffs_GetBlockInfo(dev,b); - - if(bi->blockState == YAFFS_BLOCK_STATE_FULL && - (bi->pagesInUse - bi->softDeletions )< pagesInUse && - yaffs_BlockNotDisqualifiedFromGC(dev,bi)) - { + + bi = yaffs_GetBlockInfo(dev, b); + + if (bi->blockState == YAFFS_BLOCK_STATE_FULL && + (bi->pagesInUse - bi->softDeletions) < pagesInUse && + yaffs_BlockNotDisqualifiedFromGC(dev, bi)) { dirtiest = b; pagesInUse = (bi->pagesInUse - bi->softDeletions); } } - + dev->currentDirtyChecker = b; - - if(dirtiest > 0) - { - T(YAFFS_TRACE_GC,(TSTR("GC Selected block %d with %d free" TENDSTR),dirtiest,dev->nChunksPerBlock - pagesInUse)); - } - - dev->oldestDirtySequence = 0; // clear this - - if(dirtiest > 0) - { + + if (dirtiest > 0) { + T(YAFFS_TRACE_GC, + (TSTR("GC Selected block %d with %d free" TENDSTR), dirtiest, + dev->nChunksPerBlock - pagesInUse)); + } + + dev->oldestDirtySequence = 0; + + if (dirtiest > 0) { 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); - + yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, blockNo); + int erasedOk = 0; - - // If the block is still healthy erase it and mark as clean. - // If the block has had a data failure, then retire it. + + /* If the block is still healthy erase it and mark as clean. + * If the block has had a data failure, then retire it. + */ bi->blockState = YAFFS_BLOCK_STATE_DIRTY; - if(!bi->needsRetiring) - { - erasedOk = yaffs_EraseBlockInNAND(dev,blockNo); - if(!erasedOk) - { + if (!bi->needsRetiring) { + erasedOk = yaffs_EraseBlockInNAND(dev, blockNo); + if (!erasedOk) { dev->nErasureFailures++; - T(YAFFS_TRACE_ERROR | YAFFS_TRACE_BAD_BLOCKS,(TSTR("**>> Erasure failed %d" TENDSTR),blockNo)); + T(YAFFS_TRACE_ERROR | YAFFS_TRACE_BAD_BLOCKS, + (TSTR("**>> Erasure failed %d" TENDSTR), blockNo)); } } - if(erasedOk && (yaffs_traceMask & YAFFS_TRACE_ERASE)) - { - int i; - for(i = 0; i < dev->nChunksPerBlock; i++) - { - if(!yaffs_CheckChunkErased(dev,blockNo * dev->nChunksPerBlock + i)) - { - T(YAFFS_TRACE_ERROR,(TSTR(">>Block %d erasure supposedly OK, but chunk %d not erased" TENDSTR),blockNo,i)); - } + if (erasedOk && (yaffs_traceMask & YAFFS_TRACE_ERASE)) { + int i; + for (i = 0; i < dev->nChunksPerBlock; i++) { + if (!yaffs_CheckChunkErased + (dev, blockNo * dev->nChunksPerBlock + i)) { + T(YAFFS_TRACE_ERROR, + (TSTR + (">>Block %d erasure supposedly OK, but chunk %d not erased" + TENDSTR), blockNo, i)); } - } - - if( erasedOk ) - { - // Clean it up... + } + } + + if (erasedOk) { + /* Clean it up... */ bi->blockState = YAFFS_BLOCK_STATE_EMPTY; dev->nErasedBlocks++; bi->pagesInUse = 0; bi->softDeletions = 0; - bi->hasShrinkHeader=0; - yaffs_ClearChunkBits(dev,blockNo); - - T(YAFFS_TRACE_ERASE,(TSTR("Erased block %d" TENDSTR),blockNo)); - } - else - { - dev->nFreeChunks -= dev->nChunksPerBlock; // We lost a block of free space - - yaffs_RetireBlock(dev,blockNo); - T(YAFFS_TRACE_ERROR | YAFFS_TRACE_BAD_BLOCKS,(TSTR("**>> Block %d retired" TENDSTR),blockNo)); + bi->hasShrinkHeader = 0; + yaffs_ClearChunkBits(dev, blockNo); + + T(YAFFS_TRACE_ERASE, + (TSTR("Erased block %d" TENDSTR), blockNo)); + } else { + dev->nFreeChunks -= dev->nChunksPerBlock; /* We lost a block of free space */ + + yaffs_RetireBlock(dev, blockNo); + T(YAFFS_TRACE_ERROR | YAFFS_TRACE_BAD_BLOCKS, + (TSTR("**>> Block %d retired" TENDSTR), blockNo)); } } - -static int yaffs_FindBlockForAllocation(yaffs_Device *dev) +static int yaffs_FindBlockForAllocation(yaffs_Device * dev) { int i; - + yaffs_BlockInfo *bi; - - if(dev->nErasedBlocks < 1) - { - // Hoosterman we've got a problem. - // Can't get space to gc - T(YAFFS_TRACE_ERROR, (TSTR("yaffs tragedy: no more eraased blocks" TENDSTR))); + + if (dev->nErasedBlocks < 1) { + /* Hoosterman we've got a problem. + * Can't get space to gc + */ + T(YAFFS_TRACE_ERROR, + (TSTR("yaffs tragedy: no more eraased blocks" TENDSTR))); return -1; } - // Find an empty block. - - for(i = dev->internalStartBlock; i <= dev->internalEndBlock; i++) - { + /* Find an empty block. */ + + for (i = dev->internalStartBlock; i <= dev->internalEndBlock; i++) { dev->allocationBlockFinder++; - if(dev->allocationBlockFinder < dev->internalStartBlock || dev->allocationBlockFinder> dev->internalEndBlock) - { + if (dev->allocationBlockFinder < dev->internalStartBlock + || dev->allocationBlockFinder > dev->internalEndBlock) { dev->allocationBlockFinder = dev->internalStartBlock; } - - bi = yaffs_GetBlockInfo(dev,dev->allocationBlockFinder); - - if(bi->blockState == YAFFS_BLOCK_STATE_EMPTY) - { + + bi = yaffs_GetBlockInfo(dev, dev->allocationBlockFinder); + + if (bi->blockState == YAFFS_BLOCK_STATE_EMPTY) { bi->blockState = YAFFS_BLOCK_STATE_ALLOCATING; dev->sequenceNumber++; bi->sequenceNumber = dev->sequenceNumber; - dev->nErasedBlocks--; - T(YAFFS_TRACE_ALLOCATE,(TSTR("Allocated block %d, seq %d, %d left" TENDSTR),dev->allocationBlockFinder,dev->sequenceNumber, dev->nErasedBlocks)); + dev->nErasedBlocks--; + T(YAFFS_TRACE_ALLOCATE, + (TSTR("Allocated block %d, seq %d, %d left" TENDSTR), + dev->allocationBlockFinder, dev->sequenceNumber, + dev->nErasedBlocks)); return dev->allocationBlockFinder; } } - - - T(YAFFS_TRACE_ALWAYS, (TSTR("yaffs tragedy: no more eraased blocks, but there should have been %d" TENDSTR),dev->nErasedBlocks)); - - - - - - return -1; + + T(YAFFS_TRACE_ALWAYS, + (TSTR + ("yaffs tragedy: no more eraased blocks, but there should have been %d" + TENDSTR), dev->nErasedBlocks)); + + return -1; } -// To determine if we have enough space we just look at the -// number of erased blocks. - -static int yaffs_CheckSpaceForAllocation(yaffs_Device *dev) + +static int yaffs_CheckSpaceForAllocation(yaffs_Device * dev) { int reservedChunks = (dev->nReservedBlocks * dev->nChunksPerBlock); return (dev->nFreeChunks > reservedChunks); } - -static int yaffs_AllocateChunk(yaffs_Device *dev,int useReserve) +static int yaffs_AllocateChunk(yaffs_Device * dev, int useReserve) { int retVal; yaffs_BlockInfo *bi; - - if(dev->allocationBlock < 0) - { - // Get next block to allocate off + + if (dev->allocationBlock < 0) { + /* Get next block to allocate off */ dev->allocationBlock = yaffs_FindBlockForAllocation(dev); dev->allocationPage = 0; } - - if(!useReserve && !yaffs_CheckSpaceForAllocation(dev)) - { - // Not enough space to allocate unless we're allowed to use the reserve. + + if (!useReserve && !yaffs_CheckSpaceForAllocation(dev)) { + /* Not enough space to allocate unless we're allowed to use the reserve. */ return -1; } - if(dev->nErasedBlocks < dev->nReservedBlocks && dev->allocationPage == 0) - { - T(YAFFS_TRACE_ALLOCATE,(TSTR("Allocating reserve" TENDSTR))); - } - - - // Next page please.... - if(dev->allocationBlock >= 0) - { - bi = yaffs_GetBlockInfo(dev,dev->allocationBlock); - - retVal = (dev->allocationBlock * dev->nChunksPerBlock) + - dev->allocationPage; + if (dev->nErasedBlocks < dev->nReservedBlocks + && dev->allocationPage == 0) { + T(YAFFS_TRACE_ALLOCATE, (TSTR("Allocating reserve" TENDSTR))); + } + + /* Next page please.... */ + if (dev->allocationBlock >= 0) { + bi = yaffs_GetBlockInfo(dev, dev->allocationBlock); + + retVal = (dev->allocationBlock * dev->nChunksPerBlock) + + dev->allocationPage; bi->pagesInUse++; - yaffs_SetChunkBit(dev,dev->allocationBlock,dev->allocationPage); + yaffs_SetChunkBit(dev, dev->allocationBlock, + dev->allocationPage); dev->allocationPage++; - + dev->nFreeChunks--; - - // If the block is full set the state to full - if(dev->allocationPage >= dev->nChunksPerBlock) - { + + /* If the block is full set the state to full */ + if (dev->allocationPage >= dev->nChunksPerBlock) { bi->blockState = YAFFS_BLOCK_STATE_FULL; dev->allocationBlock = -1; } - return retVal; - - } - T(YAFFS_TRACE_ERROR,(TSTR("!!!!!!!!! Allocator out !!!!!!!!!!!!!!!!!" TENDSTR))); - - return -1; + } + + T(YAFFS_TRACE_ERROR, + (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; - - if(dev->allocationBlock> 0) - { - n += (dev->nChunksPerBlock - dev->allocationPage); - } - - return n; + int n; + + n = dev->nErasedBlocks * dev->nChunksPerBlock; + + if (dev->allocationBlock > 0) { + n += (dev->nChunksPerBlock - dev->allocationPage); + } + + return n; } -static int yaffs_GarbageCollectBlock(yaffs_Device *dev,int block) +static int yaffs_GarbageCollectBlock(yaffs_Device * dev, int block) { int oldChunk; int newChunk; @@ -2141,335 +2076,343 @@ static int yaffs_GarbageCollectBlock(ya int chunksBefore = yaffs_GetErasedChunks(dev); int chunksAfter; - yaffs_ExtendedTags tags; - - yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev,block); - + yaffs_ExtendedTags tags; + + yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, block); + yaffs_Object *object; - + bi->blockState = YAFFS_BLOCK_STATE_COLLECTING; - T(YAFFS_TRACE_TRACING,(TSTR("Collecting block %d, in use %d, shrink %d, " TENDSTR),block,bi->pagesInUse,bi->hasShrinkHeader)); - //T(("Collecting block %d n %d bits %x\n",block, bi->pagesInUse, bi->pageBits)); - - //yaffs_VerifyFreeChunks(dev); - - bi->hasShrinkHeader = 0; // clear the flag so that the block can erase - - dev->nFreeChunks -= bi->softDeletions; // Take off the number of soft deleted entries because - // they're going to get really deleted during GC. + T(YAFFS_TRACE_TRACING, + (TSTR("Collecting block %d, in use %d, shrink %d, " TENDSTR), block, + bi->pagesInUse, bi->hasShrinkHeader)); + + /*yaffs_VerifyFreeChunks(dev); */ + + 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(!yaffs_StillSomeChunkBits(dev,block)) - { - T(YAFFS_TRACE_TRACING,(TSTR("Collecting block %d that has no chunks in use" TENDSTR),block)); - yaffs_BlockBecameDirty(dev,block); - } - else - { - - __u8 *buffer = yaffs_GetTempBuffer(dev,__LINE__); - - for(chunkInBlock = 0,oldChunk = block * dev->nChunksPerBlock; - chunkInBlock < dev->nChunksPerBlock && yaffs_StillSomeChunkBits(dev,block); - chunkInBlock++, oldChunk++ ) - { - if(yaffs_CheckChunkBit(dev,block,chunkInBlock)) - { - - // This page is in use and might need to be copied off - - markNAND = 1; - - //T(("copying page %x from %d to %d\n",mask,oldChunk,newChunk)); - - yaffs_InitialiseTags(&tags); - - yaffs_ReadChunkWithTagsFromNAND(dev,oldChunk,buffer, &tags); - - object = yaffs_FindObjectByNumber(dev,tags.objectId); - - T(YAFFS_TRACE_GC_DETAIL,(TSTR("Collecting page %d, %d %d %d " TENDSTR),chunkInBlock,tags.objectId,tags.chunkId,tags.byteCount)); - - if(!object) - { - T(YAFFS_TRACE_ERROR,(TSTR("page %d in gc has no object " TENDSTR),oldChunk)); - } - - if(object && object->deleted && tags.chunkId != 0) - { - // Data chunk in a deleted file, throw it away - // It's a soft deleted data chunk, - // No need to copy this, just forget about it and fix up the - // object. - - //yaffs_PutChunkIntoFile(object, tags.chunkId, 0,0); - object->nDataChunks--; - - if(object->nDataChunks <= 0) - { - // remeber to clean up the object - dev->gcCleanupList[cleanups] = tags.objectId; - cleanups++; - } - markNAND = 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. - object->chunkId = 0; - yaffs_FreeTnode(object->myDev,object->variant.fileVariant.top); - object->variant.fileVariant.top = NULL; - yaffs_DoGenericObjectDeletion(object); - - } - else if(object) - { - // It's either a data chunk in a live file or - // an ObjectHeader, so we're interested in it. - // NB Need to keep the ObjectHeaders of deleted files - // until the whole file has been deleted off - tags.serialNumber++; - - dev->nGCCopies++; - - if(tags.chunkId == 0) - { - // It is an object Id, - // We need to nuke the shrinkheader flags first - // 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 = (yaffs_ObjectHeader *)buffer; - oh->isShrink = 0; - oh->shadowsObject = -1; - tags.extraShadows = 0; - tags.extraIsShrinkHeader = 0; + if (!yaffs_StillSomeChunkBits(dev, block)) { + T(YAFFS_TRACE_TRACING, + (TSTR + ("Collecting block %d that has no chunks in use" TENDSTR), + block)); + yaffs_BlockBecameDirty(dev, block); + } else { + + __u8 *buffer = yaffs_GetTempBuffer(dev, __LINE__); + + for (chunkInBlock = 0, oldChunk = block * dev->nChunksPerBlock; + chunkInBlock < dev->nChunksPerBlock + && yaffs_StillSomeChunkBits(dev, block); + chunkInBlock++, oldChunk++) { + if (yaffs_CheckChunkBit(dev, block, chunkInBlock)) { + + /* This page is in use and might need to be copied off */ + + markNAND = 1; + + yaffs_InitialiseTags(&tags); + + yaffs_ReadChunkWithTagsFromNAND(dev, oldChunk, + buffer, &tags); + + object = + yaffs_FindObjectByNumber(dev, + tags.objectId); + + T(YAFFS_TRACE_GC_DETAIL, + (TSTR + ("Collecting page %d, %d %d %d " TENDSTR), + chunkInBlock, tags.objectId, tags.chunkId, + tags.byteCount)); + + if (!object) { + T(YAFFS_TRACE_ERROR, + (TSTR + ("page %d in gc has no object " + TENDSTR), oldChunk)); } - newChunk = yaffs_WriteNewChunkWithTagsToNAND(dev, buffer, &tags,1); - - if(newChunk < 0) - { - retVal = YAFFS_FAIL; - } - else - { - - // Ok, now fix up the Tnodes etc. - - if(tags.chunkId == 0) - { - // It's a header - object->chunkId = newChunk; - object->serial = tags.serialNumber; + if (object && object->deleted + && tags.chunkId != 0) { + /* Data chunk in a deleted file, throw it away + * It's a soft deleted data chunk, + * No need to copy this, just forget about it and + * fix up the object. + */ + + object->nDataChunks--; + + if (object->nDataChunks <= 0) { + /* remeber to clean up the object */ + dev->gcCleanupList[cleanups] = + tags.objectId; + cleanups++; } - else - { - // It's a data chunk - yaffs_PutChunkIntoFile(object, tags.chunkId, newChunk,0); + markNAND = 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. + */ + object->chunkId = 0; + yaffs_FreeTnode(object->myDev, + object->variant. + fileVariant.top); + object->variant.fileVariant.top = NULL; + yaffs_DoGenericObjectDeletion(object); + + } else if (object) { + /* It's either a data chunk in a live file or + * an ObjectHeader, so we're interested in it. + * NB Need to keep the ObjectHeaders of deleted files + * until the whole file has been deleted off + */ + tags.serialNumber++; + + dev->nGCCopies++; + + if (tags.chunkId == 0) { + /* It is an object Id, + * We need to nuke the shrinkheader flags first + * 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; + oh->shadowsObject = -1; + tags.extraShadows = 0; + tags.extraIsShrinkHeader = 0; + } + + newChunk = + yaffs_WriteNewChunkWithTagsToNAND(dev, buffer, &tags, 1); + + if (newChunk < 0) { + retVal = YAFFS_FAIL; + } else { + + /* Ok, now fix up the Tnodes etc. */ + + if (tags.chunkId == 0) { + /* It's a header */ + object->chunkId = newChunk; + object->serial = tags.serialNumber; + } else { + /* It's a data chunk */ + yaffs_PutChunkIntoFile + (object, + tags.chunkId, + newChunk, 0); + } } } + + yaffs_DeleteChunk(dev, oldChunk, markNAND, __LINE__); + } - - yaffs_DeleteChunk(dev,oldChunk,markNAND,__LINE__); - + } + + yaffs_ReleaseTempBuffer(dev, buffer, __LINE__); + + + /* Do any required cleanups */ + for (i = 0; i < cleanups; i++) { + /* Time to delete the file too */ + object = + yaffs_FindObjectByNumber(dev, + dev->gcCleanupList[i]); + if (object) { + yaffs_FreeTnode(dev, + object->variant.fileVariant. + top); + object->variant.fileVariant.top = NULL; + T(YAFFS_TRACE_GC, + (TSTR + ("yaffs: About to finally delete object %d" + TENDSTR), object->objectId)); + yaffs_DoGenericObjectDeletion(object); + } + } - } - - yaffs_ReleaseTempBuffer(dev,buffer,__LINE__); - - //yaffs_VerifyFreeChunks(dev); - - // Do any required cleanups - for(i = 0; i < cleanups; i++) - { - // Time to delete the file too - object = yaffs_FindObjectByNumber(dev,dev->gcCleanupList[i]); - if(object) - { - yaffs_FreeTnode(dev,object->variant.fileVariant.top); - object->variant.fileVariant.top = NULL; - T(YAFFS_TRACE_GC,(TSTR("yaffs: About to finally delete object %d" TENDSTR),object->objectId)); - yaffs_DoGenericObjectDeletion(object); - } - - } - - } - - if(chunksBefore >= (chunksAfter = yaffs_GetErasedChunks(dev))) - { - T(YAFFS_TRACE_GC,(TSTR("gc did not increase free chunks before %d after %d" TENDSTR),chunksBefore,chunksAfter)); + + } + + if (chunksBefore >= (chunksAfter = yaffs_GetErasedChunks(dev))) { + T(YAFFS_TRACE_GC, + (TSTR + ("gc did not increase free chunks before %d after %d" + TENDSTR), chunksBefore, chunksAfter)); + } + + dev->isDoingGC = 0; + + return YAFFS_OK; +} + +/* New garbage collector + * If we're very low on erased blocks then we do aggressive garbage collection + * otherwise we do "leasurely" garbage collection. + * Aggressive gc looks further (whole array) and will accept less dirty blocks. + * Passive gc only inspects smaller areas and will only accept more dirty blocks. + * + * 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) +{ + int block; + int aggressive; + int gcOk = YAFFS_OK; + int maxTries = 0; + + if (dev->isDoingGC) { + /* Bail out so we don't get recursive gc */ + return YAFFS_OK; } - - dev->isDoingGC = 0; - - //yaffs_VerifyFreeChunks(dev); - - return YAFFS_OK; -} - - -// New garbage collector -// If we're very low on erased blocks then we do aggressive garbage collection -// otherwise we do "leasurely" garbage collection. -// Aggressive gc looks further (whole array) and will accept dirtier blocks. -// Passive gc only inspects smaller areas and will only accept cleaner blocks. -// -// 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) -{ - int block; - int aggressive; - int gcOk = YAFFS_OK; - int maxTries = 0; - - //yaffs_VerifyFreeChunks(dev); - - 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{ + /* This loop should pass the first time. + * We'll only see looping here if the erase of the collected block fails. + */ + + do { maxTries++; - if(dev->nErasedBlocks < dev->nReservedBlocks) - { - // We need a block soon... + if (dev->nErasedBlocks < dev->nReservedBlocks) { + /* We need a block soon...*/ aggressive = 1; - } - else - { - // We're in no hurry + } else { + /* We're in no hurry */ aggressive = 0; } - - block = yaffs_FindBlockForGarbageCollection(dev,aggressive); - - if(block > 0) - { + + block = yaffs_FindBlockForGarbageCollection(dev, aggressive); + + 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); + T(YAFFS_TRACE_GC, + (TSTR + ("yaffs: GC erasedBlocks %d aggressive %d" TENDSTR), + dev->nErasedBlocks, aggressive)); + + gcOk = yaffs_GarbageCollectBlock(dev, block); } - if(dev->nErasedBlocks < (dev->nReservedBlocks) && block > 0) - { - T(YAFFS_TRACE_GC,(TSTR("yaffs: GC !!!no reclaim!!! erasedBlocks %d after try %d block %d" TENDSTR),dev->nErasedBlocks,maxTries,block)); + if (dev->nErasedBlocks < (dev->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) && (block > 0) && (maxTries < 2)); - - return aggressive ? gcOk: YAFFS_OK; + } while ((dev->nErasedBlocks < dev->nReservedBlocks) && (block > 0) + && (maxTries < 2)); + + return aggressive ? gcOk : YAFFS_OK; } - -//////////////////////////// TAGS /////////////////////////////////////// - - - -static int yaffs_TagsMatch(const yaffs_ExtendedTags *tags, int objectId, int chunkInObject) +/*------------------------- TAGS --------------------------------*/ + +static int yaffs_TagsMatch(const yaffs_ExtendedTags * tags, int objectId, + int chunkInObject) { - return ( tags->chunkId == chunkInObject && - tags->objectId == objectId && - !tags->chunkDeleted) ? 1 : 0; - + return (tags->chunkId == chunkInObject && + tags->objectId == objectId && !tags->chunkDeleted) ? 1 : 0; + } -///////////////////////////////////////////////////////////////////////////////////////////////////////// - - -static int yaffs_FindChunkInFile(yaffs_Object *in,int chunkInInode,yaffs_ExtendedTags *tags) + +/*-------------------- Data file manipulation -----------------*/ + +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; - int theChunk = -1; - yaffs_ExtendedTags localTags; - int retVal = -1; - - yaffs_Device *dev = in->myDev; - - - if(!tags) - { - // Passed a NULL, so use our own tags space - tags = &localTags; - } - - tn = yaffs_FindLevel0Tnode(dev,&in->variant.fileVariant, chunkInInode); - - if(tn) - { - theChunk = tn->level0[chunkInInode & YAFFS_TNODES_LEVEL0_MASK] << dev->chunkGroupBits; - - retVal = yaffs_FindChunkInGroup(dev,theChunk,tags,in->objectId,chunkInInode); - } - return retVal; + /*Get the Tnode, then get the level 0 offset chunk offset */ + yaffs_Tnode *tn; + int theChunk = -1; + yaffs_ExtendedTags localTags; + int retVal = -1; + + yaffs_Device *dev = in->myDev; + + if (!tags) { + /* Passed a NULL, so use our own tags space */ + tags = &localTags; + } + + tn = yaffs_FindLevel0Tnode(dev, &in->variant.fileVariant, chunkInInode); + + if (tn) { + theChunk = + tn->level0[chunkInInode & YAFFS_TNODES_LEVEL0_MASK] << + dev->chunkGroupBits; + + retVal = + yaffs_FindChunkInGroup(dev, theChunk, tags, in->objectId, + 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; - int theChunk = -1; - yaffs_ExtendedTags localTags; - - yaffs_Device *dev = in->myDev; - int retVal = -1; - - if(!tags) - { - // Passed a NULL, so use our own tags space - tags = &localTags; - } - - tn = yaffs_FindLevel0Tnode(dev,&in->variant.fileVariant, chunkInInode); - - if(tn) - { - - theChunk = tn->level0[chunkInInode & YAFFS_TNODES_LEVEL0_MASK] << dev->chunkGroupBits; - - retVal = yaffs_FindChunkInGroup(dev,theChunk,tags,in->objectId,chunkInInode); - - // Delete the entry in the filestructure (if found) - if(retVal != -1) - { + /* Get the Tnode, then get the level 0 offset chunk offset */ + yaffs_Tnode *tn; + int theChunk = -1; + yaffs_ExtendedTags localTags; + + yaffs_Device *dev = in->myDev; + int retVal = -1; + + if (!tags) { + /* Passed a NULL, so use our own tags space */ + tags = &localTags; + } + + tn = yaffs_FindLevel0Tnode(dev, &in->variant.fileVariant, chunkInInode); + + if (tn) { + + theChunk = + tn->level0[chunkInInode & YAFFS_TNODES_LEVEL0_MASK] << dev-> + chunkGroupBits; + + retVal = + yaffs_FindChunkInGroup(dev, theChunk, tags, in->objectId, + chunkInInode); + + /* Delete the entry in the filestructure (if found) */ + if (retVal != -1) { tn->level0[chunkInInode & YAFFS_TNODES_LEVEL0_MASK] = 0; } - } - else - { - //T(("No level 0 found for %d\n", chunkInInode)); - } - - if(retVal == -1) - { - //T(("Could not find %d to delete\n",chunkInInode)); - } - return retVal; + } else { + /*T(("No level 0 found for %d\n", chunkInInode)); */ + } + + 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; @@ -2477,376 +2420,355 @@ static int yaffs_CheckFileSanity(yaffs_O int failed = 0; int objId; yaffs_Tnode *tn; - yaffs_Tags localTags; - yaffs_Tags *tags = &localTags; - int theChunk; - int chunkDeleted; - - - if(in->variantType != YAFFS_OBJECT_TYPE_FILE) - { - //T(("Object not a file\n")); + yaffs_Tags localTags; + yaffs_Tags *tags = &localTags; + int theChunk; + int chunkDeleted; + + if (in->variantType != YAFFS_OBJECT_TYPE_FILE) { + /* T(("Object not a file\n")); */ return YAFFS_FAIL; } - + objId = in->objectId; - fSize = in->variant.fileVariant.fileSize; - nChunks = (fSize + in->myDev->nBytesPerChunk -1)/in->myDev->nBytesPerChunk; - - for(chunk = 1; chunk <= nChunks; chunk++) - { - tn = yaffs_FindLevel0Tnode(in->myDev,&in->variant.fileVariant, chunk); - - if(tn) - { - - theChunk = tn->level0[chunk & YAFFS_TNODES_LEVEL0_MASK] << in->myDev->chunkGroupBits; - - if(yaffs_CheckChunkBits(dev,theChunk/dev->nChunksPerBlock,theChunk%dev->nChunksPerBlock)) - { - - - yaffs_ReadChunkTagsFromNAND(in->myDev,theChunk,tags,&chunkDeleted); - if(yaffs_TagsMatch(tags,in->objectId,chunk,chunkDeleted)) - { - // found it; - + fSize = in->variant.fileVariant.fileSize; + nChunks = + (fSize + in->myDev->nBytesPerChunk - 1) / in->myDev->nBytesPerChunk; + + for (chunk = 1; chunk <= nChunks; chunk++) { + tn = yaffs_FindLevel0Tnode(in->myDev, &in->variant.fileVariant, + chunk); + + if (tn) { + + theChunk = + tn->level0[chunk & YAFFS_TNODES_LEVEL0_MASK] << in-> + myDev->chunkGroupBits; + + if (yaffs_CheckChunkBits + (dev, theChunk / dev->nChunksPerBlock, + theChunk % dev->nChunksPerBlock)) { + + yaffs_ReadChunkTagsFromNAND(in->myDev, theChunk, + tags, + &chunkDeleted); + if (yaffs_TagsMatch + (tags, in->objectId, chunk, chunkDeleted)) { + /* found it; */ + } - } - else - { - //T(("File problem file [%d,%d] NAND %d tags[%d,%d]\n", - // objId,chunk,theChunk,tags->chunkId,tags->objectId); - + } else { + failed = 1; - } - + + } else { + /* T(("No level 0 found for %d\n", chunk)); */ } - else - { - //T(("No level 0 found for %d\n", chunk)); - } - } - + } + return failed ? YAFFS_FAIL : YAFFS_OK; } #endif -static int yaffs_PutChunkIntoFile(yaffs_Object *in,int chunkInInode, int chunkInNAND, int inScan) +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; for backward scanning inScan is < 0 + /* NB inScan is zero unless scanning. + * For forward scanning, inScan is > 0; + * for backward scanning inScan is < 0 + */ + yaffs_Tnode *tn; yaffs_Device *dev = in->myDev; int existingChunk; yaffs_ExtendedTags existingTags; yaffs_ExtendedTags newTags; unsigned existingSerial, newSerial; - - if(in->variantType != YAFFS_OBJECT_TYPE_FILE) - { - // Just ignore an attempt at putting a chunk into a non-file during scanning - // If it is not during Scanning then something went wrong! - if(!inScan) - { - T(YAFFS_TRACE_ERROR, (TSTR("yaffs tragedy:attempt to put data chunk into a non-file" TENDSTR))); + + if (in->variantType != YAFFS_OBJECT_TYPE_FILE) { + /* Just ignore an attempt at putting a chunk into a non-file during scanning + * If it is not during Scanning then something went wrong! + */ + if (!inScan) { + T(YAFFS_TRACE_ERROR, + (TSTR + ("yaffs tragedy:attempt to put data chunk into a non-file" + TENDSTR))); YBUG(); } - - yaffs_DeleteChunk(dev,chunkInNAND,1,__LINE__); + + yaffs_DeleteChunk(dev, chunkInNAND, 1, __LINE__); return YAFFS_OK; } - - tn = yaffs_AddOrFindLevel0Tnode(dev,&in->variant.fileVariant, chunkInInode); - if(!tn) - { + + tn = yaffs_AddOrFindLevel0Tnode(dev, &in->variant.fileVariant, + chunkInInode); + if (!tn) { return YAFFS_FAIL; } - existingChunk = tn->level0[chunkInInode & YAFFS_TNODES_LEVEL0_MASK]; - - 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 - // happen when the power fails during a write, then only one - // chunk should ever be affected. - // - // Correction for YAFFS2: This could happen quite a lot and we need to think about efficiency! TODO - // Update: For backward scanning we don't need to re-read tags so this is quite cheap. - - - - if(existingChunk != 0) - { - // NB Right now existing chunk will not be real chunkId if the device >= 32MB - // thus we have to do a FindChunkInFile to get the real chunk id. - // - // We have a duplicate now we need to decide which one to use: - // - // Backwards scanning YAFFS2: The old one is what we use, dump the new one. - // Forward scanning YAFFS2: The new one is what we use, dump the old one. - // YAFFS1: Get both sets of tags and compare serial numbers. - // - // - - if(inScan > 0) - { - // Only do this for forward scanning - yaffs_ReadChunkWithTagsFromNAND(dev,chunkInNAND, NULL,&newTags); - - - // Do a proper find - existingChunk = yaffs_FindChunkInFile(in,chunkInInode, &existingTags); + existingChunk = tn->level0[chunkInInode & YAFFS_TNODES_LEVEL0_MASK]; + + 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 + * happen when the power fails during a write, then only one + * chunk should ever be affected. + * + * Correction for YAFFS2: This could happen quite a lot and we need to think about efficiency! TODO + * Update: For backward scanning we don't need to re-read tags so this is quite cheap. + */ + + if (existingChunk != 0) { + /* NB Right now existing chunk will not be real chunkId if the device >= 32MB + * thus we have to do a FindChunkInFile to get the real chunk id. + * + * We have a duplicate now we need to decide which one to use: + * + * Backwards scanning YAFFS2: The old one is what we use, dump the new one. + * Forward scanning YAFFS2: The new one is what we use, dump the old one. + * YAFFS1: Get both sets of tags and compare serial numbers. + */ + + if (inScan > 0) { + /* Only do this for forward scanning */ + yaffs_ReadChunkWithTagsFromNAND(dev, + chunkInNAND, + NULL, &newTags); + + /* Do a proper find */ + existingChunk = + yaffs_FindChunkInFile(in, chunkInInode, + &existingTags); } - if(existingChunk <=0) - { - //Hoosterman - how did this happen? - - T(YAFFS_TRACE_ERROR, (TSTR("yaffs tragedy: existing chunk < 0 in scan" TENDSTR))); + if (existingChunk <= 0) { + /*Hoosterman - how did this happen? */ + + T(YAFFS_TRACE_ERROR, + (TSTR + ("yaffs tragedy: existing chunk < 0 in scan" + TENDSTR))); } - - // NB The deleted flags should be false, otherwise the chunks will - // not be loaded during a scan - + /* NB The deleted flags should be false, otherwise the chunks will + * not be loaded during a scan + */ + newSerial = newTags.serialNumber; existingSerial = existingTags.serialNumber; - - if( (inScan > 0) && - ( in->myDev->isYaffs2 || - existingChunk <= 0 || - ((existingSerial+1) & 3) == newSerial)) - { - // Forward scanning. - // Use new - // Delete the old one and drop through to update the tnode - yaffs_DeleteChunk(dev,existingChunk,1,__LINE__); - } - else - { - // Backward scanning or we want to use the existing one - // Use existing. - // Delete the new one and return early so that the tnode isn't changed - yaffs_DeleteChunk(dev,chunkInNAND,1,__LINE__); + + if ((inScan > 0) && + (in->myDev->isYaffs2 || + existingChunk <= 0 || + ((existingSerial + 1) & 3) == newSerial)) { + /* Forward scanning. + * Use new + * Delete the old one and drop through to update the tnode + */ + yaffs_DeleteChunk(dev, existingChunk, 1, + __LINE__); + } else { + /* Backward scanning or we want to use the existing one + * Use existing. + * Delete the new one and return early so that the tnode isn't changed + */ + yaffs_DeleteChunk(dev, chunkInNAND, 1, + __LINE__); return YAFFS_OK; } } } - - if(existingChunk == 0) - { + + if (existingChunk == 0) { in->nDataChunks++; } - - tn->level0[chunkInInode & YAFFS_TNODES_LEVEL0_MASK] = (chunkInNAND >> dev->chunkGroupBits); - + + tn->level0[chunkInInode & YAFFS_TNODES_LEVEL0_MASK] = + (chunkInNAND >> dev->chunkGroupBits); + 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) - { - return yaffs_ReadChunkWithTagsFromNAND(in->myDev,chunkInNAND,buffer,NULL); - } - else - { - T(YAFFS_TRACE_NANDACCESS,(TSTR("Chunk %d not found zero instead" TENDSTR),chunkInNAND)); - - memset(buffer,0,in->myDev->nBytesPerChunk); // get sane data if you read a hole + int chunkInNAND = yaffs_FindChunkInFile(in, chunkInInode, NULL); + + if (chunkInNAND >= 0) { + return yaffs_ReadChunkWithTagsFromNAND(in->myDev, chunkInNAND, + 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->nBytesPerChunk); 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; yaffs_ExtendedTags tags; yaffs_BlockInfo *bi; - - if(chunkId <= 0) return; - + + if (chunkId <= 0) + return; + dev->nDeletions++; block = chunkId / dev->nChunksPerBlock; page = chunkId % dev->nChunksPerBlock; - - bi = yaffs_GetBlockInfo(dev,block); - - T(YAFFS_TRACE_DELETION,(TSTR("line %d delete of chunk %d" TENDSTR),lyn,chunkId)); - - if(markNAND && - bi->blockState != YAFFS_BLOCK_STATE_COLLECTING && - !dev->isYaffs2) - { -// yaffs_SpareInitialise(&spare); + + bi = yaffs_GetBlockInfo(dev, block); + + T(YAFFS_TRACE_DELETION, + (TSTR("line %d delete of chunk %d" TENDSTR), lyn, chunkId)); + + if (markNAND && + bi->blockState != YAFFS_BLOCK_STATE_COLLECTING && !dev->isYaffs2) { #ifdef CONFIG_MTD_NAND_VERIFY_WRITE - //read data before write, to ensure correct ecc - //if we're using MTD verification under Linux - yaffs_ReadChunkFromNAND(dev,chunkId,NULL,&spare,0); + /* Read data before write, to ensure correct ecc + * if we're using MTD verification under Linux + */ + yaffs_ReadChunkFromNAND(dev, chunkId, NULL, &spare, 0); #endif yaffs_InitialiseTags(&tags); tags.chunkDeleted = 1; - - yaffs_WriteChunkWithTagsToNAND(dev,chunkId,NULL,&tags); - yaffs_HandleUpdateChunk(dev,chunkId,&tags); - } - else - { - dev->nUnmarkedDeletions++; - } - - - // Pull out of the management area. - // If the whole block became dirty, this will kick off an erasure. - if( bi->blockState == YAFFS_BLOCK_STATE_ALLOCATING || - bi->blockState == YAFFS_BLOCK_STATE_FULL || + yaffs_WriteChunkWithTagsToNAND(dev, chunkId, NULL, &tags); + yaffs_HandleUpdateChunk(dev, chunkId, &tags); + } else { + dev->nUnmarkedDeletions++; + } + + /* Pull out of the management area. + * If the whole block became dirty, this will kick off an erasure. + */ + if (bi->blockState == YAFFS_BLOCK_STATE_ALLOCATING || + bi->blockState == YAFFS_BLOCK_STATE_FULL || bi->blockState == YAFFS_BLOCK_STATE_NEEDS_SCANNING || - bi->blockState == YAFFS_BLOCK_STATE_COLLECTING) - { - dev->nFreeChunks++; - - yaffs_ClearChunkBit(dev,block,page); - + bi->blockState == YAFFS_BLOCK_STATE_COLLECTING) { + dev->nFreeChunks++; + + yaffs_ClearChunkBit(dev, block, page); + bi->pagesInUse--; - - if(bi->pagesInUse == 0 && - !bi->hasShrinkHeader && - bi->blockState != YAFFS_BLOCK_STATE_ALLOCATING && - bi->blockState != YAFFS_BLOCK_STATE_NEEDS_SCANNING) - { - yaffs_BlockBecameDirty(dev,block); - } - - } - else - { - // T(("Bad news deleting chunk %d\n",chunkId)); - } - + + if (bi->pagesInUse == 0 && + !bi->hasShrinkHeader && + bi->blockState != YAFFS_BLOCK_STATE_ALLOCATING && + bi->blockState != YAFFS_BLOCK_STATE_NEEDS_SCANNING) { + 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,int useReserve) +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 - // Write new one and patch into tree. - // Invalidate old tags. - - int prevChunkId; - yaffs_ExtendedTags prevTags; - - int newChunkId; - yaffs_ExtendedTags newTags; - - yaffs_Device *dev = in->myDev; + /* Find old chunk Need to do this to get serial number + * Write new one and patch into tree. + * Invalidate old tags. + */ + + int prevChunkId; + yaffs_ExtendedTags prevTags; + + int newChunkId; + yaffs_ExtendedTags newTags; + + yaffs_Device *dev = in->myDev; yaffs_CheckGarbageCollection(dev); - // Get the previous chunk at this location in the file if it exists - prevChunkId = yaffs_FindChunkInFile(in,chunkInInode,&prevTags); - - // Set up new tags - yaffs_InitialiseTags(&newTags); - - newTags.chunkId = chunkInInode; + /* Get the previous chunk at this location in the file if it exists */ + prevChunkId = yaffs_FindChunkInFile(in, chunkInInode, &prevTags); + + /* Set up new tags */ + yaffs_InitialiseTags(&newTags); + + newTags.chunkId = chunkInInode; newTags.objectId = in->objectId; - newTags.serialNumber = (prevChunkId >= 0) ? prevTags.serialNumber + 1 : 1; - newTags.byteCount = nBytes; - -// yaffs_CalcTagsECC(&newTags); - - newChunkId = yaffs_WriteNewChunkWithTagsToNAND(dev,buffer,&newTags,useReserve); - - if(newChunkId >= 0) - { - yaffs_PutChunkIntoFile(in,chunkInInode,newChunkId,0); - - - if(prevChunkId >= 0) - { - yaffs_DeleteChunk(dev,prevChunkId,1,__LINE__); - + newTags.serialNumber = + (prevChunkId >= 0) ? prevTags.serialNumber + 1 : 1; + newTags.byteCount = nBytes; + + newChunkId = + yaffs_WriteNewChunkWithTagsToNAND(dev, buffer, &newTags, + useReserve); + + if (newChunkId >= 0) { + yaffs_PutChunkIntoFile(in, chunkInInode, newChunkId, 0); + + if (prevChunkId >= 0) { + yaffs_DeleteChunk(dev, prevChunkId, 1, __LINE__); + } - + yaffs_CheckFileSanity(in); } return newChunkId; - - - - } - -// 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 isShrink,int shadows) +/* 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 isShrink, int shadows) { yaffs_BlockInfo *bi; - + yaffs_Device *dev = in->myDev; - - int prevChunkId; - int retVal = 0; - - int newChunkId; - yaffs_ExtendedTags newTags; - - __u8 *buffer = NULL; - YCHAR oldName[YAFFS_MAX_NAME_LENGTH+1]; - - // __u8 bufferOld[YAFFS_BYTES_PER_CHUNK]; - - yaffs_ObjectHeader *oh = NULL; - // yaffs_ObjectHeader *ohOld = (yaffs_ObjectHeader *)bufferOld; - - - if(!in->fake || force) - { - - yaffs_CheckGarbageCollection(dev); - - buffer = yaffs_GetTempBuffer(in->myDev,__LINE__); - oh = (yaffs_ObjectHeader *)buffer; - + + int prevChunkId; + int retVal = 0; + + int newChunkId; + yaffs_ExtendedTags newTags; + + __u8 *buffer = NULL; + YCHAR oldName[YAFFS_MAX_NAME_LENGTH + 1]; + + yaffs_ObjectHeader *oh = NULL; + + if (!in->fake || force) { + + yaffs_CheckGarbageCollection(dev); + + buffer = yaffs_GetTempBuffer(in->myDev, __LINE__); + oh = (yaffs_ObjectHeader *) buffer; + prevChunkId = in->chunkId; - - if(prevChunkId >= 0) - { - yaffs_ReadChunkWithTagsFromNAND(dev,prevChunkId,buffer,NULL); - memcpy(oldName,oh->name,sizeof(oh->name)); + + if (prevChunkId >= 0) { + yaffs_ReadChunkWithTagsFromNAND(dev, prevChunkId, + buffer, NULL); + memcpy(oldName, oh->name, sizeof(oh->name)); } - memset(buffer,0xFF,dev->nBytesPerChunk); - - // Header data + memset(buffer, 0xFF, dev->nBytesPerChunk); + oh->type = in->variantType; - oh->yst_mode = in->yst_mode; - - // shadowing oh->shadowsObject = shadows; #ifdef CONFIG_YAFFS_WINCE @@ -2863,309 +2785,272 @@ int yaffs_UpdateObjectHeader(yaffs_Objec oh->yst_mtime = in->yst_mtime; oh->yst_ctime = in->yst_ctime; oh->yst_rdev = in->yst_rdev; -#endif - if(in->parent) - { +#endif + if (in->parent) { oh->parentObjectId = in->parent->objectId; - } - else - { + } else { oh->parentObjectId = 0; } - - //oh->sum = in->sum; - if(name && *name) - { - memset(oh->name,0,sizeof(oh->name)); - yaffs_strncpy(oh->name,name,YAFFS_MAX_NAME_LENGTH); + + if (name && *name) { + memset(oh->name, 0, sizeof(oh->name)); + yaffs_strncpy(oh->name, name, YAFFS_MAX_NAME_LENGTH); + } else if (prevChunkId) { + memcpy(oh->name, oldName, sizeof(oh->name)); + } else { + memset(oh->name, 0, sizeof(oh->name)); } - else if(prevChunkId) - { - memcpy(oh->name, oldName,sizeof(oh->name)); - } - else - { - memset(oh->name,0,sizeof(oh->name)); - } - + oh->isShrink = isShrink; - - switch(in->variantType) - { - case YAFFS_OBJECT_TYPE_UNKNOWN: - // Should not happen - break; - case YAFFS_OBJECT_TYPE_FILE: - oh->fileSize = (oh->parentObjectId == YAFFS_OBJECTID_DELETED || - oh->parentObjectId == YAFFS_OBJECTID_UNLINKED) ? 0 : in->variant.fileVariant.fileSize; - break; - case YAFFS_OBJECT_TYPE_HARDLINK: - oh->equivalentObjectId = in->variant.hardLinkVariant.equivalentObjectId; - break; - case YAFFS_OBJECT_TYPE_SPECIAL: - // Do nothing - break; - case YAFFS_OBJECT_TYPE_DIRECTORY: - // Do nothing - break; - case YAFFS_OBJECT_TYPE_SYMLINK: - yaffs_strncpy(oh->alias,in->variant.symLinkVariant.alias,YAFFS_MAX_ALIAS_LENGTH); - oh->alias[YAFFS_MAX_ALIAS_LENGTH] = 0; - break; + + switch (in->variantType) { + case YAFFS_OBJECT_TYPE_UNKNOWN: + /* Should not happen */ + break; + case YAFFS_OBJECT_TYPE_FILE: + oh->fileSize = + (oh->parentObjectId == YAFFS_OBJECTID_DELETED + || oh->parentObjectId == + YAFFS_OBJECTID_UNLINKED) ? 0 : in->variant. + fileVariant.fileSize; + break; + case YAFFS_OBJECT_TYPE_HARDLINK: + oh->equivalentObjectId = + in->variant.hardLinkVariant.equivalentObjectId; + break; + case YAFFS_OBJECT_TYPE_SPECIAL: + /* Do nothing */ + break; + case YAFFS_OBJECT_TYPE_DIRECTORY: + /* Do nothing */ + break; + case YAFFS_OBJECT_TYPE_SYMLINK: + yaffs_strncpy(oh->alias, + in->variant.symLinkVariant.alias, + YAFFS_MAX_ALIAS_LENGTH); + oh->alias[YAFFS_MAX_ALIAS_LENGTH] = 0; + break; } - // Tags + /* Tags */ yaffs_InitialiseTags(&newTags); in->serial++; newTags.chunkId = 0; newTags.objectId = in->objectId; newTags.serialNumber = in->serial; - - // Add extra info for file header - + + /* Add extra info for file header */ + newTags.extraHeaderInfoAvailable = 1; newTags.extraParentObjectId = oh->parentObjectId; newTags.extraFileLength = oh->fileSize; newTags.extraIsShrinkHeader = oh->isShrink; newTags.extraEquivalentObjectId = oh->equivalentObjectId; newTags.extraShadows = (oh->shadowsObject > 0) ? 1 : 0; - newTags.extraObjectType = in->variantType; - - // Create new chunk in NAND - newChunkId = yaffs_WriteNewChunkWithTagsToNAND(dev,buffer,&newTags, (prevChunkId >= 0) ? 1 : 0 ); - - if(newChunkId >= 0) - { - - in->chunkId = newChunkId; - - if(prevChunkId >= 0) - { - yaffs_DeleteChunk(dev,prevChunkId,1,__LINE__); + newTags.extraObjectType = in->variantType; + + /* Create new chunk in NAND */ + newChunkId = + yaffs_WriteNewChunkWithTagsToNAND(dev, buffer, &newTags, + (prevChunkId >= 0) ? 1 : 0); + + if (newChunkId >= 0) { + + in->chunkId = newChunkId; + + if (prevChunkId >= 0) { + yaffs_DeleteChunk(dev, prevChunkId, 1, + __LINE__); } - + 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); + + /* 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); bi->hasShrinkHeader = 1; } - + } - - retVal = newChunkId; - - } - - if(buffer) - yaffs_ReleaseTempBuffer(dev,buffer,__LINE__); - - return retVal; + + retVal = newChunkId; + + } + + if (buffer) + yaffs_ReleaseTempBuffer(dev, buffer, __LINE__); + + return retVal; } - -/////////////////////// Short Operations Cache //////////////////////////////// -// In many siturations 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 -// sequential writes. eg. scanning/writing a jpeg file. -// In these cases, a short read/write cache can provide a huge perfomance benefit -// with dumb-as-a-rock code. -// There are a limited number (~10) of cache chunks per device so that we don't -// need a very intelligent search. - - - - - -static void yaffs_FlushFilesChunkCache(yaffs_Object *obj) +/*------------------------ 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 + * sequential writes. eg. scanning/writing a jpeg file. + * 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 + * buffering. + * + * There are a limited number (~10) of cache chunks per device so that we don't + * need a very intelligent search. + */ + +static void yaffs_FlushFilesChunkCache(yaffs_Object * obj) { yaffs_Device *dev = obj->myDev; - int lowest = -99; // Stop compiler whining. + int lowest = -99; /* Stop compiler whining. */ int i; yaffs_ChunkCache *cache; int chunkWritten = 0; - //int nBytes; int nCaches = obj->myDev->nShortOpCaches; - - if (nCaches > 0) - { - do{ + + if (nCaches > 0) { + do { cache = NULL; - - // Find the dirty cache for this object with the lowest chunk id. - for(i = 0; i < nCaches; i++) - { - if(dev->srCache[i].object == obj && - dev->srCache[i].dirty) - { - if(!cache || dev->srCache[i].chunkId < lowest) - { + + /* Find the dirty cache for this object with the lowest chunk id. */ + for (i = 0; i < nCaches; i++) { + if (dev->srCache[i].object == obj && + dev->srCache[i].dirty) { + if (!cache + || dev->srCache[i].chunkId < + lowest) { cache = &dev->srCache[i]; lowest = cache->chunkId; } } } - - if(cache && !cache->locked) - { - //Write it out and free it up - - chunkWritten = yaffs_WriteChunkDataToObject(cache->object, - cache->chunkId, - cache->data, - cache->nBytes,1); + + if (cache && !cache->locked) { + /* Write it out and free it up */ + + chunkWritten = + yaffs_WriteChunkDataToObject(cache->object, + cache->chunkId, + cache->data, + cache->nBytes, + 1); cache->dirty = 0; cache->object = NULL; } - - } while(cache && chunkWritten > 0); - - if(cache) - { - //Hoosterman, disk full while writing cache out. - T(YAFFS_TRACE_ERROR, (TSTR("yaffs tragedy: no space during cache write" TENDSTR))); + + } while (cache && chunkWritten > 0); + + if (cache) { + /* Hoosterman, disk full while writing cache out. */ + T(YAFFS_TRACE_ERROR, + (TSTR("yaffs tragedy: no space during cache write" TENDSTR))); } - } - + } + } - -// Grab us a chunk for use. -// 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) +/* Grab us a cache chunk for use. + * 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) { int i; int usage; int theOne; - - if(dev->nShortOpCaches > 0) - { - for(i = 0; i < dev->nShortOpCaches; i++) - { - if(!dev->srCache[i].object) - { - //T(("Grabbing empty %d\n",i)); - - //printf("Grabbing empty %d\n",i); - + + if (dev->nShortOpCaches > 0) { + for (i = 0; i < dev->nShortOpCaches; i++) { + if (!dev->srCache[i].object) return &dev->srCache[i]; - } } - + return NULL; - - theOne = -1; - usage = 0; // just to stop the compiler grizzling - - for(i = 0; i < dev->nShortOpCaches; i++) - { - if(!dev->srCache[i].dirty && - ((dev->srCache[i].lastUse < usage && theOne >= 0)|| - theOne < 0)) - { + + theOne = -1; + usage = 0; /* just to stop the compiler grizzling */ + + for (i = 0; i < dev->nShortOpCaches; i++) { + if (!dev->srCache[i].dirty && + ((dev->srCache[i].lastUse < usage && theOne >= 0) || + theOne < 0)) { usage = dev->srCache[i].lastUse; theOne = i; } } - - //T(("Grabbing non-empty %d\n",theOne)); - - //if(theOne >= 0) printf("Grabbed non-empty cache %d\n",theOne); - - return theOne >= 0 ? &dev->srCache[theOne] : NULL; - } - else - { + + + return theOne >= 0 ? &dev->srCache[theOne] : NULL; + } else { return NULL; } - + } - -static yaffs_ChunkCache *yaffs_GrabChunkCache(yaffs_Device *dev) +static yaffs_ChunkCache *yaffs_GrabChunkCache(yaffs_Device * dev) { yaffs_ChunkCache *cache; yaffs_Object *theObj; int usage; int i; int pushout; - - if(dev->nShortOpCaches > 0) - { - // Try find a non-dirty one... - + + if (dev->nShortOpCaches > 0) { + /* Try find a non-dirty one... */ + cache = yaffs_GrabChunkCacheWorker(dev); - - if(!cache) - { - // They were all dirty, find the last recently used object and flush - // its cache, then find again. - // NB what's here is not very accurate, we actually flush the object - // the last recently used page. - - // With locking we can't assume we can use entry zero - - + + if (!cache) { + /* They were all dirty, find the last recently used object and flush + * its cache, then find again. + * NB what's here is not very accurate, we actually flush the object + * the last recently used page. + */ + + /* With locking we can't assume we can use entry zero */ + theObj = NULL; usage = -1; cache = NULL; pushout = -1; - - for(i = 0; i < dev->nShortOpCaches; i++) - { - if( dev->srCache[i].object && - !dev->srCache[i].locked && - (dev->srCache[i].lastUse < usage || !cache)) + + for (i = 0; i < dev->nShortOpCaches; i++) { + if (dev->srCache[i].object && + !dev->srCache[i].locked && + (dev->srCache[i].lastUse < usage || !cache)) { - usage = dev->srCache[i].lastUse; + usage = dev->srCache[i].lastUse; theObj = dev->srCache[i].object; cache = &dev->srCache[i]; pushout = i; } } - - if(!cache || cache->dirty) - { - - //printf("Dirty "); + + if (!cache || cache->dirty) { + /* Flush and try again */ yaffs_FlushFilesChunkCache(theObj); - - // Try again cache = yaffs_GrabChunkCacheWorker(dev); } - else - { - //printf(" pushout %d\n",pushout); - } - + } return cache; - } - else + } else return NULL; } - -// Find a cached chunk -static yaffs_ChunkCache *yaffs_FindChunkCache(const yaffs_Object *obj, int chunkId) +/* Find a cached chunk */ +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->srCache[i].object == obj && - dev->srCache[i].chunkId == chunkId) - { + if (dev->nShortOpCaches > 0) { + for (i = 0; i < dev->nShortOpCaches; i++) { + if (dev->srCache[i].object == obj && + dev->srCache[i].chunkId == chunkId) { dev->cacheHits++; - + return &dev->srCache[i]; } } @@ -3173,211 +3058,196 @@ static yaffs_ChunkCache *yaffs_FindChunk return NULL; } -// Mark the chunk for the least recently used algorithym -static void yaffs_UseChunkCache(yaffs_Device *dev, yaffs_ChunkCache *cache, int isAWrite) +/* Mark the chunk for the least recently used algorithym */ +static void yaffs_UseChunkCache(yaffs_Device * dev, yaffs_ChunkCache * cache, + int isAWrite) { - if(dev->nShortOpCaches > 0) - { - if( dev->srLastUse < 0 || - dev->srLastUse > 100000000) - { - // Reset the cache usages + if (dev->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->nShortOpCaches; i++) { dev->srCache[i].lastUse = 0; } dev->srLastUse = 0; } dev->srLastUse++; - + cache->lastUse = dev->srLastUse; - if(isAWrite) - { + if (isAWrite) { cache->dirty = 1; } } } -// Invalidate a single cache page. -// 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) +/* Invalidate a single cache page. + * 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) { - if(object->myDev->nShortOpCaches > 0) - { - yaffs_ChunkCache *cache = yaffs_FindChunkCache(object,chunkId); - - if(cache) - { + if (object->myDev->nShortOpCaches > 0) { + yaffs_ChunkCache *cache = yaffs_FindChunkCache(object, chunkId); + + 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) +/* 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) { int i; yaffs_Device *dev = in->myDev; - - if(dev->nShortOpCaches > 0) - { - // Now invalidate it. - for(i = 0; i < dev->nShortOpCaches; i++) - { - if(dev->srCache[i].object == in) - { + + if (dev->nShortOpCaches > 0) { + /* Invalidate it. */ + for (i = 0; i < dev->nShortOpCaches; i++) { + if (dev->srCache[i].object == in) { dev->srCache[i].object = NULL; } } } } - - - - -///////////////////////// File read/write /////////////////////////////// -// Read and write have very similar structures. -// In general the read/write has three parts to it -// * An incomplete chunk to start with (if the read/write is not chunk-aligned) -// * Some complete chunks -// * An incomplete chunk to end off with -// -// Curve-balls: the first chunk might also be the last chunk. - -int yaffs_ReadDataFromFile(yaffs_Object *in, __u8 * buffer, __u32 offset, int nBytes) +/*--------------------- File read/write ------------------------ + * Read and write have very similar structures. + * In general the read/write has three parts to it + * An incomplete chunk to start with (if the read/write is not chunk-aligned) + * Some complete chunks + * An incomplete chunk to end off with + * + * Curve-balls: the first chunk might also be the last chunk. + */ + +int yaffs_ReadDataFromFile(yaffs_Object * in, __u8 * buffer, __u32 offset, + int nBytes) { - - + int chunk; int start; int nToCopy; int n = nBytes; int nDone = 0; yaffs_ChunkCache *cache; - + yaffs_Device *dev; - + dev = in->myDev; - - while(n > 0) - { - chunk = offset / dev->nBytesPerChunk + 1; // The first chunk is 1 + + while (n > 0) { + chunk = offset / dev->nBytesPerChunk + 1; /* The first chunk is 1 */ start = offset % dev->nBytesPerChunk; - // OK now check for the curveball where the start and end are in - // the same chunk. - if( (start + n) < dev->nBytesPerChunk) - { + /* OK now check for the curveball where the start and end are in + * the same chunk. + */ + if ((start + n) < dev->nBytesPerChunk) { nToCopy = n; - } - else - { + } else { nToCopy = dev->nBytesPerChunk - start; } - - cache = yaffs_FindChunkCache(in,chunk); - - // If the chunk is already in the cache or it is less than a whole chunk - // then use the cache (if there is caching) - // else bypass the cache. - if( cache || nToCopy != dev->nBytesPerChunk) - { - if(dev->nShortOpCaches > 0) - { - - // If we can't find the data in the cache, then load it up. - - if(!cache) - { + + cache = yaffs_FindChunkCache(in, chunk); + + /* If the chunk is already in the cache or it is less than a whole chunk + * then use the cache (if there is caching) + * else bypass the cache. + */ + if (cache || nToCopy != dev->nBytesPerChunk) { + if (dev->nShortOpCaches > 0) { + + /* If we can't find the data in the cache, then load it up. */ + + if (!cache) { cache = yaffs_GrabChunkCache(in->myDev); cache->object = in; cache->chunkId = chunk; cache->dirty = 0; cache->locked = 0; - yaffs_ReadChunkDataFromObject(in,chunk,cache->data); - cache->nBytes = 0; + yaffs_ReadChunkDataFromObject(in, chunk, + cache-> + data); + cache->nBytes = 0; } - - yaffs_UseChunkCache(dev,cache,0); + + yaffs_UseChunkCache(dev, cache, 0); cache->locked = 1; #ifdef CONFIG_YAFFS_WINCE yfsd_UnlockYAFFS(TRUE); #endif - memcpy(buffer,&cache->data[start],nToCopy); + 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... - - __u8 *localBuffer = yaffs_GetTempBuffer(dev,__LINE__); - yaffs_ReadChunkDataFromObject(in,chunk,localBuffer); + } else { + /* Read into the local buffer then copy..*/ + + __u8 *localBuffer = + yaffs_GetTempBuffer(dev, __LINE__); + yaffs_ReadChunkDataFromObject(in, chunk, + localBuffer); #ifdef CONFIG_YAFFS_WINCE yfsd_UnlockYAFFS(TRUE); #endif - memcpy(buffer,&localBuffer[start],nToCopy); + memcpy(buffer, &localBuffer[start], nToCopy); #ifdef CONFIG_YAFFS_WINCE yfsd_LockYAFFS(TRUE); #endif - yaffs_ReleaseTempBuffer(dev,localBuffer,__LINE__); + yaffs_ReleaseTempBuffer(dev, localBuffer, + __LINE__); } - } - else - { + } 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); + __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); + yfsd_UnlockYAFFS(TRUE); #endif - memcpy(buffer,localBuffer,dev->nBytesPerChunk); + memcpy(buffer, localBuffer, dev->nBytesPerChunk); #ifdef CONFIG_YAFFS_WINCE - yfsd_LockYAFFS(TRUE); - yaffs_ReleaseTempBuffer(dev,localBuffer,__LINE__); + yfsd_LockYAFFS(TRUE); + yaffs_ReleaseTempBuffer(dev, localBuffer, __LINE__); #endif #else - // A full chunk. Read directly into the supplied buffer. - yaffs_ReadChunkDataFromObject(in,chunk,buffer); + /* A full chunk. Read directly into the supplied buffer. */ + yaffs_ReadChunkDataFromObject(in, chunk, buffer); #endif } - + n -= nToCopy; offset += nToCopy; buffer += nToCopy; nDone += nToCopy; - - } - + + } + return nDone; } - - -int yaffs_WriteDataToFile(yaffs_Object *in,const __u8 * buffer, __u32 offset, int nBytes, int writeThrough) -{ - +int yaffs_WriteDataToFile(yaffs_Object * in, const __u8 * buffer, __u32 offset, + int nBytes, int writeThrough) +{ + int chunk; int start; int nToCopy; @@ -3387,302 +3257,299 @@ int yaffs_WriteDataToFile(yaffs_Object * int startOfWrite = offset; int chunkWritten = 0; int nBytesRead; - + yaffs_Device *dev; - + dev = in->myDev; - - - while(n > 0 && chunkWritten >= 0) - { + + while (n > 0 && chunkWritten >= 0) { chunk = offset / dev->nBytesPerChunk + 1; start = offset % dev->nBytesPerChunk; - - - // OK now check for the curveball where the start and end are in - // the same chunk. - - if((start + n) < dev->nBytesPerChunk) - { + + /* OK now check for the curveball where the start and end are in + * the same chunk. + */ + + if ((start + n) < dev->nBytesPerChunk) { nToCopy = n; - - // Now folks, to calculate how many bytes to write back.... - // If we're overwriting and not writing to then end of file then - // we need to write back as much as was there before. - - nBytesRead = in->variant.fileVariant.fileSize - ((chunk -1) * dev->nBytesPerChunk); - - if(nBytesRead > dev->nBytesPerChunk) - { + + /* Now folks, to calculate how many bytes to write back.... + * If we're overwriting and not writing to then end of file then + * we need to write back as much as was there before. + */ + + nBytesRead = + in->variant.fileVariant.fileSize - + ((chunk - 1) * dev->nBytesPerChunk); + + if (nBytesRead > dev->nBytesPerChunk) { nBytesRead = dev->nBytesPerChunk; } - - nToWriteBack = (nBytesRead > (start + n)) ? nBytesRead : (start +n); - - } - else - { + + nToWriteBack = + (nBytesRead > + (start + n)) ? nBytesRead : (start + n); + + } else { nToCopy = dev->nBytesPerChunk - start; nToWriteBack = dev->nBytesPerChunk; } - - if(nToCopy != dev->nBytesPerChunk) - { - // An incomplete start or end chunk (or maybe both start and end chunk) - if(dev->nShortOpCaches > 0) - { + + if (nToCopy != dev->nBytesPerChunk) { + /* An incomplete start or end chunk (or maybe both start and end chunk) */ + if (dev->nShortOpCaches > 0) { yaffs_ChunkCache *cache; - // If we can't find the data in the cache, then load it up. - cache = yaffs_FindChunkCache(in,chunk); - if(!cache && yaffs_CheckSpaceForAllocation(in->myDev)) - { + /* 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); cache->object = in; cache->chunkId = chunk; cache->dirty = 0; cache->locked = 0; - yaffs_ReadChunkDataFromObject(in,chunk,cache->data); + yaffs_ReadChunkDataFromObject(in, chunk, + cache-> + data); } - - if(cache) - { - yaffs_UseChunkCache(dev,cache,1); + + 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; + + if (writeThrough) { + chunkWritten = + yaffs_WriteChunkDataToObject + (cache->object, + cache->chunkId, + cache->data, cache->nBytes, + 1); + cache->dirty = 0; + } + + } else { + chunkWritten = -1; /* fail the write */ + } + } else { + /* An incomplete start or end chunk (or maybe both start and end chunk) + * Read into the local buffer then copy, then copy over and write back. + */ + + __u8 *localBuffer = + yaffs_GetTempBuffer(dev, __LINE__); + + yaffs_ReadChunkDataFromObject(in, chunk, + localBuffer); + +#ifdef CONFIG_YAFFS_WINCE yfsd_UnlockYAFFS(TRUE); #endif - - memcpy(&cache->data[start],buffer,nToCopy); + + memcpy(&localBuffer[start], buffer, nToCopy); #ifdef CONFIG_YAFFS_WINCE yfsd_LockYAFFS(TRUE); #endif - cache->locked = 0; - cache->nBytes = nToWriteBack; - - if(writeThrough) - { - chunkWritten = yaffs_WriteChunkDataToObject(cache->object, - cache->chunkId, - cache->data, - cache->nBytes,1); - cache->dirty = 0; - } - - } - else - { - chunkWritten = -1; // fail the write - } + chunkWritten = + yaffs_WriteChunkDataToObject(in, chunk, + localBuffer, + nToWriteBack, + 0); + + yaffs_ReleaseTempBuffer(dev, localBuffer, + __LINE__); + } - else - { - // An incomplete start or end chunk (or maybe both start and end chunk) - // Read into the local buffer then copy, then copy over and write back. - - __u8 *localBuffer = yaffs_GetTempBuffer(dev,__LINE__); - - yaffs_ReadChunkDataFromObject(in,chunk,localBuffer); - + + } else { + #ifdef CONFIG_YAFFS_WINCE - yfsd_UnlockYAFFS(TRUE); -#endif - - memcpy(&localBuffer[start],buffer,nToCopy); - + /* 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_LockYAFFS(TRUE); + yfsd_UnlockYAFFS(TRUE); #endif - chunkWritten = yaffs_WriteChunkDataToObject(in,chunk,localBuffer,nToWriteBack,0); - - yaffs_ReleaseTempBuffer(dev,localBuffer,__LINE__); - - //T(("Write with readback to chunk %d %d start %d copied %d wrote back %d\n",chunk,chunkWritten,start, nToCopy, nToWriteBack)); - } - - } - else - { - + memcpy(localBuffer, buffer, dev->nBytesPerChunk); #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); + yfsd_LockYAFFS(TRUE); #endif - memcpy(localBuffer,buffer,dev->nBytesPerChunk); -#ifdef CONFIG_YAFFS_WINCE - yfsd_LockYAFFS(TRUE); -#endif - chunkWritten = yaffs_WriteChunkDataToObject(in,chunk,localBuffer,dev->nBytesPerChunk,0); - yaffs_ReleaseTempBuffer(dev,localBuffer,__LINE__); + chunkWritten = + yaffs_WriteChunkDataToObject(in, chunk, localBuffer, + dev->nBytesPerChunk, + 0); + yaffs_ReleaseTempBuffer(dev, localBuffer, __LINE__); #else - // A full chunk. Write directly from the supplied buffer. - chunkWritten = yaffs_WriteChunkDataToObject(in,chunk,buffer,dev->nBytesPerChunk,0); + /* A full chunk. Write directly from the supplied buffer. */ + chunkWritten = + yaffs_WriteChunkDataToObject(in, chunk, buffer, + dev->nBytesPerChunk, + 0); #endif - // Since we've overwritten the cached data, we better invalidate it. - yaffs_InvalidateChunkCache(in,chunk); - //T(("Write to chunk %d %d\n",chunk,chunkWritten)); + /* Since we've overwritten the cached data, we better invalidate it. */ + yaffs_InvalidateChunkCache(in, chunk); } - - if(chunkWritten >= 0) - { + + if (chunkWritten >= 0) { n -= nToCopy; offset += nToCopy; buffer += nToCopy; nDone += nToCopy; } - - } - - // Update file object - - if((startOfWrite + nDone) > in->variant.fileVariant.fileSize) - { + + } + + /* Update file object */ + + if ((startOfWrite + nDone) > in->variant.fileVariant.fileSize) { in->variant.fileVariant.fileSize = (startOfWrite + nDone); } - + in->dirty = 1; - + return nDone; } -static void yaffs_PruneResizedChunks(yaffs_Object *in, int newSize) + +/* ---------------------- File resizing stuff ------------------ */ + +static void yaffs_PruneResizedChunks(yaffs_Object * in, int newSize) { yaffs_Device *dev = in->myDev; int oldFileSize = in->variant.fileVariant.fileSize; - - int lastDel = 1 + (oldFileSize-1)/dev->nBytesPerChunk; - - int startDel = 1 + (newSize + dev->nBytesPerChunk - 1)/ - dev->nBytesPerChunk; + int lastDel = 1 + (oldFileSize - 1) / dev->nBytesPerChunk; + + int startDel = 1 + (newSize + dev->nBytesPerChunk - 1) / + dev->nBytesPerChunk; int i; int chunkId; - // Delete backwards so that we don't end up with holes if - // power is lost part-way through the operation. - for(i = lastDel; i >= startDel; i--) - { - // NB this could be optimised somewhat, - // eg. could retrieve the tags and write them without - // using yaffs_DeleteChunk - - chunkId = yaffs_FindAndDeleteChunkInFile(in,i,NULL); - if(chunkId > 0) - { - if(chunkId < (dev->internalStartBlock * dev->nChunksPerBlock) || - chunkId >= ((dev->internalEndBlock+1) * dev->nChunksPerBlock)) - { - T(YAFFS_TRACE_ALWAYS,(TSTR("Found daft chunkId %d for %d"TENDSTR),chunkId,i)); - } - else - { + /* Delete backwards so that we don't end up with holes if + * power is lost part-way through the operation. + */ + for (i = lastDel; i >= startDel; i--) { + /* NB this could be optimised somewhat, + * eg. could retrieve the tags and write them without + * using yaffs_DeleteChunk + */ + + chunkId = yaffs_FindAndDeleteChunkInFile(in, i, NULL); + if (chunkId > 0) { + if (chunkId < + (dev->internalStartBlock * dev->nChunksPerBlock) + || chunkId >= + ((dev->internalEndBlock + + 1) * dev->nChunksPerBlock)) { + T(YAFFS_TRACE_ALWAYS, + (TSTR("Found daft chunkId %d for %d" TENDSTR), + chunkId, i)); + } else { in->nDataChunks--; - yaffs_DeleteChunk(dev,chunkId,1,__LINE__); + yaffs_DeleteChunk(dev, chunkId, 1, __LINE__); } } } - + } -int yaffs_ResizeFile(yaffs_Object *in, int newSize) +int yaffs_ResizeFile(yaffs_Object * in, int newSize) { int oldFileSize = in->variant.fileVariant.fileSize; int sizeOfPartialChunk; yaffs_Device *dev = in->myDev; - - sizeOfPartialChunk = newSize % dev->nBytesPerChunk; - - - yaffs_FlushFilesChunkCache(in); + + sizeOfPartialChunk = newSize % dev->nBytesPerChunk; + + yaffs_FlushFilesChunkCache(in); yaffs_InvalidateWholeChunkCache(in); yaffs_CheckGarbageCollection(dev); - - if(in->variantType != YAFFS_OBJECT_TYPE_FILE) - { + + if (in->variantType != YAFFS_OBJECT_TYPE_FILE) { return yaffs_GetFileSize(in); } - - if(newSize == oldFileSize) - { + + if (newSize == oldFileSize) { return oldFileSize; } - - if(newSize < oldFileSize) - { - - yaffs_PruneResizedChunks(in,newSize); - - if(sizeOfPartialChunk != 0) - { - int lastChunk = 1+ newSize/dev->nBytesPerChunk; - __u8 *localBuffer = yaffs_GetTempBuffer(dev,__LINE__); - - // Got to read and rewrite the last chunk with its new size and zero pad - yaffs_ReadChunkDataFromObject(in,lastChunk,localBuffer); - - memset(localBuffer + sizeOfPartialChunk,0, dev->nBytesPerChunk - sizeOfPartialChunk); - - yaffs_WriteChunkDataToObject(in,lastChunk,localBuffer,sizeOfPartialChunk,1); - - yaffs_ReleaseTempBuffer(dev,localBuffer,__LINE__); + + if (newSize < oldFileSize) { + + yaffs_PruneResizedChunks(in, newSize); + + if (sizeOfPartialChunk != 0) { + int lastChunk = 1 + newSize / dev->nBytesPerChunk; + __u8 *localBuffer = yaffs_GetTempBuffer(dev, __LINE__); + + /* Got to read and rewrite the last chunk with its new size and zero pad */ + yaffs_ReadChunkDataFromObject(in, lastChunk, + localBuffer); + + memset(localBuffer + sizeOfPartialChunk, 0, + dev->nBytesPerChunk - sizeOfPartialChunk); + + yaffs_WriteChunkDataToObject(in, lastChunk, localBuffer, + sizeOfPartialChunk, 1); + + yaffs_ReleaseTempBuffer(dev, localBuffer, __LINE__); } - + in->variant.fileVariant.fileSize = newSize; - - yaffs_PruneFileStructure(dev,&in->variant.fileVariant); - } - - // Write a new object header. - // show we've shrunk the file, if need be - // Do this only if the file is not in the deleted directories. - if(in->parent->objectId != YAFFS_OBJECTID_UNLINKED && - in->parent->objectId != YAFFS_OBJECTID_DELETED - ) - { - yaffs_UpdateObjectHeader(in,NULL, 0, (newSize < oldFileSize) ? 1 : 0 ,0); - } - - + + yaffs_PruneFileStructure(dev, &in->variant.fileVariant); + } + /* Write a new object header. + * show we've shrunk the file, if need be + * Do this only if the file is not in the deleted directories. + */ + if (in->parent->objectId != YAFFS_OBJECTID_UNLINKED && + in->parent->objectId != YAFFS_OBJECTID_DELETED) { + yaffs_UpdateObjectHeader(in, NULL, 0, + (newSize < oldFileSize) ? 1 : 0, 0); + } + return newSize; } - -loff_t yaffs_GetFileSize(yaffs_Object *obj) +loff_t yaffs_GetFileSize(yaffs_Object * obj) { 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); - default: - return 0; + + 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); + default: + return 0; } } -// yaffs_FlushFile() updates the file's -// objectId in NAND - -int yaffs_FlushFile(yaffs_Object *in, int updateTime) +int yaffs_FlushFile(yaffs_Object * in, int updateTime) { int retVal; - if(in->dirty) - { - //T(("flushing object header\n")); - + if (in->dirty) { yaffs_FlushFilesChunkCache(in); - if(updateTime) - { + if (updateTime) { #ifdef CONFIG_YAFFS_WINCE yfsd_WinFileTimeNow(in->win_mtime); #else @@ -3692,34 +3559,31 @@ int yaffs_FlushFile(yaffs_Object *in, in #endif } - retVal = (yaffs_UpdateObjectHeader(in,NULL,0,0,0) >= 0)? YAFFS_OK : YAFFS_FAIL; - } - else - { + retVal = + (yaffs_UpdateObjectHeader(in, NULL, 0, 0, 0) >= + 0) ? YAFFS_OK : YAFFS_FAIL; + } else { retVal = YAFFS_OK; } - + return retVal; - + } - -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. + /* First off, invalidate the file's data in the cache, without flushing. */ yaffs_InvalidateWholeChunkCache(in); - if(in->myDev->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,NULL,0,0); - - } - - + if (in->myDev->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, NULL, 0, 0); + + } + yaffs_RemoveObjectFromDirectory(in); - yaffs_DeleteChunk(in->myDev,in->chunkId,1,__LINE__); + yaffs_DeleteChunk(in->myDev, in->chunkId, 1, __LINE__); in->chunkId = -1; yaffs_FreeObject(in); @@ -3727,255 +3591,239 @@ static int yaffs_DoGenericObjectDeletion } -// yaffs_DeleteFile deletes the whole file data -// and the inode associated with the file. -// It does not delete the links associated with the file. -static int yaffs_UnlinkFile(yaffs_Object *in) +/* yaffs_DeleteFile deletes the whole file data + * and the inode associated with the file. + * It does not delete the links associated with the file. + */ +static int yaffs_UnlinkFile(yaffs_Object * in) { - int retVal; - int immediateDeletion=0; - - if(1) - { - //in->unlinked = 1; - //in->myDev->nUnlinkedFiles++; - //in->renameAllowed = 0; + int immediateDeletion = 0; + + if (1) { #ifdef __KERNEL__ - if(!in->myInode) - { + if (!in->myInode) { immediateDeletion = 1; } #else - if(in->inUse <= 0) - { + if (in->inUse <= 0) { immediateDeletion = 1; } #endif - if(immediateDeletion) - { - retVal = yaffs_ChangeObjectName(in, in->myDev->deletedDir,NULL,0,0); - T(YAFFS_TRACE_TRACING,(TSTR("yaffs: immediate deletion of file %d" TENDSTR),in->objectId)); - in->deleted=1; + if (immediateDeletion) { + retVal = + yaffs_ChangeObjectName(in, in->myDev->deletedDir, + NULL, 0, 0); + T(YAFFS_TRACE_TRACING, + (TSTR("yaffs: immediate deletion of file %d" TENDSTR), + in->objectId)); + in->deleted = 1; in->myDev->nDeletedFiles++; - if( 0 && in->myDev->isYaffs2) - { - yaffs_ResizeFile(in,0); + if (0 && in->myDev->isYaffs2) { + yaffs_ResizeFile(in, 0); } yaffs_SoftDeleteFile(in); + } else { + retVal = + yaffs_ChangeObjectName(in, in->myDev->unlinkedDir, + NULL, 0, 0); } - else - { - retVal = yaffs_ChangeObjectName(in, in->myDev->unlinkedDir,NULL,0,0); - } - + } return retVal; } -int yaffs_DeleteFile(yaffs_Object *in) +int yaffs_DeleteFile(yaffs_Object * in) { int retVal = YAFFS_OK; - - if(in->nDataChunks > 0) - { - // Use soft deletion - if(!in->unlinked) - { + + if (in->nDataChunks > 0) { + /* Use soft deletion if there is data in the file */ + if (!in->unlinked) { retVal = yaffs_UnlinkFile(in); } - if(retVal == YAFFS_OK && - in->unlinked && - !in->deleted) - { + if (retVal == YAFFS_OK && in->unlinked && !in->deleted) { in->deleted = 1; in->myDev->nDeletedFiles++; yaffs_SoftDeleteFile(in); } - return in->deleted ? YAFFS_OK : YAFFS_FAIL; - } - else - { - // The file has no data chunks so we toss it immediately - yaffs_FreeTnode(in->myDev,in->variant.fileVariant.top); + return in->deleted ? YAFFS_OK : YAFFS_FAIL; + } else { + /* The file has no data chunks so we toss it immediately */ + yaffs_FreeTnode(in->myDev, in->variant.fileVariant.top); in->variant.fileVariant.top = NULL; - yaffs_DoGenericObjectDeletion(in); - - return YAFFS_OK; + yaffs_DoGenericObjectDeletion(in); + + return YAFFS_OK; } } -static int yaffs_DeleteDirectory(yaffs_Object *in) +static int yaffs_DeleteDirectory(yaffs_Object * in) { - //First check that the directory is empty. - if(list_empty(&in->variant.directoryVariant.children)) - { - return yaffs_DoGenericObjectDeletion(in); - } - + /* First check that the directory is empty. */ + if (list_empty(&in->variant.directoryVariant.children)) { + return yaffs_DoGenericObjectDeletion(in); + } + return YAFFS_FAIL; - + } -static int yaffs_DeleteSymLink(yaffs_Object *in) +static int yaffs_DeleteSymLink(yaffs_Object * in) { YFREE(in->variant.symLinkVariant.alias); - return yaffs_DoGenericObjectDeletion(in); + 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 + /* remove this hardlink from the list assocaited with the equivalent + * object + */ list_del(&in->hardLinks); - return yaffs_DoGenericObjectDeletion(in); + return yaffs_DoGenericObjectDeletion(in); } - -static void yaffs_DestroyObject(yaffs_Object *obj) +static void yaffs_DestroyObject(yaffs_Object * obj) { - switch(obj->variantType) - { - case YAFFS_OBJECT_TYPE_FILE: yaffs_DeleteFile(obj); break; - case YAFFS_OBJECT_TYPE_DIRECTORY: yaffs_DeleteDirectory(obj); break; - case YAFFS_OBJECT_TYPE_SYMLINK: yaffs_DeleteSymLink(obj); break; - case YAFFS_OBJECT_TYPE_HARDLINK: yaffs_DeleteHardLink(obj); break; - case YAFFS_OBJECT_TYPE_SPECIAL: yaffs_DoGenericObjectDeletion(obj); break; - case YAFFS_OBJECT_TYPE_UNKNOWN: break; // should not happen. + switch (obj->variantType) { + case YAFFS_OBJECT_TYPE_FILE: + yaffs_DeleteFile(obj); + break; + case YAFFS_OBJECT_TYPE_DIRECTORY: + yaffs_DeleteDirectory(obj); + break; + case YAFFS_OBJECT_TYPE_SYMLINK: + yaffs_DeleteSymLink(obj); + break; + case YAFFS_OBJECT_TYPE_HARDLINK: + yaffs_DeleteHardLink(obj); + break; + case YAFFS_OBJECT_TYPE_SPECIAL: + yaffs_DoGenericObjectDeletion(obj); + break; + case YAFFS_OBJECT_TYPE_UNKNOWN: + break; /* should not happen. */ } } - -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(!list_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) - // - Rename the object to the hardlink's name. - // - Delete the hardlink - - + if (obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK) { + return yaffs_DeleteHardLink(obj); + } else if (!list_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) + * - Rename the object to the hardlink's name. + * - Delete the hardlink + */ + yaffs_Object *hl; int retVal; - YCHAR name[YAFFS_MAX_NAME_LENGTH+1]; - - hl = list_entry(obj->hardLinks.next,yaffs_Object,hardLinks); - + YCHAR name[YAFFS_MAX_NAME_LENGTH + 1]; + + hl = list_entry(obj->hardLinks.next, yaffs_Object, hardLinks); + list_del_init(&hl->hardLinks); list_del_init(&hl->siblings); - - yaffs_GetObjectName(hl,name,YAFFS_MAX_NAME_LENGTH+1); - - retVal = yaffs_ChangeObjectName(obj, hl->parent, name,0,0); - - if(retVal == YAFFS_OK) - { + + yaffs_GetObjectName(hl, name, YAFFS_MAX_NAME_LENGTH + 1); + + retVal = yaffs_ChangeObjectName(obj, hl->parent, name, 0, 0); + + if (retVal == YAFFS_OK) { retVal = yaffs_DoGenericObjectDeletion(hl); } return retVal; - - } - else - { - switch(obj->variantType) - { - case YAFFS_OBJECT_TYPE_FILE: - return yaffs_UnlinkFile(obj); - break; - case YAFFS_OBJECT_TYPE_DIRECTORY: - return yaffs_DeleteDirectory(obj); - break; - case YAFFS_OBJECT_TYPE_SYMLINK: - return yaffs_DeleteSymLink(obj); - break; - case YAFFS_OBJECT_TYPE_SPECIAL: - return yaffs_DoGenericObjectDeletion(obj); - break; - case YAFFS_OBJECT_TYPE_HARDLINK: - case YAFFS_OBJECT_TYPE_UNKNOWN: - default: - return YAFFS_FAIL; + + } else { + switch (obj->variantType) { + case YAFFS_OBJECT_TYPE_FILE: + return yaffs_UnlinkFile(obj); + break; + case YAFFS_OBJECT_TYPE_DIRECTORY: + return yaffs_DeleteDirectory(obj); + break; + case YAFFS_OBJECT_TYPE_SYMLINK: + return yaffs_DeleteSymLink(obj); + break; + case YAFFS_OBJECT_TYPE_SPECIAL: + return yaffs_DoGenericObjectDeletion(obj); + break; + case YAFFS_OBJECT_TYPE_HARDLINK: + case YAFFS_OBJECT_TYPE_UNKNOWN: + default: + return YAFFS_FAIL; } } } -int yaffs_Unlink(yaffs_Object *dir, const YCHAR *name) +int yaffs_Unlink(yaffs_Object * dir, const YCHAR * name) { yaffs_Object *obj; - - obj = yaffs_FindObjectByName(dir,name); - - if(obj && obj->unlinkAllowed) - { - return yaffs_UnlinkWorker(obj); - } - - return YAFFS_FAIL; - + + obj = yaffs_FindObjectByName(dir, name); + + if (obj && obj->unlinkAllowed) { + return yaffs_UnlinkWorker(obj); + } + + return YAFFS_FAIL; + } -//////////////// Initialisation Scanning ///////////////// - - -static void yaffs_HandleShadowedObject(yaffs_Device *dev, int objId, int backwardScanning) +/*----------------------- Initialisation Scanning ---------------------- */ + +static void yaffs_HandleShadowedObject(yaffs_Device * dev, int objId, + int backwardScanning) { yaffs_Object *obj; - - if(!backwardScanning) - { - // Handle YAFFS1 forward scanning case - // For YAFFS1 we always do the deletion - - } - else - { // Handle YAFFS2 case (backward scanning) - // If the shadowed object exists then ignore. - if(yaffs_FindObjectByNumber(dev,objId)) - { + + if (!backwardScanning) { + /* Handle YAFFS1 forward scanning case + * For YAFFS1 we always do the deletion + */ + + } else { + /* Handle YAFFS2 case (backward scanning) + * If the shadowed object exists then ignore. + */ + if (yaffs_FindObjectByNumber(dev, objId)) { return; } } - - // Let's create it (if it does not exist) assuming it is a file so that it can do shrinking etc. - // We put it in unlinked dir to be cleaned up after the scanning - obj = yaffs_FindOrCreateObjectByNumber(dev,objId,YAFFS_OBJECT_TYPE_FILE); - yaffs_AddObjectToDirectory(dev->unlinkedDir,obj); + + /* Let's create it (if it does not exist) assuming it is a file so that it can do shrinking etc. + * We put it in unlinked dir to be cleaned up after the scanning + */ + obj = + yaffs_FindOrCreateObjectByNumber(dev, objId, + YAFFS_OBJECT_TYPE_FILE); + yaffs_AddObjectToDirectory(dev->unlinkedDir, obj); obj->variant.fileVariant.shrinkSize = 0; - obj->valid = 1; // So that we don't read any other infor for this file - + obj->valid = 1; /* So that we don't read any other info for this file */ + } - - - -typedef struct -{ +typedef struct { int seq; int block; } yaffs_BlockIndex; - - -static int yaffs_Scan(yaffs_Device *dev) +static int yaffs_Scan(yaffs_Device * dev) { yaffs_ExtendedTags tags; int blk; @@ -3983,7 +3831,7 @@ static int yaffs_Scan(yaffs_Device *dev) int startIterator; int endIterator; int nBlocksToScan = 0; - + int chunk; int c; int deleted; @@ -3991,271 +3839,277 @@ static int yaffs_Scan(yaffs_Device *dev) yaffs_Object *hardList = NULL; yaffs_Object *hl; yaffs_BlockInfo *bi; - int sequenceNumber; + int sequenceNumber; yaffs_ObjectHeader *oh; yaffs_Object *in; yaffs_Object *parent; int nBlocks = dev->internalEndBlock - dev->internalStartBlock + 1; - + __u8 *chunkData; yaffs_BlockIndex *blockIndex = NULL; - T(YAFFS_TRACE_SCAN,(TSTR("yaffs_Scan starts intstartblk %d intendblk %d..." TENDSTR),dev->internalStartBlock,dev->internalEndBlock)); - - chunkData = yaffs_GetTempBuffer(dev,__LINE__); - - + T(YAFFS_TRACE_SCAN, + (TSTR("yaffs_Scan starts intstartblk %d intendblk %d..." TENDSTR), + dev->internalStartBlock, dev->internalEndBlock)); + + chunkData = yaffs_GetTempBuffer(dev, __LINE__); + dev->sequenceNumber = YAFFS_LOWEST_SEQUENCE_NUMBER; - - if(dev->isYaffs2) - { - blockIndex = YMALLOC(nBlocks * sizeof(yaffs_BlockIndex)); - } - - - // Scan all the blocks to determine their state - for(blk = dev->internalStartBlock; blk <= dev->internalEndBlock; blk++) - { - bi = yaffs_GetBlockInfo(dev,blk); - yaffs_ClearChunkBits(dev,blk); + + if (dev->isYaffs2) { + blockIndex = YMALLOC(nBlocks * sizeof(yaffs_BlockIndex)); + } + + /* Scan all the blocks to determine their state */ + for (blk = dev->internalStartBlock; blk <= dev->internalEndBlock; blk++) { + bi = yaffs_GetBlockInfo(dev, blk); + yaffs_ClearChunkBits(dev, blk); bi->pagesInUse = 0; bi->softDeletions = 0; - - yaffs_QueryInitialBlockState(dev,blk,&state,&sequenceNumber); - + + yaffs_QueryInitialBlockState(dev, blk, &state, &sequenceNumber); + bi->blockState = state; - bi->sequenceNumber = sequenceNumber; - - T(YAFFS_TRACE_SCAN_DEBUG,(TSTR("Block scanning block %d state %d seq %d" TENDSTR),blk,state,sequenceNumber)); - - if(state == YAFFS_BLOCK_STATE_DEAD) - { - T(YAFFS_TRACE_BAD_BLOCKS,(TSTR("block %d is bad" TENDSTR),blk)); - } - else if(state == YAFFS_BLOCK_STATE_EMPTY) - { - T(YAFFS_TRACE_SCAN_DEBUG,(TSTR("Block empty " TENDSTR))); + bi->sequenceNumber = sequenceNumber; + + T(YAFFS_TRACE_SCAN_DEBUG, + (TSTR("Block scanning block %d state %d seq %d" TENDSTR), blk, + state, sequenceNumber)); + + if (state == YAFFS_BLOCK_STATE_DEAD) { + T(YAFFS_TRACE_BAD_BLOCKS, + (TSTR("block %d is bad" TENDSTR), blk)); + } else if (state == YAFFS_BLOCK_STATE_EMPTY) { + T(YAFFS_TRACE_SCAN_DEBUG, + (TSTR("Block empty " TENDSTR))); dev->nErasedBlocks++; dev->nFreeChunks += dev->nChunksPerBlock; - } - else if(state == YAFFS_BLOCK_STATE_NEEDS_SCANNING) - { - - // Determine the highest sequence number - if( dev->isYaffs2 && + } else if (state == YAFFS_BLOCK_STATE_NEEDS_SCANNING) { + + /* Determine the highest sequence number */ + if (dev->isYaffs2 && sequenceNumber >= YAFFS_LOWEST_SEQUENCE_NUMBER && - sequenceNumber < YAFFS_HIGHEST_SEQUENCE_NUMBER) - { - + sequenceNumber < YAFFS_HIGHEST_SEQUENCE_NUMBER) { + blockIndex[nBlocksToScan].seq = sequenceNumber; blockIndex[nBlocksToScan].block = blk; - + nBlocksToScan++; - if(sequenceNumber >= dev->sequenceNumber) - { - dev->sequenceNumber = sequenceNumber; + if (sequenceNumber >= dev->sequenceNumber) { + dev->sequenceNumber = sequenceNumber; } - } - else if(dev->isYaffs2) - { - // TODO: Nasty sequence number! - T(YAFFS_TRACE_SCAN,(TSTR("Block scanning block %d has bad sequence number %d" TENDSTR),blk,sequenceNumber)); + } else if (dev->isYaffs2) { + /* TODO: Nasty sequence number! */ + T(YAFFS_TRACE_SCAN, + (TSTR + ("Block scanning block %d has bad sequence number %d" + TENDSTR), blk, sequenceNumber)); } } } - - // Sort the blocks - // Dungy old bubble sort for now... - if(dev->isYaffs2) - { + + /* Sort the blocks + * Dungy old bubble sort for now... + */ + if (dev->isYaffs2) { yaffs_BlockIndex temp; int i; int j; - - for(i = 0; i < nBlocksToScan; i++) - for(j = i+1; j < nBlocksToScan; j++) - if(blockIndex[i].seq > blockIndex[j].seq) - { - temp = blockIndex[j]; - blockIndex[j] = blockIndex[i]; - blockIndex[i] = temp; - } - } - - - // Now scan the blocks looking at the data. - if(dev->isYaffs2) - { + + for (i = 0; i < nBlocksToScan; i++) + for (j = i + 1; j < nBlocksToScan; j++) + if (blockIndex[i].seq > blockIndex[j].seq) { + temp = blockIndex[j]; + blockIndex[j] = blockIndex[i]; + blockIndex[i] = temp; + } + } + + /* Now scan the blocks looking at the data. */ + if (dev->isYaffs2) { startIterator = 0; - endIterator = nBlocksToScan-1; - T(YAFFS_TRACE_SCAN_DEBUG,(TSTR("%d blocks to be scanned" TENDSTR),nBlocksToScan)); - } - else - { + endIterator = nBlocksToScan - 1; + T(YAFFS_TRACE_SCAN_DEBUG, + (TSTR("%d blocks to be scanned" TENDSTR), nBlocksToScan)); + } else { startIterator = dev->internalStartBlock; endIterator = dev->internalEndBlock; } - - // For each block.... - for(blockIterator = startIterator; blockIterator <= endIterator; blockIterator++) - { - - if(dev->isYaffs2) - { - // get the block to scan in the correct order + + /* For each block.... */ + for (blockIterator = startIterator; blockIterator <= endIterator; + blockIterator++) { + + if (dev->isYaffs2) { + /* get the block to scan in the correct order */ blk = blockIndex[blockIterator].block; - } - else - { + } else { blk = blockIterator; } - - bi = yaffs_GetBlockInfo(dev,blk); + bi = yaffs_GetBlockInfo(dev, blk); state = bi->blockState; - + deleted = 0; - - // For each chunk in each block that needs scanning.... - for(c = 0; c < dev->nChunksPerBlock && - state == YAFFS_BLOCK_STATE_NEEDS_SCANNING; c++) - { - // Read the tags and decide what to do + + /* For each chunk in each block that needs scanning....*/ + for (c = 0; c < dev->nChunksPerBlock && + state == YAFFS_BLOCK_STATE_NEEDS_SCANNING; c++) { + /* Read the tags and decide what to do */ chunk = blk * dev->nChunksPerBlock + c; - - yaffs_ReadChunkWithTagsFromNAND(dev,chunk,NULL,&tags); - - // Let's have a good look at this chunk... - - - if(!dev->isYaffs2 && tags.chunkDeleted) - { - // YAFFS1 only... - // A deleted chunk + + yaffs_ReadChunkWithTagsFromNAND(dev, chunk, NULL, + &tags); + + /* Let's have a good look at this chunk... */ + + if (!dev->isYaffs2 && tags.chunkDeleted) { + /* YAFFS1 only... + * A deleted chunk + */ deleted++; - dev->nFreeChunks ++; - //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 is the one being allocated from - - if(c == 0) - { - // We're looking at the first chunk in the block so the block is unused + dev->nFreeChunks++; + /*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 is the one being allocated from + */ + + if (c == 0) { + /* We're looking at the first chunk in the block so the block is unused */ state = YAFFS_BLOCK_STATE_EMPTY; dev->nErasedBlocks++; - } - else - { - // this is the block being allocated from - T(YAFFS_TRACE_SCAN,(TSTR(" Allocating from %d %d" TENDSTR),blk,c)); + } else { + /* this is the block being allocated from */ + T(YAFFS_TRACE_SCAN, + (TSTR + (" Allocating from %d %d" TENDSTR), + blk, c)); 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. - //Yaffs2 sanity check: - // This should be the one with the highest sequence number - if(dev->isYaffs2 && (dev->sequenceNumber != bi->sequenceNumber)) - { + dev->allocationBlockFinder = blk; + /* Set it to here to encourage the allocator to go forth from here. */ + + /* Yaffs2 sanity check: + * This should be the one with the highest sequence number + */ + if (dev->isYaffs2 + && (dev->sequenceNumber != + bi->sequenceNumber)) { T(YAFFS_TRACE_ALWAYS, - (TSTR("yaffs: Allocation block %d was not highest sequence id: block seq = %d, dev seq = %d" TENDSTR), - blk,bi->sequenceNumber,dev->sequenceNumber)); + (TSTR + ("yaffs: Allocation block %d was not highest sequence id:" + " block seq = %d, dev seq = %d" + TENDSTR), blk,bi->sequenceNumber,dev->sequenceNumber)); } } dev->nFreeChunks += (dev->nChunksPerBlock - c); - } - else if(tags.chunkId > 0) - { - // chunkId > 0 so it is a data chunk... + } else if (tags.chunkId > 0) { + /* chunkId > 0 so it is a data chunk... */ unsigned int endpos; - yaffs_SetChunkBit(dev,blk,c); + yaffs_SetChunkBit(dev, blk, c); bi->pagesInUse++; - - in = yaffs_FindOrCreateObjectByNumber(dev,tags.objectId,YAFFS_OBJECT_TYPE_FILE); - // PutChunkIntoFile checks for a clash (two data chunks with - // the same chunkId). - yaffs_PutChunkIntoFile(in,tags.chunkId,chunk,1); - endpos = (tags.chunkId - 1)* dev->nBytesPerChunk + tags.byteCount; - if(in->variantType == YAFFS_OBJECT_TYPE_FILE && in->variant.fileVariant.scannedFileSize <endpos) - { - in->variant.fileVariant.scannedFileSize = endpos; - if(!dev->useHeaderFileSize) - { - in->variant.fileVariant.fileSize = in->variant.fileVariant.scannedFileSize; + + in = yaffs_FindOrCreateObjectByNumber(dev, + tags. + objectId, + YAFFS_OBJECT_TYPE_FILE); + /* PutChunkIntoFile checks for a clash (two data chunks with + * the same chunkId). + */ + yaffs_PutChunkIntoFile(in, tags.chunkId, chunk, + 1); + endpos = + (tags.chunkId - 1) * dev->nBytesPerChunk + + tags.byteCount; + if (in->variantType == YAFFS_OBJECT_TYPE_FILE + && in->variant.fileVariant.scannedFileSize < + endpos) { + in->variant.fileVariant. + scannedFileSize = endpos; + if (!dev->useHeaderFileSize) { + in->variant.fileVariant. + fileSize = + in->variant.fileVariant. + scannedFileSize; } } - //T((" %d %d data %d %d\n",blk,c,tags.objectId,tags.chunkId)); - } - else - { - // chunkId == 0, so it is an ObjectHeader. - // Thus, we read in the object header and make the object - yaffs_SetChunkBit(dev,blk,c); + /* T((" %d %d data %d %d\n",blk,c,tags.objectId,tags.chunkId)); */ + } else { + /* chunkId == 0, so it is an ObjectHeader. + * Thus, we read in the object header and make the object + */ + yaffs_SetChunkBit(dev, blk, c); bi->pagesInUse++; - - yaffs_ReadChunkWithTagsFromNAND(dev,chunk,chunkData,NULL); - - oh = (yaffs_ObjectHeader *)chunkData; - - in = yaffs_FindObjectByNumber(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 - // deleted, and worse still it has changed type. Delete the old object. - + + yaffs_ReadChunkWithTagsFromNAND(dev, chunk, + chunkData, + NULL); + + oh = (yaffs_ObjectHeader *) chunkData; + + in = yaffs_FindObjectByNumber(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 + * deleted, and worse still it has changed type. Delete the old object. + */ + yaffs_DestroyObject(in); - + in = 0; } - - in = yaffs_FindOrCreateObjectByNumber(dev,tags.objectId,oh->type); - - if(oh->shadowsObject > 0) - { - yaffs_HandleShadowedObject(dev,oh->shadowsObject,0); + + in = yaffs_FindOrCreateObjectByNumber(dev, + tags. + objectId, + oh->type); + + if (oh->shadowsObject > 0) { + yaffs_HandleShadowedObject(dev, + oh-> + shadowsObject, + 0); } - - if(in->valid) - { - // We have already filled this one. We have a duplicate and need to resolve it. - + + if (in->valid) { + /* We have already filled this one. We have a duplicate and need to resolve it. */ + unsigned existingSerial = in->serial; unsigned newSerial = tags.serialNumber; - - if( dev->isYaffs2 || - ((existingSerial+1) & 3) == newSerial) - { - // Use new one - destroy the exisiting one - yaffs_DeleteChunk(dev,in->chunkId,1,__LINE__); + + if (dev->isYaffs2 || + ((existingSerial + 1) & 3) == + newSerial) { + /* Use new one - destroy the exisiting one */ + yaffs_DeleteChunk(dev, + in->chunkId, + 1, __LINE__); in->valid = 0; - } - else - { - // Use existing - destroy this one. - yaffs_DeleteChunk(dev,chunk,1,__LINE__); + } else { + /* Use existing - destroy this one. */ + yaffs_DeleteChunk(dev, chunk, 1, + __LINE__); } } - - if(!in->valid && - (tags.objectId == YAFFS_OBJECTID_ROOT || - tags.objectId == YAFFS_OBJECTID_LOSTNFOUND)) - { - // We only load some info, don't fiddle with directory structure + + 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; in->variantType = oh->type; - - in->yst_mode = oh->yst_mode; + + in->yst_mode = oh->yst_mode; #ifdef CONFIG_YAFFS_WINCE in->win_atime[0] = oh->win_atime[0]; in->win_ctime[0] = oh->win_ctime[0]; @@ -4264,24 +4118,22 @@ static int yaffs_Scan(yaffs_Device *dev) in->win_ctime[1] = oh->win_ctime[1]; in->win_mtime[1] = oh->win_mtime[1]; #else - in->yst_uid = oh->yst_uid; - in->yst_gid = oh->yst_gid; + in->yst_uid = oh->yst_uid; + in->yst_gid = oh->yst_gid; in->yst_atime = oh->yst_atime; in->yst_mtime = oh->yst_mtime; in->yst_ctime = oh->yst_ctime; in->yst_rdev = oh->yst_rdev; #endif - in->chunkId = chunk; - - } - else if(!in->valid) - { - // we need to load this info - + in->chunkId = chunk; + + } else if (!in->valid) { + /* we need to load this info */ + in->valid = 1; in->variantType = oh->type; - - in->yst_mode = oh->yst_mode; + + in->yst_mode = oh->yst_mode; #ifdef CONFIG_YAFFS_WINCE in->win_atime[0] = oh->win_atime[0]; in->win_ctime[0] = oh->win_ctime[0]; @@ -4290,173 +4142,189 @@ static int yaffs_Scan(yaffs_Device *dev) in->win_ctime[1] = oh->win_ctime[1]; in->win_mtime[1] = oh->win_mtime[1]; #else - in->yst_uid = oh->yst_uid; - in->yst_gid = oh->yst_gid; + in->yst_uid = oh->yst_uid; + in->yst_gid = oh->yst_gid; in->yst_atime = oh->yst_atime; in->yst_mtime = oh->yst_mtime; in->yst_ctime = oh->yst_ctime; in->yst_rdev = oh->yst_rdev; #endif - in->chunkId = chunk; - - yaffs_SetObjectName(in,oh->name); + in->chunkId = chunk; + + yaffs_SetObjectName(in, oh->name); in->dirty = 0; - - // directory stuff... - // hook up to parent - - parent = yaffs_FindOrCreateObjectByNumber(dev,oh->parentObjectId,YAFFS_OBJECT_TYPE_DIRECTORY); - if(parent->variantType == YAFFS_OBJECT_TYPE_UNKNOWN) + + /* directory stuff... + * hook up to parent + */ + + parent = + yaffs_FindOrCreateObjectByNumber + (dev, oh->parentObjectId, + YAFFS_OBJECT_TYPE_DIRECTORY); + if (parent->variantType == + YAFFS_OBJECT_TYPE_UNKNOWN) { + /* Set up as a directory */ + parent->variantType = + YAFFS_OBJECT_TYPE_DIRECTORY; + INIT_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; - INIT_LIST_HEAD(&parent->variant.directoryVariant.children); - } - else if(parent->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) - { - // Hoosterman, another problem.... - // We're trying to use a non-directory as a directory - - T(YAFFS_TRACE_ERROR, (TSTR("yaffs tragedy: attempting to use non-directory as a directory in scan. Put in lost+found." TENDSTR))); + /* Hoosterman, another problem.... + * We're trying to use a non-directory as a directory + */ + + T(YAFFS_TRACE_ERROR, + (TSTR + ("yaffs tragedy: attempting to use non-directory as" + " a directory in scan. Put in lost+found." + TENDSTR))); parent = dev->lostNFoundDir; } - - yaffs_AddObjectToDirectory(parent,in); - - if(0 && (parent == dev->deletedDir || - parent == dev->unlinkedDir)) - { - in->deleted = 1; // If it is unlinked at start up then it wants deleting + + yaffs_AddObjectToDirectory(parent, in); + + if (0 && (parent == dev->deletedDir || + parent == dev->unlinkedDir)) { + in->deleted = 1; /* If it is unlinked at start up then it wants deleting */ dev->nDeletedFiles++; } - - // Note re hardlinks. - // 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. - - switch(in->variantType) - { - case YAFFS_OBJECT_TYPE_UNKNOWN: // Todo got a problem - break; - case YAFFS_OBJECT_TYPE_FILE: - if(dev->isYaffs2 && oh->isShrink) - { - // Prune back the shrunken chunks - yaffs_PruneResizedChunks(in,oh->fileSize); - // Mark the block as having a shrinkHeader - bi->hasShrinkHeader = 1; - } - - if(dev->useHeaderFileSize) - - in->variant.fileVariant.fileSize = oh->fileSize; - - break; - case YAFFS_OBJECT_TYPE_HARDLINK: - in->variant.hardLinkVariant.equivalentObjectId = oh->equivalentObjectId; - in->hardLinks.next = (struct list_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: // Do nothing - in->variant.symLinkVariant.alias = yaffs_CloneString(oh->alias); - break; + /* Note re hardlinks. + * 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. + */ + + switch (in->variantType) { + case YAFFS_OBJECT_TYPE_UNKNOWN: + /* Todo got a problem */ + break; + case YAFFS_OBJECT_TYPE_FILE: + if (dev->isYaffs2 + && oh->isShrink) { + /* Prune back the shrunken chunks */ + yaffs_PruneResizedChunks + (in, oh->fileSize); + /* Mark the block as having a shrinkHeader */ + bi->hasShrinkHeader = 1; + } + + if (dev->useHeaderFileSize) + + in->variant.fileVariant. + fileSize = + oh->fileSize; + + break; + case YAFFS_OBJECT_TYPE_HARDLINK: + in->variant.hardLinkVariant. + equivalentObjectId = + oh->equivalentObjectId; + in->hardLinks.next = + (struct list_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: + in->variant.symLinkVariant. + alias = + yaffs_CloneString(oh->alias); + break; } - if(parent == dev->deletedDir) - { + if (parent == dev->deletedDir) { yaffs_DestroyObject(in); bi->hasShrinkHeader = 1; } - //T((" %d %d header %d \"%s\" type %d\n",blk,c,tags.objectId,oh->name,in->variantType)); } } } - - if(state == YAFFS_BLOCK_STATE_NEEDS_SCANNING) - { - // If we got this far while scanning, then the block is fully allocated. - state = YAFFS_BLOCK_STATE_FULL; + + if (state == YAFFS_BLOCK_STATE_NEEDS_SCANNING) { + /* If we got this far while scanning, then the block is fully allocated.*/ + state = YAFFS_BLOCK_STATE_FULL; } - + bi->blockState = state; - - // Now let's see if it was dirty - if( bi->pagesInUse == 0 && - !bi->hasShrinkHeader && - bi->blockState == YAFFS_BLOCK_STATE_FULL) - { - yaffs_BlockBecameDirty(dev,blk); - } - - } - - if(blockIndex) - { + + /* Now let's see if it was dirty */ + if (bi->pagesInUse == 0 && + !bi->hasShrinkHeader && + bi->blockState == YAFFS_BLOCK_STATE_FULL) { + yaffs_BlockBecameDirty(dev, blk); + } + + } + + if (blockIndex) { 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 - // hardlinks. - while(hardList) - { + /* 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 + * hardlinks. + */ + while (hardList) { hl = hardList; - hardList = (yaffs_Object *)(hardList->hardLinks.next); - - in = yaffs_FindObjectByNumber(dev,hl->variant.hardLinkVariant.equivalentObjectId); - - if(in) - { - // Add the hardlink pointers - hl->variant.hardLinkVariant.equivalentObject=in; - list_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; + hardList = (yaffs_Object *) (hardList->hardLinks.next); + + in = yaffs_FindObjectByNumber(dev, + hl->variant.hardLinkVariant. + equivalentObjectId); + + if (in) { + /* Add the hardlink pointers */ + hl->variant.hardLinkVariant.equivalentObject = in; + list_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; INIT_LIST_HEAD(&hl->hardLinks); - + } - - } - - // Handle the unlinked files. Since they were left in an unlinked state we should - // just delete them. + + } + + /* Handle the unlinked files. Since they were left in an unlinked state we should + * just delete them. + */ { - struct list_head *i; + struct list_head *i; struct list_head *n; - + yaffs_Object *l; - // Soft delete all the unlinked files - list_for_each_safe(i,n,&dev->unlinkedDir->variant.directoryVariant.children) - { - if(i) - { - l = list_entry(i, yaffs_Object,siblings); - yaffs_DestroyObject(l); + /* Soft delete all the unlinked files */ + list_for_each_safe(i, n, + &dev->unlinkedDir->variant.directoryVariant. + children) { + if (i) { + l = list_entry(i, yaffs_Object, siblings); + yaffs_DestroyObject(l); } - } - } - - yaffs_ReleaseTempBuffer(dev,chunkData,__LINE__); - - T(YAFFS_TRACE_SCAN,(TSTR("yaffs_Scan ends" TENDSTR))); + } + } + + yaffs_ReleaseTempBuffer(dev, chunkData, __LINE__); + + T(YAFFS_TRACE_SCAN, (TSTR("yaffs_Scan ends" TENDSTR))); return YAFFS_OK; } - -static int yaffs_ScanBackwards(yaffs_Device *dev) +static int yaffs_ScanBackwards(yaffs_Device * dev) { yaffs_ExtendedTags tags; int blk; @@ -4464,7 +4332,7 @@ static int yaffs_ScanBackwards(yaffs_Dev int startIterator; int endIterator; int nBlocksToScan = 0; - + int chunk; int c; int deleted; @@ -4472,322 +4340,337 @@ static int yaffs_ScanBackwards(yaffs_Dev yaffs_Object *hardList = NULL; yaffs_Object *hl; yaffs_BlockInfo *bi; - int sequenceNumber; + int sequenceNumber; yaffs_ObjectHeader *oh; yaffs_Object *in; yaffs_Object *parent; int nBlocks = dev->internalEndBlock - dev->internalStartBlock + 1; - + __u8 *chunkData; yaffs_BlockIndex *blockIndex = NULL; - - if(!dev->isYaffs2) - { - T(YAFFS_TRACE_SCAN,(TSTR("yaffs_ScanBackwards is only for YAFFS2!" TENDSTR))); + if (!dev->isYaffs2) { + T(YAFFS_TRACE_SCAN, + (TSTR("yaffs_ScanBackwards is only for YAFFS2!" TENDSTR))); return YAFFS_FAIL; } - - T(YAFFS_TRACE_SCAN,(TSTR("yaffs_ScanBackwards starts intstartblk %d intendblk %d..." TENDSTR),dev->internalStartBlock,dev->internalEndBlock)); - - chunkData = yaffs_GetTempBuffer(dev,__LINE__); - - + + T(YAFFS_TRACE_SCAN, + (TSTR + ("yaffs_ScanBackwards starts intstartblk %d intendblk %d..." + TENDSTR), dev->internalStartBlock, dev->internalEndBlock)); + + chunkData = yaffs_GetTempBuffer(dev, __LINE__); + dev->sequenceNumber = YAFFS_LOWEST_SEQUENCE_NUMBER; - - blockIndex = YMALLOC(nBlocks * sizeof(yaffs_BlockIndex)); - - - // Scan all the blocks to determine their state - for(blk = dev->internalStartBlock; blk <= dev->internalEndBlock; blk++) - { - bi = yaffs_GetBlockInfo(dev,blk); - yaffs_ClearChunkBits(dev,blk); + + blockIndex = YMALLOC(nBlocks * sizeof(yaffs_BlockIndex)); + + /* Scan all the blocks to determine their state */ + for (blk = dev->internalStartBlock; blk <= dev->internalEndBlock; blk++) { + bi = yaffs_GetBlockInfo(dev, blk); + yaffs_ClearChunkBits(dev, blk); bi->pagesInUse = 0; bi->softDeletions = 0; - - yaffs_QueryInitialBlockState(dev,blk,&state,&sequenceNumber); - + + yaffs_QueryInitialBlockState(dev, blk, &state, &sequenceNumber); + bi->blockState = state; - bi->sequenceNumber = sequenceNumber; - - T(YAFFS_TRACE_SCAN_DEBUG,(TSTR("Block scanning block %d state %d seq %d" TENDSTR),blk,state,sequenceNumber)); - - if(state == YAFFS_BLOCK_STATE_DEAD) - { - T(YAFFS_TRACE_BAD_BLOCKS,(TSTR("block %d is bad" TENDSTR),blk)); - } - else if(state == YAFFS_BLOCK_STATE_EMPTY) - { - T(YAFFS_TRACE_SCAN_DEBUG,(TSTR("Block empty " TENDSTR))); + bi->sequenceNumber = sequenceNumber; + + T(YAFFS_TRACE_SCAN_DEBUG, + (TSTR("Block scanning block %d state %d seq %d" TENDSTR), blk, + state, sequenceNumber)); + + if (state == YAFFS_BLOCK_STATE_DEAD) { + T(YAFFS_TRACE_BAD_BLOCKS, + (TSTR("block %d is bad" TENDSTR), blk)); + } else if (state == YAFFS_BLOCK_STATE_EMPTY) { + T(YAFFS_TRACE_SCAN_DEBUG, + (TSTR("Block empty " TENDSTR))); dev->nErasedBlocks++; dev->nFreeChunks += dev->nChunksPerBlock; - } - else if(state == YAFFS_BLOCK_STATE_NEEDS_SCANNING) - { - - // Determine the highest sequence number - if( dev->isYaffs2 && + } else if (state == YAFFS_BLOCK_STATE_NEEDS_SCANNING) { + + /* Determine the highest sequence number */ + if (dev->isYaffs2 && sequenceNumber >= YAFFS_LOWEST_SEQUENCE_NUMBER && - sequenceNumber < YAFFS_HIGHEST_SEQUENCE_NUMBER) - { - + sequenceNumber < YAFFS_HIGHEST_SEQUENCE_NUMBER) { + blockIndex[nBlocksToScan].seq = sequenceNumber; blockIndex[nBlocksToScan].block = blk; - + nBlocksToScan++; - if(sequenceNumber >= dev->sequenceNumber) - { - dev->sequenceNumber = sequenceNumber; + if (sequenceNumber >= dev->sequenceNumber) { + dev->sequenceNumber = sequenceNumber; } - } - else if(dev->isYaffs2) - { - // TODO: Nasty sequence number! - T(YAFFS_TRACE_SCAN,(TSTR("Block scanning block %d has bad sequence number %d" TENDSTR),blk,sequenceNumber)); + } else if (dev->isYaffs2) { + /* TODO: Nasty sequence number! */ + T(YAFFS_TRACE_SCAN, + (TSTR + ("Block scanning block %d has bad sequence number %d" + TENDSTR), blk, sequenceNumber)); } } } - - // Sort the blocks - // Dungy old bubble sort for now... + + /* + * Sort the blocks + * Dungy old bubble sort for now... + */ { yaffs_BlockIndex temp; int i; int j; - - for(i = 0; i < nBlocksToScan; i++) - for(j = i+1; j < nBlocksToScan; j++) - if(blockIndex[i].seq > blockIndex[j].seq) - { - temp = blockIndex[j]; - blockIndex[j] = blockIndex[i]; - blockIndex[i] = temp; - } - } - - - // Now scan the blocks looking at the data. + + for (i = 0; i < nBlocksToScan; i++) + for (j = i + 1; j < nBlocksToScan; j++) + if (blockIndex[i].seq > blockIndex[j].seq) { + temp = blockIndex[j]; + blockIndex[j] = blockIndex[i]; + blockIndex[i] = temp; + } + } + + /* Now scan the blocks looking at the data. */ startIterator = 0; - endIterator = nBlocksToScan-1; - T(YAFFS_TRACE_SCAN_DEBUG,(TSTR("%d blocks to be scanned" TENDSTR),nBlocksToScan)); - - - // For each block.... backwards - for(blockIterator = endIterator; blockIterator >= startIterator; blockIterator--) - { - - // get the block to scan in the correct order + endIterator = nBlocksToScan - 1; + T(YAFFS_TRACE_SCAN_DEBUG, + (TSTR("%d blocks to be scanned" TENDSTR), nBlocksToScan)); + + /* For each block.... backwards */ + for (blockIterator = endIterator; blockIterator >= startIterator; + blockIterator--) { + + /* get the block to scan in the correct order */ blk = blockIndex[blockIterator].block; - - bi = yaffs_GetBlockInfo(dev,blk); + bi = yaffs_GetBlockInfo(dev, blk); state = bi->blockState; - + deleted = 0; - - if( 0 && // Disable since this is redundant. - state == YAFFS_BLOCK_STATE_NEEDS_SCANNING) - { - // Let's look at the first chunk in the block - chunk = blk * dev->nChunksPerBlock; - - yaffs_ReadChunkWithTagsFromNAND(dev,chunk,NULL,&tags); - - // Let's have a good look at this chunk... - - if(!tags.chunkUsed) - { + + /* For each chunk in each block that needs scanning.... */ + for (c = dev->nChunksPerBlock - 1; c >= 0 && + (state == YAFFS_BLOCK_STATE_NEEDS_SCANNING || + state == YAFFS_BLOCK_STATE_ALLOCATING); c--) { + /* Scan backwards... + * Read the tags and decide what to do + */ + chunk = blk * dev->nChunksPerBlock + c; + + yaffs_ReadChunkWithTagsFromNAND(dev, chunk, NULL, + &tags); + + /* Let's have a good look at this chunk... */ + + if (!tags.chunkUsed) { // An unassigned chunk in the block // This means that either the block is empty or // this is the one being allocated from - - // We're looking at the first chunk in the block so the block is unused - state = YAFFS_BLOCK_STATE_EMPTY; - dev->nErasedBlocks++; - dev->nFreeChunks += dev->nChunksPerBlock; - } - - } - - // For each chunk in each block that needs scanning.... - for(c = dev->nChunksPerBlock-1; c >= 0 && - (state == YAFFS_BLOCK_STATE_NEEDS_SCANNING || - state == YAFFS_BLOCK_STATE_ALLOCATING); c--) - { - // Scan backwards... - // Read the tags and decide what to do - chunk = blk * dev->nChunksPerBlock + c; - - yaffs_ReadChunkWithTagsFromNAND(dev,chunk,NULL,&tags); - - // Let's have a good look at this chunk... - - if(!tags.chunkUsed) - { - // An unassigned chunk in the block - // This means that either the block is empty or - // this is the one being allocated from - - if(c == 0) - { - // We're looking at the first chunk in the block so the block is unused + + if (c == 0) { + /* We're looking at the first chunk in the block so the block is unused */ state = YAFFS_BLOCK_STATE_EMPTY; dev->nErasedBlocks++; - } - else - { - // this is the block being allocated from - if(state == YAFFS_BLOCK_STATE_NEEDS_SCANNING) - { - T(YAFFS_TRACE_SCAN,(TSTR(" Allocating from %d %d" TENDSTR),blk,c)); + } else { + /* this is the block being allocated from */ + if (state == + YAFFS_BLOCK_STATE_NEEDS_SCANNING) { + T(YAFFS_TRACE_SCAN, + (TSTR + (" Allocating from %d %d" + TENDSTR), blk, c)); } 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. - //Yaffs2 sanity check: - // This should be the one with the highest sequence number - if(dev->isYaffs2 && (dev->sequenceNumber != bi->sequenceNumber)) - { + dev->allocationBlockFinder = blk; + /* Set it to here to encourage the allocator to + * go forth from here. + */ + + /* Yaffs2 sanity check: + * This should be the one with the highest sequence number + */ + if (dev->isYaffs2 + && (dev->sequenceNumber != + bi->sequenceNumber)) { T(YAFFS_TRACE_ALWAYS, - (TSTR("yaffs: Allocation block %d was not highest sequence id: block seq = %d, dev seq = %d" TENDSTR), - blk,bi->sequenceNumber,dev->sequenceNumber)); + (TSTR + ("yaffs: Allocation block %d was not highest sequence " + "id: block seq = %d, dev seq = %d" + TENDSTR), blk, + bi->sequenceNumber, + dev->sequenceNumber)); } } - dev->nFreeChunks ++; - } - else if(tags.chunkId > 0) - { - // chunkId > 0 so it is a data chunk... + dev->nFreeChunks++; + } else if (tags.chunkId > 0) { + /* chunkId > 0 so it is a data chunk... */ unsigned int endpos; - - __u32 chunkBase = (tags.chunkId - 1)* dev->nBytesPerChunk; - - yaffs_SetChunkBit(dev,blk,c); + + __u32 chunkBase = + (tags.chunkId - 1) * dev->nBytesPerChunk; + + yaffs_SetChunkBit(dev, blk, c); bi->pagesInUse++; - - in = yaffs_FindOrCreateObjectByNumber(dev,tags.objectId,YAFFS_OBJECT_TYPE_FILE); - if(in->variantType == YAFFS_OBJECT_TYPE_FILE && - chunkBase < in->variant.fileVariant.shrinkSize) - { - // This has not been invalidated by a resize - yaffs_PutChunkIntoFile(in,tags.chunkId,chunk,-1); - - - // 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->nBytesPerChunk + 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 = yaffs_FindOrCreateObjectByNumber(dev, + tags. + objectId, + YAFFS_OBJECT_TYPE_FILE); + if (in->variantType == YAFFS_OBJECT_TYPE_FILE + && chunkBase < + in->variant.fileVariant.shrinkSize) { + /* This has not been invalidated by a resize */ + yaffs_PutChunkIntoFile(in, tags.chunkId, + chunk, -1); + + /* 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->nBytesPerChunk + + 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; } + } else { + /* This chunk has been invalidated by a resize, so delete */ + yaffs_DeleteChunk(dev, chunk, 1, __LINE__); + } - else - { - // This chunk has been invalidated by a resize, so delete - yaffs_DeleteChunk(dev,chunk,1,__LINE__); - - - } - //T((" %d %d data %d %d\n",blk,c,tags.objectId,tags.chunkId)); - } - else - { - // chunkId == 0, so it is an ObjectHeader. - // Thus, we read in the object header and make the object - yaffs_SetChunkBit(dev,blk,c); + } else { + /* chunkId == 0, so it is an ObjectHeader. + * Thus, we read in the object header and make the object + */ + yaffs_SetChunkBit(dev, blk, c); bi->pagesInUse++; - + oh = NULL; in = NULL; - - if(tags.extraHeaderInfoAvailable) - { - in = yaffs_FindOrCreateObjectByNumber(dev,tags.objectId,tags.extraObjectType); + + if (tags.extraHeaderInfoAvailable) { + in = yaffs_FindOrCreateObjectByNumber + (dev, tags.objectId, + tags.extraObjectType); } - - if(!in || !in->valid) - { - - // 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 - // living with invalid data until needed. - - yaffs_ReadChunkWithTagsFromNAND(dev,chunk,chunkData,NULL); - - oh = (yaffs_ObjectHeader *)chunkData; - - if(!in) - in = yaffs_FindOrCreateObjectByNumber(dev,tags.objectId,oh->type); - + if (!in || !in->valid) { + + /* 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 + * living with invalid data until needed. + */ + + yaffs_ReadChunkWithTagsFromNAND(dev, + chunk, + chunkData, + NULL); + + oh = (yaffs_ObjectHeader *) chunkData; + + if (!in) + in = yaffs_FindOrCreateObjectByNumber(dev, tags.objectId, oh->type); + } - - if(!in) - { - // TODO Hoosterman we have a problem! - T(YAFFS_TRACE_ERROR, (TSTR("yaffs tragedy: Could not make object for object %d at chunk %d during scan" TENDSTR),tags.objectId,chunk)); + + if (!in) { + /* TODO Hoosterman we have a problem! */ + T(YAFFS_TRACE_ERROR, + (TSTR + ("yaffs tragedy: Could not make object for object %d " + "at chunk %d during scan" + TENDSTR), tags.objectId, chunk)); } - - if(in->valid) - { - // We have already filled this one. 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) || - (tags.extraHeaderInfoAvailable && tags.extraObjectType == YAFFS_OBJECT_TYPE_FILE)) - ) - { - __u32 thisSize = (oh) ? oh->fileSize : tags.extraFileLength; - __u32 parentObjectId = (oh) ? oh->parentObjectId : tags.extraParentObjectId; - unsigned isShrink = (oh) ? oh->isShrink : tags.extraIsShrinkHeader; - - // If it is deleted (unlinked at start also means deleted) - // we treat the file size as being zeroed at this point. - if(parentObjectId == YAFFS_OBJECTID_DELETED || - parentObjectId == YAFFS_OBJECTID_UNLINKED) - { + + if (in->valid) { + /* We have already filled this one. + * 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) + || + (tags. + extraHeaderInfoAvailable + && + tags. + extraObjectType + == + YAFFS_OBJECT_TYPE_FILE)) + ) { + __u32 thisSize = + (oh) ? oh->fileSize : tags. + extraFileLength; + __u32 parentObjectId = + (oh) ? oh-> + parentObjectId : tags. + extraParentObjectId; + unsigned isShrink = + (oh) ? oh->isShrink : tags. + extraIsShrinkHeader; + + /* If it is deleted (unlinked at start also means deleted) + * we treat the file size as being zeroed at this point. + */ + if (parentObjectId == + YAFFS_OBJECTID_DELETED + || parentObjectId == + YAFFS_OBJECTID_UNLINKED) { thisSize = 0; 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. - yaffs_DeleteChunk(dev,chunk,1,__LINE__); - + /* Use existing - destroy this one. */ + yaffs_DeleteChunk(dev, chunk, 1, __LINE__); + } - - if(!in->valid && - (tags.objectId == YAFFS_OBJECTID_ROOT || - tags.objectId == YAFFS_OBJECTID_LOSTNFOUND)) - { - // We only load some info, don't fiddle with directory structure + + 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; in->variantType = oh->type; - - in->yst_mode = oh->yst_mode; + + in->yst_mode = oh->yst_mode; #ifdef CONFIG_YAFFS_WINCE in->win_atime[0] = oh->win_atime[0]; in->win_ctime[0] = oh->win_ctime[0]; @@ -4796,24 +4679,22 @@ static int yaffs_ScanBackwards(yaffs_Dev in->win_ctime[1] = oh->win_ctime[1]; in->win_mtime[1] = oh->win_mtime[1]; #else - in->yst_uid = oh->yst_uid; - in->yst_gid = oh->yst_gid; + in->yst_uid = oh->yst_uid; + in->yst_gid = oh->yst_gid; in->yst_atime = oh->yst_atime; in->yst_mtime = oh->yst_mtime; in->yst_ctime = oh->yst_ctime; in->yst_rdev = oh->yst_rdev; #endif - in->chunkId = chunk; - - } - else if(!in->valid) - { - // we need to load this info - + in->chunkId = chunk; + + } else if (!in->valid) { + /* we need to load this info */ + in->valid = 1; in->variantType = oh->type; - - in->yst_mode = oh->yst_mode; + + in->yst_mode = oh->yst_mode; #ifdef CONFIG_YAFFS_WINCE in->win_atime[0] = oh->win_atime[0]; in->win_ctime[0] = oh->win_ctime[0]; @@ -4822,750 +4703,755 @@ static int yaffs_ScanBackwards(yaffs_Dev in->win_ctime[1] = oh->win_ctime[1]; in->win_mtime[1] = oh->win_mtime[1]; #else - in->yst_uid = oh->yst_uid; - in->yst_gid = oh->yst_gid; + in->yst_uid = oh->yst_uid; + in->yst_gid = oh->yst_gid; in->yst_atime = oh->yst_atime; in->yst_mtime = oh->yst_mtime; in->yst_ctime = oh->yst_ctime; in->yst_rdev = oh->yst_rdev; #endif - in->chunkId = chunk; - - if(oh->shadowsObject > 0) - { - yaffs_HandleShadowedObject(dev,oh->shadowsObject,1); + in->chunkId = chunk; + + if (oh->shadowsObject > 0) { + yaffs_HandleShadowedObject(dev, + oh-> + shadowsObject, + 1); } - - yaffs_SetObjectName(in,oh->name); + yaffs_SetObjectName(in, oh->name); in->dirty = 0; - - // directory stuff... - // hook up to parent - - parent = yaffs_FindOrCreateObjectByNumber(dev,oh->parentObjectId,YAFFS_OBJECT_TYPE_DIRECTORY); - if(parent->variantType == YAFFS_OBJECT_TYPE_UNKNOWN) + + /* directory stuff... + * hook up to parent + */ + + parent = + yaffs_FindOrCreateObjectByNumber + (dev, oh->parentObjectId, + YAFFS_OBJECT_TYPE_DIRECTORY); + if (parent->variantType == + YAFFS_OBJECT_TYPE_UNKNOWN) { + /* Set up as a directory */ + parent->variantType = + YAFFS_OBJECT_TYPE_DIRECTORY; + INIT_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; - INIT_LIST_HEAD(&parent->variant.directoryVariant.children); - } - else if(parent->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) - { - // Hoosterman, another problem.... - // We're trying to use a non-directory as a directory - - T(YAFFS_TRACE_ERROR, (TSTR("yaffs tragedy: attempting to use non-directory as a directory in scan. Put in lost+found." TENDSTR))); + /* Hoosterman, another problem.... + * We're trying to use a non-directory as a directory + */ + + T(YAFFS_TRACE_ERROR, + (TSTR + ("yaffs tragedy: attempting to use non-directory as" + " a directory in scan. Put in lost+found." + TENDSTR))); parent = dev->lostNFoundDir; } - - yaffs_AddObjectToDirectory(parent,in); - - if((parent == dev->deletedDir || - parent == dev->unlinkedDir)) - { - in->deleted = 1; // If it is unlinked at start up then it wants deleting + + yaffs_AddObjectToDirectory(parent, in); + + if ((parent == dev->deletedDir || + parent == dev->unlinkedDir)) { + /* If it is unlinked at start up then it wants deleting */ + in->deleted = 1; } - - if( oh->isShrink) - { - // Mark the block as having a shrinkHeader + + if (oh->isShrink) { + /* Mark the block as having a shrinkHeader */ bi->hasShrinkHeader = 1; } - - - // Note re hardlinks. - // 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. - - switch(in->variantType) - { - case YAFFS_OBJECT_TYPE_UNKNOWN: // Todo got a problem - break; - case YAFFS_OBJECT_TYPE_FILE: - - - if(in->variant.fileVariant.scannedFileSize < oh->fileSize) - { - // This covers the case where the file size is > than where the data is - // This will happen if the file is resized to be larger than its current - // data extents. - in->variant.fileVariant.fileSize = oh->fileSize; - in->variant.fileVariant.scannedFileSize = in->variant.fileVariant.fileSize; - } - - if(oh->isShrink && - in->variant.fileVariant.shrinkSize > oh->fileSize) - { - in->variant.fileVariant.shrinkSize = oh->fileSize; - } - - break; - case YAFFS_OBJECT_TYPE_HARDLINK: - in->variant.hardLinkVariant.equivalentObjectId = oh->equivalentObjectId; - in->hardLinks.next = (struct list_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: // Do nothing - in->variant.symLinkVariant.alias = yaffs_CloneString(oh->alias); - break; + + /* Note re hardlinks. + * 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. + */ + + switch (in->variantType) { + case YAFFS_OBJECT_TYPE_UNKNOWN: + /* Todo got a problem */ + break; + case YAFFS_OBJECT_TYPE_FILE: + + if (in->variant.fileVariant. + scannedFileSize < + oh->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 + * than its current data extents. + */ + in->variant.fileVariant.fileSize = + oh->fileSize; + in->variant.fileVariant.scannedFileSize = + in->variant.fileVariant.fileSize; + } + + if (oh->isShrink && + in->variant.fileVariant.shrinkSize > + oh->fileSize) { + in->variant.fileVariant.shrinkSize = + oh->fileSize; + } + + break; + case YAFFS_OBJECT_TYPE_HARDLINK: + in->variant.hardLinkVariant.equivalentObjectId = + oh->equivalentObjectId; + in->hardLinks.next = + (struct list_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: + in->variant.symLinkVariant. + alias = + yaffs_CloneString(oh-> + alias); + break; } - //T((" %d %d header %d \"%s\" type %d\n",blk,c,tags.objectId,oh->name,in->variantType)); } } } - - if(state == YAFFS_BLOCK_STATE_NEEDS_SCANNING) - { - // If we got this far while scanning, then the block is fully allocated. - state = YAFFS_BLOCK_STATE_FULL; + + if (state == YAFFS_BLOCK_STATE_NEEDS_SCANNING) { + /* If we got this far while scanning, then the block is fully allocated. */ + state = YAFFS_BLOCK_STATE_FULL; } - + bi->blockState = state; - - // Now let's see if it was dirty - if( bi->pagesInUse == 0 && - !bi->hasShrinkHeader && - bi->blockState == YAFFS_BLOCK_STATE_FULL) - { - yaffs_BlockBecameDirty(dev,blk); - } - - } - - if(blockIndex) - { - 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 - // hardlinks. - while(hardList) - { - hl = hardList; - hardList = (yaffs_Object *)(hardList->hardLinks.next); - - in = yaffs_FindObjectByNumber(dev,hl->variant.hardLinkVariant.equivalentObjectId); - - if(in) - { - // Add the hardlink pointers - hl->variant.hardLinkVariant.equivalentObject=in; - list_add(&hl->hardLinks,&in->hardLinks); + + /* Now let's see if it was dirty */ + if (bi->pagesInUse == 0 && + !bi->hasShrinkHeader && + bi->blockState == YAFFS_BLOCK_STATE_FULL) { + yaffs_BlockBecameDirty(dev, blk); } - else - { - //Todo Need to report/handle this better. - // Got a problem... hardlink to a non-existant object - hl->variant.hardLinkVariant.equivalentObject=NULL; + + } + + if (blockIndex) { + 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 + * hardlinks. + */ + while (hardList) { + hl = hardList; + hardList = (yaffs_Object *) (hardList->hardLinks.next); + + in = yaffs_FindObjectByNumber(dev, + hl->variant.hardLinkVariant. + equivalentObjectId); + + if (in) { + /* Add the hardlink pointers */ + hl->variant.hardLinkVariant.equivalentObject = in; + list_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; INIT_LIST_HEAD(&hl->hardLinks); - + } - - } - + + } + { - struct list_head *i; + struct list_head *i; struct list_head *n; - + yaffs_Object *l; - - // Soft delete all the unlinked files - list_for_each_safe(i,n,&dev->unlinkedDir->variant.directoryVariant.children) - { - if(i) - { - l = list_entry(i, yaffs_Object,siblings); - yaffs_DestroyObject(l); + + /* Soft delete all the unlinked files */ + list_for_each_safe(i, n, + &dev->unlinkedDir->variant.directoryVariant. + children) { + if (i) { + l = list_entry(i, yaffs_Object, siblings); + yaffs_DestroyObject(l); } - } - - // Soft delete all the deletedDir files - list_for_each_safe(i,n,&dev->deletedDir->variant.directoryVariant.children) - { - if(i) - { - l = list_entry(i, yaffs_Object,siblings); - yaffs_DestroyObject(l); - + } + + /* Soft delete all the deletedDir files */ + list_for_each_safe(i, n, + &dev->deletedDir->variant.directoryVariant. + children) { + if (i) { + l = list_entry(i, yaffs_Object, siblings); + yaffs_DestroyObject(l); + } - } - } - - yaffs_ReleaseTempBuffer(dev,chunkData,__LINE__); - - T(YAFFS_TRACE_SCAN,(TSTR("yaffs_ScanBackwards ends" TENDSTR))); + } + } + + yaffs_ReleaseTempBuffer(dev, chunkData, __LINE__); + + T(YAFFS_TRACE_SCAN, (TSTR("yaffs_ScanBackwards ends" TENDSTR))); return YAFFS_OK; } - - -////////////////////////// Directory Functions ///////////////////////// - - -static void yaffs_AddObjectToDirectory(yaffs_Object *directory, yaffs_Object *obj) +/*------------------------------ Directory Functions ----------------------------- */ + +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(); - } - if(directory->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) - { - T(YAFFS_TRACE_ALWAYS,(TSTR("tragedy: Trying to add an object to a non-directory" TENDSTR))); + if (!directory) { + T(YAFFS_TRACE_ALWAYS, + (TSTR + ("tragedy: Trying to add an object to a null pointer directory" + TENDSTR))); YBUG(); } - - if(obj->siblings.prev == NULL) - { - // Not initialised + if (directory->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) { + T(YAFFS_TRACE_ALWAYS, + (TSTR + ("tragedy: Trying to add an object to a non-directory" + TENDSTR))); + YBUG(); + } + + if (obj->siblings.prev == NULL) { + /* Not initialised */ INIT_LIST_HEAD(&obj->siblings); - - } - else if(!list_empty(&obj->siblings)) - { - // If it is holed up somewhere else, un hook it + + } else if (!list_empty(&obj->siblings)) { + /* If it is holed up somewhere else, un hook it */ list_del_init(&obj->siblings); } - // Now add it - list_add(&obj->siblings,&directory->variant.directoryVariant.children); + /* Now add it */ + list_add(&obj->siblings, &directory->variant.directoryVariant.children); obj->parent = directory; - - if(directory == obj->myDev->unlinkedDir || directory == obj->myDev->deletedDir) - { + + if (directory == obj->myDev->unlinkedDir + || directory == obj->myDev->deletedDir) { obj->unlinked = 1; obj->myDev->nUnlinkedFiles++; obj->renameAllowed = 0; } } -static void yaffs_RemoveObjectFromDirectory(yaffs_Object *obj) +static void yaffs_RemoveObjectFromDirectory(yaffs_Object * obj) { list_del_init(&obj->siblings); obj->parent = NULL; } -yaffs_Object *yaffs_FindObjectByName(yaffs_Object *directory,const YCHAR *name) +yaffs_Object *yaffs_FindObjectByName(yaffs_Object * directory, + const YCHAR * name) { int sum; - + struct list_head *i; - YCHAR buffer[YAFFS_MAX_NAME_LENGTH+1]; - + YCHAR buffer[YAFFS_MAX_NAME_LENGTH + 1]; + yaffs_Object *l; - - if(!name) - { + + if (!name) { return NULL; } - if(!directory) - { - T(YAFFS_TRACE_ALWAYS,(TSTR("tragedy: yaffs_FindObjectByName: null pointer directory"TENDSTR))); + if (!directory) { + T(YAFFS_TRACE_ALWAYS, + (TSTR + ("tragedy: yaffs_FindObjectByName: null pointer directory" + TENDSTR))); YBUG(); } - if(directory->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) - { - T(YAFFS_TRACE_ALWAYS,(TSTR("tragedy: yaffs_FindObjectByName: non-directory"TENDSTR))); + if (directory->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) { + T(YAFFS_TRACE_ALWAYS, + (TSTR + ("tragedy: yaffs_FindObjectByName: non-directory" TENDSTR))); YBUG(); } sum = yaffs_CalcNameSum(name); - - list_for_each(i,&directory->variant.directoryVariant.children) - { - if(i) - { - l = list_entry(i, yaffs_Object,siblings); - - // Special case for lost-n-found - if(l->objectId == YAFFS_OBJECTID_LOSTNFOUND) - { - if(yaffs_strcmp(name,YAFFS_LOSTNFOUND_NAME) == 0) - { + + list_for_each(i, &directory->variant.directoryVariant.children) { + if (i) { + l = list_entry(i, yaffs_Object, siblings); + + /* Special case for lost-n-found */ + if (l->objectId == YAFFS_OBJECTID_LOSTNFOUND) { + if (yaffs_strcmp(name, YAFFS_LOSTNFOUND_NAME) == 0) { return l; } - } - else if(yaffs_SumCompare(l->sum, sum)|| - l->chunkId <= 0) //LostnFound cunk called Objxxx + } else if (yaffs_SumCompare(l->sum, sum) || l->chunkId <= 0) { - // Do a real check - yaffs_GetObjectName(l,buffer,YAFFS_MAX_NAME_LENGTH); - if(yaffs_strcmp(name,buffer) == 0) - { + /* LostnFound cunk called Objxxx + * Do a real check + */ + yaffs_GetObjectName(l, buffer, + YAFFS_MAX_NAME_LENGTH); + if (yaffs_strcmp(name, buffer) == 0) { return l; } - - } + + } } } - + return NULL; } -int yaffs_ApplyToDirectoryChildren(yaffs_Object *theDir,int (*fn)(yaffs_Object *)) +#if 0 +int yaffs_ApplyToDirectoryChildren(yaffs_Object * theDir, + int (*fn) (yaffs_Object *)) { - struct list_head *i; + struct list_head *i; yaffs_Object *l; - - - if(!theDir) - { - T(YAFFS_TRACE_ALWAYS,(TSTR("tragedy: yaffs_FindObjectByName: null pointer directory"TENDSTR))); + + if (!theDir) { + T(YAFFS_TRACE_ALWAYS, + (TSTR + ("tragedy: yaffs_FindObjectByName: null pointer directory" + TENDSTR))); YBUG(); } - if(theDir->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) - { - T(YAFFS_TRACE_ALWAYS,(TSTR("tragedy: yaffs_FindObjectByName: non-directory"TENDSTR))); + if (theDir->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) { + T(YAFFS_TRACE_ALWAYS, + (TSTR + ("tragedy: yaffs_FindObjectByName: non-directory" TENDSTR))); YBUG(); } - - list_for_each(i,&theDir->variant.directoryVariant.children) - { - if(i) - { - l = list_entry(i, yaffs_Object,siblings); - if(l && !fn(l)) - { + + list_for_each(i, &theDir->variant.directoryVariant.children) { + if (i) { + l = list_entry(i, yaffs_Object, siblings); + if (l && !fn(l)) { return YAFFS_FAIL; } } } - + return YAFFS_OK; } - - -// GetEquivalentObject dereferences any hard links to get to the -// actual object. - -yaffs_Object *yaffs_GetEquivalentObject(yaffs_Object *obj) +#endif + +/* GetEquivalentObject dereferences any hard links to get to the + * actual object. + */ + +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 + if (obj && obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK) { + /* We want the object id of the equivalent object, not this one */ obj = obj->variant.hardLinkVariant.equivalentObject; } 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)); - - if(obj->objectId == YAFFS_OBJECTID_LOSTNFOUND) - { - yaffs_strncpy(name,YAFFS_LOSTNFOUND_NAME,buffSize - 1); - } - else if(obj->chunkId <= 0) - { + memset(name, 0, buffSize * sizeof(YCHAR)); + + if (obj->objectId == YAFFS_OBJECTID_LOSTNFOUND) { + yaffs_strncpy(name, YAFFS_LOSTNFOUND_NAME, buffSize - 1); + } else if (obj->chunkId <= 0) { YCHAR locName[20]; - // make up a name - yaffs_sprintf(locName,_Y("%s%d"),YAFFS_LOSTNFOUND_PREFIX,obj->objectId); - yaffs_strncpy(name,locName,buffSize - 1); + /* make up a name */ + yaffs_sprintf(locName, _Y("%s%d"), YAFFS_LOSTNFOUND_PREFIX, + obj->objectId); + 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_strcpy(name, obj->shortName); } #endif - else - { - __u8 *buffer = yaffs_GetTempBuffer(obj->myDev,__LINE__); - - yaffs_ObjectHeader *oh = (yaffs_ObjectHeader *)buffer; - - memset(buffer,0,obj->myDev->nBytesPerChunk); - - if(obj->chunkId >= 0) - { - yaffs_ReadChunkWithTagsFromNAND(obj->myDev,obj->chunkId,buffer,NULL); + else { + __u8 *buffer = yaffs_GetTempBuffer(obj->myDev, __LINE__); + + yaffs_ObjectHeader *oh = (yaffs_ObjectHeader *) buffer; + + memset(buffer, 0, obj->myDev->nBytesPerChunk); + + if (obj->chunkId >= 0) { + yaffs_ReadChunkWithTagsFromNAND(obj->myDev, + obj->chunkId, buffer, + NULL); } - yaffs_strncpy(name,oh->name,buffSize - 1); - - yaffs_ReleaseTempBuffer(obj->myDev,buffer,__LINE__); - } - + yaffs_strncpy(name, oh->name, buffSize - 1); + + yaffs_ReleaseTempBuffer(obj->myDev, buffer, __LINE__); + } + return yaffs_strlen(name); } -int yaffs_GetObjectFileLength(yaffs_Object *obj) +int yaffs_GetObjectFileLength(yaffs_Object * obj) { - - // Dereference any hard linking + + /* 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) - { + if (obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK) { return yaffs_strlen(obj->variant.symLinkVariant.alias); - } - else - { - // Only a directory should drop through to here + } else { + /* Only a directory should drop through to here */ return obj->myDev->nBytesPerChunk; - } + } } -int yaffs_GetObjectLinkCount(yaffs_Object *obj) +int yaffs_GetObjectLinkCount(yaffs_Object * obj) { - int count = 0; + int count = 0; struct list_head *i; - - if(!obj->unlinked) - { - count++; // the object itself - } - list_for_each(i,&obj->hardLinks) - { - count++; // add the hard links; + + if (!obj->unlinked) { + count++; /* the object itself */ + } + list_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); - - switch(obj->variantType) - { - case YAFFS_OBJECT_TYPE_FILE: return DT_REG; break; - case YAFFS_OBJECT_TYPE_DIRECTORY: return DT_DIR; break; - case YAFFS_OBJECT_TYPE_SYMLINK: return DT_LNK; break; - case YAFFS_OBJECT_TYPE_HARDLINK: return DT_REG; break; - case YAFFS_OBJECT_TYPE_SPECIAL: - if(S_ISFIFO(obj->yst_mode)) return DT_FIFO; - if(S_ISCHR(obj->yst_mode)) return DT_CHR; - if(S_ISBLK(obj->yst_mode)) return DT_BLK; - if(S_ISSOCK(obj->yst_mode)) return DT_SOCK; - default: return DT_REG; break; + + switch (obj->variantType) { + case YAFFS_OBJECT_TYPE_FILE: + return DT_REG; + break; + case YAFFS_OBJECT_TYPE_DIRECTORY: + return DT_DIR; + break; + case YAFFS_OBJECT_TYPE_SYMLINK: + return DT_LNK; + break; + case YAFFS_OBJECT_TYPE_HARDLINK: + return DT_REG; + break; + case YAFFS_OBJECT_TYPE_SPECIAL: + if (S_ISFIFO(obj->yst_mode)) + return DT_FIFO; + if (S_ISCHR(obj->yst_mode)) + return DT_CHR; + if (S_ISBLK(obj->yst_mode)) + return DT_BLK; + if (S_ISSOCK(obj->yst_mode)) + return DT_SOCK; + default: + return DT_REG; + break; } } -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; - - if(valid & ATTR_MODE) obj->yst_mode = attr->ia_mode; - if(valid & ATTR_UID) obj->yst_uid = attr->ia_uid; - if(valid & ATTR_GID) obj->yst_gid = attr->ia_gid; - - if(valid & ATTR_ATIME) obj->yst_atime = Y_TIME_CONVERT(attr->ia_atime); - if(valid & ATTR_CTIME) obj->yst_ctime = Y_TIME_CONVERT(attr->ia_ctime); - if(valid & ATTR_MTIME) obj->yst_mtime = Y_TIME_CONVERT(attr->ia_mtime); - - if(valid & ATTR_SIZE) yaffs_ResizeFile(obj,attr->ia_size); - - yaffs_UpdateObjectHeader(obj,NULL,1,0,0); - + + if (valid & ATTR_MODE) + obj->yst_mode = attr->ia_mode; + if (valid & ATTR_UID) + obj->yst_uid = attr->ia_uid; + if (valid & ATTR_GID) + obj->yst_gid = attr->ia_gid; + + if (valid & ATTR_ATIME) + obj->yst_atime = Y_TIME_CONVERT(attr->ia_atime); + if (valid & ATTR_CTIME) + obj->yst_ctime = Y_TIME_CONVERT(attr->ia_ctime); + if (valid & ATTR_MTIME) + obj->yst_mtime = Y_TIME_CONVERT(attr->ia_mtime); + + if (valid & ATTR_SIZE) + yaffs_ResizeFile(obj, attr->ia_size); + + yaffs_UpdateObjectHeader(obj, NULL, 1, 0, 0); + 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; - - attr->ia_mode = obj->yst_mode; valid |= ATTR_MODE; - attr->ia_uid = obj->yst_uid; valid |= ATTR_UID; - attr->ia_gid = obj->yst_gid; valid |= ATTR_GID; - - Y_TIME_CONVERT(attr->ia_atime)= obj->yst_atime; valid |= ATTR_ATIME; - Y_TIME_CONVERT(attr->ia_ctime) = obj->yst_ctime; valid |= ATTR_CTIME; - Y_TIME_CONVERT(attr->ia_mtime) = obj->yst_mtime; valid |= ATTR_MTIME; - - attr->ia_size = yaffs_GetFileSize(obj); valid |= ATTR_SIZE; - + + attr->ia_mode = obj->yst_mode; + valid |= ATTR_MODE; + attr->ia_uid = obj->yst_uid; + valid |= ATTR_UID; + attr->ia_gid = obj->yst_gid; + valid |= ATTR_GID; + + Y_TIME_CONVERT(attr->ia_atime) = obj->yst_atime; + valid |= ATTR_ATIME; + Y_TIME_CONVERT(attr->ia_ctime) = obj->yst_ctime; + valid |= ATTR_CTIME; + Y_TIME_CONVERT(attr->ia_mtime) = obj->yst_mtime; + valid |= ATTR_MTIME; + + attr->ia_size = yaffs_GetFileSize(obj); + valid |= ATTR_SIZE; + attr->ia_valid = valid; - + return YAFFS_OK; - + } #endif -int yaffs_DumpObject(yaffs_Object *obj) +#if 0 +int yaffs_DumpObject(yaffs_Object * obj) { -// __u8 buffer[YAFFS_BYTES_PER_CHUNK]; YCHAR name[257]; -// yaffs_ObjectHeader *oh = (yaffs_ObjectHeader *)buffer; - -// memset(buffer,0,YAFFS_BYTES_PER_CHUNK); - -// if(obj->chunkId >= 0) -// { -// yaffs_ReadChunkFromNAND(obj->myDev,obj->chunkId,buffer,NULL); -// } - - yaffs_GetObjectName(obj,name,256); - - T(YAFFS_TRACE_ALWAYS,(TSTR("Object %d, inode %d \"%s\"\n dirty %d valid %d serial %d sum %d chunk %d type %d size %d\n" TENDSTR), - obj->objectId,yaffs_GetObjectInode(obj), name, obj->dirty, obj->valid, obj->serial, - obj->sum, obj->chunkId, yaffs_GetObjectType(obj), yaffs_GetObjectFileLength(obj))); - - - + + yaffs_GetObjectName(obj, name, 256); + + T(YAFFS_TRACE_ALWAYS, + (TSTR + ("Object %d, inode %d \"%s\"\n dirty %d valid %d serial %d sum %d" + " chunk %d type %d size %d\n" + TENDSTR), obj->objectId, yaffs_GetObjectInode(obj), name, + obj->dirty, obj->valid, obj->serial, obj->sum, obj->chunkId, + yaffs_GetObjectType(obj), yaffs_GetObjectFileLength(obj))); + return YAFFS_OK; } - - -///////////////////////// Initialisation code /////////////////////////// - - -static int yaffs_CheckDevFunctions(const yaffs_Device *dev) +#endif + +/*---------------------------- Initialisation code -------------------------------------- */ + +static int yaffs_CheckDevFunctions(const yaffs_Device * dev) { - // Common functions, gotta have - if(!dev->eraseBlockInNAND || - !dev->initialiseNAND) return 0; + /* Common functions, gotta have */ + if (!dev->eraseBlockInNAND || !dev->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) return 1; + /* Can use the "with tags" style interface for yaffs1 or yaffs2 */ + if (dev->writeChunkWithTagsToNAND && + dev->readChunkWithTagsFromNAND && + !dev->writeChunkToNAND && + !dev->readChunkFromNAND && + dev->markNANDBlockBad && dev->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) return 1; - - return 0; // bad + /* Can use the "spare" style interface for yaffs1 */ + if (!dev->isYaffs2 && + !dev->writeChunkWithTagsToNAND && + !dev->readChunkWithTagsFromNAND && + dev->writeChunkToNAND && + dev->readChunkFromNAND && + !dev->markNANDBlockBad && !dev->queryNANDBlock) + return 1; + + return 0; /* bad */ } - -int yaffs_GutsInitialise(yaffs_Device *dev) +int yaffs_GutsInitialise(yaffs_Device * dev) { unsigned x; int bits; int extraBits; int nBlocks; - T(YAFFS_TRACE_ALWAYS,(TSTR("yaffs: yaffs_GutsInitialise()" TENDSTR))); - // Check stuff that must be set - - if(!dev) - { - T(YAFFS_TRACE_ALWAYS,(TSTR("yaffs: Need a device" TENDSTR))); + T(YAFFS_TRACE_ALWAYS, (TSTR("yaffs: yaffs_GutsInitialise()" TENDSTR))); + + /* Check stuff that must be set */ + + if (!dev) { + T(YAFFS_TRACE_ALWAYS, (TSTR("yaffs: Need a device" TENDSTR))); return YAFFS_FAIL; } - + dev->internalStartBlock = dev->startBlock; - dev->internalEndBlock = dev->endBlock; + dev->internalEndBlock = dev->endBlock; dev->blockOffset = 0; dev->chunkOffset = 0; dev->nFreeChunks = 0; - - if(dev->startBlock == 0) - { + + if (dev->startBlock == 0) { dev->internalStartBlock = dev->startBlock + 1; - dev->internalEndBlock = dev->endBlock + 1; + dev->internalEndBlock = dev->endBlock + 1; dev->blockOffset = 1; dev->chunkOffset = dev->nChunksPerBlock; } - // Check geometry parameters. - - if( (dev->isYaffs2 && dev->nBytesPerChunk <1024) || - (!dev->isYaffs2 && dev->nBytesPerChunk !=512) || - dev->nChunksPerBlock < 2 || - dev->nReservedBlocks < 2 || - dev->internalStartBlock <= 0 || - dev->internalEndBlock <= 0 || - dev->internalEndBlock <= (dev->internalStartBlock + dev->nReservedBlocks + 2) // otherwise it is too small - ) - { - T(YAFFS_TRACE_ALWAYS,(TSTR("yaffs: NAND geometry problems: chunk size %d, type is yaffs%s " TENDSTR), - dev->nBytesPerChunk, dev->isYaffs2 ? "2" : "")); + /* Check geometry parameters. */ + + if ((dev->isYaffs2 && dev->nBytesPerChunk < 1024) || (!dev->isYaffs2 && dev->nBytesPerChunk != 512) || dev->nChunksPerBlock < 2 || dev->nReservedBlocks < 2 || dev->internalStartBlock <= 0 || dev->internalEndBlock <= 0 || dev->internalEndBlock <= (dev->internalStartBlock + dev->nReservedBlocks + 2) // otherwise it is too small + ) { + T(YAFFS_TRACE_ALWAYS, + (TSTR + ("yaffs: NAND geometry problems: chunk size %d, type is yaffs%s " + TENDSTR), dev->nBytesPerChunk, dev->isYaffs2 ? "2" : "")); return YAFFS_FAIL; } - if(yaffs_InitialiseNAND(dev) != YAFFS_OK) - { - T(YAFFS_TRACE_ALWAYS,(TSTR("yaffs: InitialiseNAND failed" TENDSTR))); + if (yaffs_InitialiseNAND(dev) != YAFFS_OK) { + T(YAFFS_TRACE_ALWAYS, + (TSTR("yaffs: InitialiseNAND failed" TENDSTR))); return YAFFS_FAIL; } - // Got the right mix of functions? - // - if(!yaffs_CheckDevFunctions(dev)) - { - //Function missing - T(YAFFS_TRACE_ALWAYS,(TSTR("yaffs: device function(s) missing or wrong\n" TENDSTR))); + /* Got the right mix of functions? */ + if (!yaffs_CheckDevFunctions(dev)) { + /* Function missing */ + T(YAFFS_TRACE_ALWAYS, + (TSTR + ("yaffs: device function(s) missing or wrong\n" TENDSTR))); return YAFFS_FAIL; } - // This is really a compilation check. - if(!yaffs_CheckStructures()) - { - T(YAFFS_TRACE_ALWAYS,(TSTR("yaffs_CheckStructures failed\n" TENDSTR))); + /* This is really a compilation check. */ + if (!yaffs_CheckStructures()) { + T(YAFFS_TRACE_ALWAYS, + (TSTR("yaffs_CheckStructures failed\n" TENDSTR))); return YAFFS_FAIL; } - if(dev->isMounted) - { - T(YAFFS_TRACE_ALWAYS,(TSTR("yaffs: device already mounted\n" TENDSTR))); + if (dev->isMounted) { + T(YAFFS_TRACE_ALWAYS, + (TSTR("yaffs: device already mounted\n" TENDSTR))); return YAFFS_FAIL; } - // - // - // Finished with most checks. One or two more checks happen later on too. - // + /* Finished with most checks. One or two more checks happen later on too. */ dev->isMounted = 1; - nBlocks = dev->internalEndBlock - dev->internalStartBlock + 1; - - - // OK now calculate a few things for the device - // Calculate chunkGroupBits. - // We need to find the next power of 2 > than internalEndBlock - - x = dev->nChunksPerBlock * (dev->internalEndBlock+1); - - for(bits = extraBits = 0; x > 1; bits++) - { - if(x & 1) extraBits++; + /* OK now calculate a few things for the device + * Calculate chunkGroupBits. + * We need to find the next power of 2 > than internalEndBlock + */ + + x = dev->nChunksPerBlock * (dev->internalEndBlock + 1); + + for (bits = extraBits = 0; x > 1; bits++) { + if (x & 1) + extraBits++; x >>= 1; } - if(extraBits > 0) bits++; - - - // Level0 Tnodes are 16 bits, 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 <= 16) - { + if (extraBits > 0) + bits++; + + /* Level0 Tnodes are 16 bits, 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 <= 16) { dev->chunkGroupBits = 0; - } - else - { + } else { dev->chunkGroupBits = bits - 16; } - + dev->chunkGroupSize = 1 << dev->chunkGroupBits; - if(dev->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". - T(YAFFS_TRACE_ALWAYS,(TSTR("yaffs: chunk group too large\n" TENDSTR))); - + if (dev->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". + */ + T(YAFFS_TRACE_ALWAYS, + (TSTR("yaffs: chunk group too large\n" TENDSTR))); + return YAFFS_FAIL; } - - // OK, we've finished verifying the device, lets continue with initialisation - - // More device initialisation + /* OK, we've finished verifying the device, lets continue with initialisation */ + + /* More device initialisation */ dev->garbageCollections = 0; dev->passiveGarbageCollections = 0; dev->currentDirtyChecker = 0; dev->bufferedBlock = -1; dev->doingBufferedBlockRewrite = 0; dev->nDeletedFiles = 0; - dev->nBackgroundDeletions=0; + dev->nBackgroundDeletions = 0; dev->nUnlinkedFiles = 0; - dev->eccFixed=0; - dev->eccUnfixed=0; - dev->tagsEccFixed=0; - dev->tagsEccUnfixed=0; + dev->eccFixed = 0; + dev->eccUnfixed = 0; + dev->tagsEccFixed = 0; + dev->tagsEccUnfixed = 0; dev->nErasureFailures = 0; dev->nErasedBlocks = 0; dev->isDoingGC = 0; - - //dev->localBuffer = YMALLOC(dev->nBytesPerChunk); - // Initialise temporary buffers + + /* Initialise temporary buffers */ { int i; - for(i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) - { - dev->tempBuffer[i].line = 0; // not in use - dev->tempBuffer[i].buffer = YMALLOC(dev->nBytesPerChunk); + for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) { + dev->tempBuffer[i].line = 0; /* not in use */ + dev->tempBuffer[i].buffer = + YMALLOC(dev->nBytesPerChunk); } } - - - - yaffs_InitialiseBlocks(dev,nBlocks); - + + yaffs_InitialiseBlocks(dev, nBlocks); + yaffs_InitialiseTnodes(dev); yaffs_InitialiseObjects(dev); - + dev->gcCleanupList = YMALLOC(dev->nChunksPerBlock * sizeof(__u32)); - - if(dev->nShortOpCaches > 0) - { + + if (dev->nShortOpCaches > 0) { int i; - - if(dev->nShortOpCaches > YAFFS_MAX_SHORT_OP_CACHES) - { + + if (dev->nShortOpCaches > YAFFS_MAX_SHORT_OP_CACHES) { dev->nShortOpCaches = YAFFS_MAX_SHORT_OP_CACHES; } - - dev->srCache = YMALLOC( dev->nShortOpCaches * sizeof(yaffs_ChunkCache)); - - for(i=0; i < dev->nShortOpCaches; i++) - { + + dev->srCache = + YMALLOC(dev->nShortOpCaches * sizeof(yaffs_ChunkCache)); + + for (i = 0; i < dev->nShortOpCaches; i++) { dev->srCache[i].object = NULL; dev->srCache[i].lastUse = 0; dev->srCache[i].dirty = 0; @@ -5575,60 +5461,62 @@ int yaffs_GutsInitialise(yaffs_Device *d } dev->cacheHits = 0; - - - // Initialise the unlinked, root and lost and found directories - dev->lostNFoundDir = dev->rootDir = 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); - - dev->rootDir = yaffs_CreateFakeDirectory(dev,YAFFS_OBJECTID_ROOT,YAFFS_ROOT_MODE | S_IFDIR); - dev->lostNFoundDir = yaffs_CreateFakeDirectory(dev,YAFFS_OBJECTID_LOSTNFOUND,YAFFS_LOSTNFOUND_MODE | S_IFDIR); - yaffs_AddObjectToDirectory(dev->rootDir,dev->lostNFoundDir); - - if(dev->isYaffs2) - { + + /* Initialise the unlinked, 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); + + dev->rootDir = + yaffs_CreateFakeDirectory(dev, YAFFS_OBJECTID_ROOT, + YAFFS_ROOT_MODE | S_IFDIR); + dev->lostNFoundDir = + yaffs_CreateFakeDirectory(dev, YAFFS_OBJECTID_LOSTNFOUND, + YAFFS_LOSTNFOUND_MODE | S_IFDIR); + yaffs_AddObjectToDirectory(dev->rootDir, dev->lostNFoundDir); + + if (dev->isYaffs2) { dev->useHeaderFileSize = 1; } - - // Now scan the flash. - - if(dev->isYaffs2) + + /* Now scan the flash. */ + if (dev->isYaffs2) yaffs_ScanBackwards(dev); else yaffs_Scan(dev); - - // Zero out stats + + /* Zero out stats */ dev->nPageReads = 0; - dev->nPageWrites = 0; + dev->nPageWrites = 0; dev->nBlockErasures = 0; dev->nGCCopies = 0; dev->nRetriedWrites = 0; dev->nRetiredBlocks = 0; - + yaffs_VerifyFreeChunks(dev); - T(YAFFS_TRACE_ALWAYS,(TSTR("yaffs: yaffs_GutsInitialise() done.\n" TENDSTR))); + T(YAFFS_TRACE_ALWAYS, + (TSTR("yaffs: yaffs_GutsInitialise() done.\n" TENDSTR))); return YAFFS_OK; - + } -void yaffs_Deinitialise(yaffs_Device *dev) +void yaffs_Deinitialise(yaffs_Device * dev) { - if(dev->isMounted) - { + if (dev->isMounted) { int i; - + yaffs_DeinitialiseBlocks(dev); yaffs_DeinitialiseTnodes(dev); yaffs_DeinitialiseObjects(dev); - if(dev->nShortOpCaches > 0) - { - - for(i=0; i < dev->nShortOpCaches; i++) - { + if (dev->nShortOpCaches > 0) { + + for (i = 0; i < dev->nShortOpCaches; i++) { YFREE(dev->srCache[i].data); } @@ -5637,117 +5525,113 @@ void yaffs_Deinitialise(yaffs_Device *de 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; } - + } - -static int yaffs_CountFreeChunks(yaffs_Device *dev) +static int yaffs_CountFreeChunks(yaffs_Device * dev) { int nFree; int b; - yaffs_BlockInfo *blk; - - - for(nFree = 0, b = dev->internalStartBlock; b <= dev->internalEndBlock; b++) - { - blk = yaffs_GetBlockInfo(dev,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 + blk->softDeletions); break; - default: break; + yaffs_BlockInfo *blk; + + for (nFree = 0, b = dev->internalStartBlock; b <= dev->internalEndBlock; + b++) { + blk = yaffs_GetBlockInfo(dev, 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 + + blk->softDeletions); + break; + default: + break; } } - + return nFree; -} - - - -int yaffs_GetNumberOfFreeChunks(yaffs_Device *dev) +} + +int yaffs_GetNumberOfFreeChunks(yaffs_Device * dev) { - // This is what we report to the outside world + /* This is what we report to the outside world */ int nFree; int nDirtyCacheChunks; - -#if 1 + +#if 1 nFree = dev->nFreeChunks; #else nFree = yaffs_CountFreeChunks(dev); #endif - - // Now count the number of dirty chunks in the cache and subtract those - + + /* 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->nShortOpCaches; i++) { + if (dev->srCache[i].dirty) + nDirtyCacheChunks++; } } - + nFree -= nDirtyCacheChunks; - + nFree -= ((dev->nReservedBlocks + 1) * dev->nChunksPerBlock); - - if(nFree < 0) nFree = 0; - - return nFree; - + + if (nFree < 0) + nFree = 0; + + return nFree; + } -static int yaffs_freeVerificationFailures; - -static void yaffs_VerifyFreeChunks(yaffs_Device *dev) +static int yaffs_freeVerificationFailures; + +static void yaffs_VerifyFreeChunks(yaffs_Device * dev) { int counted = yaffs_CountFreeChunks(dev); - + int difference = dev->nFreeChunks - counted; - - if(difference) - { - T(YAFFS_TRACE_ALWAYS,(TSTR("Freechunks verification failure %d %d %d" TENDSTR),dev->nFreeChunks,counted,difference)); - yaffs_freeVerificationFailures++; + + if (difference) { + T(YAFFS_TRACE_ALWAYS, + (TSTR("Freechunks verification failure %d %d %d" TENDSTR), + dev->nFreeChunks, counted, difference)); + yaffs_freeVerificationFailures++; } } -/////////////////// YAFFS test code ////////////////////////////////// +/*---------------------------------------- YAFFS test code ----------------------*/ #define yaffs_CheckStruct(structure,syze, name) \ if(sizeof(structure) != syze) \ { \ - T(YAFFS_TRACE_ALWAYS,(TSTR("%s should be %d but is %d\n" TENDSTR),name,syze,sizeof(structure))); \ + T(YAFFS_TRACE_ALWAYS,(TSTR("%s should be %d but is %d\n" TENDSTR),\ + name,syze,sizeof(structure))); \ return YAFFS_FAIL; \ - } - - + } + static int yaffs_CheckStructures(void) { -// yaffs_CheckStruct(yaffs_Tags,8,"yaffs_Tags") -// yaffs_CheckStruct(yaffs_TagsUnion,8,"yaffs_TagsUnion") -// yaffs_CheckStruct(yaffs_Spare,16,"yaffs_Spare") +/* yaffs_CheckStruct(yaffs_Tags,8,"yaffs_Tags") */ +/* 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 - yaffs_CheckStruct(yaffs_ObjectHeader,512,"yaffs_ObjectHeader") - - - return YAFFS_OK; + yaffs_CheckStruct(yaffs_ObjectHeader, 512, "yaffs_ObjectHeader") + + return YAFFS_OK; } - - - -