X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs%2F.git;a=blobdiff_plain;f=yaffs_guts.c;h=fcb217ae850f3b4d98fc85abccac0c7a43684b26;hp=66014bb3f449d95b5a94aec02ff026c17c622c0c;hb=f0494eb05c40ce19d74bedc92a020a743fbec08e;hpb=54a94b218fce5de9c076266fc34c9de5bfcd656b diff --git a/yaffs_guts.c b/yaffs_guts.c index 66014bb..fcb217a 100644 --- a/yaffs_guts.c +++ b/yaffs_guts.c @@ -14,27 +14,30 @@ */ //yaffs_guts.c +const char *yaffs_guts_c_version="$Id: yaffs_guts.c,v 1.44 2005-11-07 07:03:02 charles Exp $"; + #include "yportenv.h" #include "yaffsinterface.h" #include "yaffs_guts.h" +#define YAFFS_PASSIVE_GC_CHUNKS 2 #if 0 -#define T(x) printf x -#else -#define T(x) -#endif - +// Use Steven Hill's ECC struff instead // External functions for ECC on data void nand_calculate_ecc (const u_char *dat, u_char *ecc_code); int nand_correct_data (u_char *dat, u_char *read_ecc, u_char *calc_ecc); - +#define yaffs_ECCCalculate(data,ecc) nand_calculate_ecc(data,ecc) +#define yaffs_ECCCorrect(data,read_ecc,calc_ecc) nand_correct_ecc(data,read_ecc,calc_ecc) +#else +#include "yaffs_ecc.h" +#endif // countBits is a quick way of counting the number of bits in a byte. // ie. countBits[n] holds the number of 1 bits in a byte with the value n. -static const char yaffs_countBits[256] = +static const char yaffs_countBitsTable[256] = { 0,1,1,2,1,2,2,3,1,2,2,3,2,3,3,4, 1,2,2,3,2,3,3,4,2,3,3,4,3,4,4,5, @@ -54,41 +57,129 @@ static const char yaffs_countBits[256] = 4,5,5,6,5,6,6,7,5,6,6,7,6,7,7,8 }; - - -// Device info -//static yaffs_Device *yaffs_device; -//yaffs_Object *yaffs_rootDir; -//yaffs_Object *yaffs_lostNFound; +static int yaffs_CountBits(__u8 x) +{ + int retVal; + retVal = yaffs_countBitsTable[x]; + return retVal; +} // Local prototypes static int yaffs_CheckObjectHashSanity(yaffs_Device *dev); static void yaffs_LoadTagsIntoSpare(yaffs_Spare *sparePtr, yaffs_Tags *tagsPtr); -static void yaffs_GetTagsFromSpare(yaffs_Spare *sparePtr,yaffs_Tags *tagsPtr); +static void yaffs_GetTagsFromSpare(yaffs_Device *dev, yaffs_Spare *sparePtr,yaffs_Tags *tagsPtr); 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 char *name); -static void yaffs_DeleteChunk(yaffs_Device *dev,int chunkId); +static int yaffs_UpdateObjectHeader(yaffs_Object *in,const char *name, int force); +static void yaffs_DeleteChunk(yaffs_Device *dev,int chunkId,int markNAND); static void yaffs_RemoveObjectFromDirectory(yaffs_Object *obj); static int yaffs_CheckStructures(void); -static yaffs_Object *yaffs_GetEquivalentObject(yaffs_Object *obj); +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); + +// Robustification +static void yaffs_RetireBlock(yaffs_Device *dev,int blockInNAND); +static void yaffs_HandleReadDataError(yaffs_Device *dev,int chunkInNAND); +static void yaffs_HandleWriteChunkError(yaffs_Device *dev,int chunkInNAND); +static void yaffs_HandleWriteChunkOk(yaffs_Device *dev,int chunkInNAND,const __u8 *data, const yaffs_Spare *spare); +static void yaffs_HandleUpdateChunk(yaffs_Device *dev,int chunkInNAND, const yaffs_Spare *spare); + +static int yaffs_CheckChunkErased(struct yaffs_DeviceStruct *dev,int chunkInNAND); + +static int yaffs_UnlinkWorker(yaffs_Object *obj); +static void yaffs_AbortHalfCreatedObject(yaffs_Object *obj); + +static int yaffs_VerifyCompare(const __u8 *d0, const __u8 * d1, const yaffs_Spare *s0, const yaffs_Spare *s1); + + loff_t yaffs_GetFileSize(yaffs_Object *obj); +static int yaffs_ReadChunkTagsFromNAND(yaffs_Device *dev,int chunkInNAND, yaffs_Tags *tags, int *chunkDeleted); +static int yaffs_TagsMatch(const yaffs_Tags *tags, int objectId, int chunkInObject, int chunkDeleted); + static int yaffs_AllocateChunk(yaffs_Device *dev,int useReserve); -#if YAFFS_PARANOID -static int yaffs_CheckFileSanity(yaffs_Object *in) +#ifdef YAFFS_PARANOID +static int yaffs_CheckFileSanity(yaffs_Object *in); #else #define yaffs_CheckFileSanity(in) #endif -static int __inline__ yaffs_HashFunction(int n) +static void yaffs_InvalidateWholeChunkCache(yaffs_Object *in); +static void yaffs_InvalidateChunkCache(yaffs_Object *object, int chunkId); + +// Chunk bitmap manipulations + +static __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)); + YBUG(); + } + return dev->chunkBits + (dev->chunkBitmapStride * (blk - dev->internalStartBlock)); +} + +static __inline__ void yaffs_ClearChunkBits(yaffs_Device *dev,int blk) +{ + __u8 *blkBits = yaffs_BlockBits(dev,blk); + + memset(blkBits,0,dev->chunkBitmapStride); +} + +static __inline__ void yaffs_ClearChunkBit(yaffs_Device *dev,int blk,int chunk) +{ + __u8 *blkBits = yaffs_BlockBits(dev,blk); + + blkBits[chunk/8] &= ~ (1<<(chunk & 7)); +} + +static __inline__ void yaffs_SetChunkBit(yaffs_Device *dev,int blk,int chunk) +{ + __u8 *blkBits = yaffs_BlockBits(dev,blk); + + blkBits[chunk/8] |= (1<<(chunk & 7)); +} + +static __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; +} + +static __inline__ int yaffs_StillSomeChunkBits(yaffs_Device *dev,int blk) +{ + __u8 *blkBits = yaffs_BlockBits(dev,blk); + int i; + for(i = 0; i < dev->chunkBitmapStride; i++) + { + if(*blkBits) return 1; + blkBits++; + } + return 0; +} + +// Function to manipulate block info +static __inline__ yaffs_BlockInfo* yaffs_GetBlockInfo(yaffs_Device *dev, int blk) +{ + if(blk < dev->internalStartBlock || blk > dev->internalEndBlock) + { + T(YAFFS_TRACE_ERROR,(TSTR("**>> yaffs: getBlockInfo block %d is not valid" TENDSTR),blk)); + YBUG(); + } + return &dev->blockInfo[blk - dev->internalStartBlock]; +} + + +static __inline__ int yaffs_HashFunction(int n) { return (n % YAFFS_NOBJECT_BUCKETS); } @@ -107,14 +198,31 @@ yaffs_Object *yaffs_LostNFound(yaffs_Device *dev) static int yaffs_WriteChunkToNAND(struct yaffs_DeviceStruct *dev,int chunkInNAND, const __u8 *data, yaffs_Spare *spare) { - return dev->writeChunkToNAND(dev,chunkInNAND,data,spare); + if(chunkInNAND < dev->internalStartBlock * dev->nChunksPerBlock) + { + T(YAFFS_TRACE_ERROR,(TSTR("**>> yaffs chunk %d is not valid" TENDSTR),chunkInNAND)); + return YAFFS_FAIL; + } + + dev->nPageWrites++; + return dev->writeChunkToNAND(dev,chunkInNAND - dev->chunkOffset,data,spare); } -int yaffs_ReadChunkFromNAND(struct yaffs_DeviceStruct *dev,int chunkInNAND, __u8 *data, yaffs_Spare *spare) + + +int yaffs_ReadChunkFromNAND(struct yaffs_DeviceStruct *dev, + int chunkInNAND, + __u8 *data, + yaffs_Spare *spare, + int doErrorCorrection) { int retVal; - __u8 calcEcc[3]; yaffs_Spare localSpare; + + dev->nPageReads++; + + + if(!spare && data) { @@ -123,22 +231,120 @@ int yaffs_ReadChunkFromNAND(struct yaffs_DeviceStruct *dev,int chunkInNAND, __u8 spare = &localSpare; } - retVal = dev->readChunkFromNAND(dev,chunkInNAND,data,spare); - if(data) + + if(!dev->useNANDECC) + { + retVal = dev->readChunkFromNAND(dev,chunkInNAND - dev->chunkOffset,data,spare); + if(data && doErrorCorrection) + { + // Do ECC correction + //Todo handle any errors + int eccResult1,eccResult2; + __u8 calcEcc[3]; + + yaffs_ECCCalculate(data,calcEcc); + eccResult1 = yaffs_ECCCorrect (data,spare->ecc1, calcEcc); + yaffs_ECCCalculate(&data[256],calcEcc); + eccResult2 = yaffs_ECCCorrect(&data[256],spare->ecc2, calcEcc); + + if(eccResult1>0) + { + T(YAFFS_TRACE_ERROR, (TSTR("**>>ecc error fix performed on chunk %d:0" TENDSTR),chunkInNAND - dev->chunkOffset)); + dev->eccFixed++; + } + else if(eccResult1<0) + { + T(YAFFS_TRACE_ERROR,(TSTR("**>>ecc error unfixed on chunk %d:0" TENDSTR),chunkInNAND - dev->chunkOffset)); + dev->eccUnfixed++; + } + + if(eccResult2>0) + { + T(YAFFS_TRACE_ERROR,(TSTR("**>>ecc error fix performed on chunk %d:1" TENDSTR),chunkInNAND - dev->chunkOffset)); + dev->eccFixed++; + } + else if(eccResult2<0) + { + T(YAFFS_TRACE_ERROR,(TSTR("**>>ecc error unfixed on chunk %d:1" TENDSTR),chunkInNAND - dev->chunkOffset)); + dev->eccUnfixed++; + } + + if(eccResult1 || eccResult2) + { + // Hoosterman, we had a data problem on this page + yaffs_HandleReadDataError(dev,chunkInNAND); + } + } + } + else { - // Do ECC correction - //Todo handle any errors - nand_calculate_ecc(data,calcEcc); - nand_correct_data (data,spare->ecc1, calcEcc); - nand_calculate_ecc(&data[256],calcEcc); - nand_correct_data (&data[256],spare->ecc2, calcEcc); + // Must allocate enough memory for spare+2*sizeof(int) for ecc results from device. + struct yaffs_NANDSpare nspare; + retVal = dev->readChunkFromNAND(dev,chunkInNAND - dev->chunkOffset,data,(yaffs_Spare*)&nspare); + memcpy (spare, &nspare, sizeof(yaffs_Spare)); + if(data && doErrorCorrection) + { + if(nspare.eccres1>0) + { + T(YAFFS_TRACE_ERROR,(TSTR("**>>ecc error fix performed on chunk %d:0" TENDSTR),chunkInNAND - dev->chunkOffset)); + } + else if(nspare.eccres1<0) + { + T(YAFFS_TRACE_ERROR,(TSTR("**>>ecc error unfixed on chunk %d:0" TENDSTR),chunkInNAND - dev->chunkOffset)); + } + + if(nspare.eccres2>0) + { + T(YAFFS_TRACE_ERROR,(TSTR("**>>ecc error fix performed on chunk %d:1" TENDSTR),chunkInNAND - dev->chunkOffset)); + } + else if(nspare.eccres2<0) + { + T(YAFFS_TRACE_ERROR,(TSTR("**>>ecc error unfixed on chunk %d:1" TENDSTR),chunkInNAND - dev->chunkOffset)); + } + + if(nspare.eccres1 || nspare.eccres2) + { + // Hoosterman, we had a data problem on this page + yaffs_HandleReadDataError(dev,chunkInNAND); + } + + } } return retVal; } + +static int yaffs_CheckChunkErased(struct yaffs_DeviceStruct *dev,int chunkInNAND) +{ + + static int init = 0; + static __u8 cmpbuf[YAFFS_BYTES_PER_CHUNK]; + static __u8 data[YAFFS_BYTES_PER_CHUNK]; + // Might as well always allocate the larger size for dev->useNANDECC == true; + static __u8 spare[sizeof(struct yaffs_NANDSpare)]; + + dev->readChunkFromNAND(dev,chunkInNAND - dev->chunkOffset,data,(yaffs_Spare *)spare); + + if(!init) + { + memset(cmpbuf,0xff,YAFFS_BYTES_PER_CHUNK); + init = 1; + } + + if(memcmp(cmpbuf,data,YAFFS_BYTES_PER_CHUNK)) return YAFFS_FAIL; + if(memcmp(cmpbuf,spare,16)) return YAFFS_FAIL; + + + return YAFFS_OK; + +} + + + int yaffs_EraseBlockInNAND(struct yaffs_DeviceStruct *dev,int blockInNAND) { - return dev->eraseBlockInNAND(dev,blockInNAND); + dev->nBlockErasures++; + return dev->eraseBlockInNAND(dev,blockInNAND - dev->blockOffset); } int yaffs_InitialiseNAND(struct yaffs_DeviceStruct *dev) @@ -150,7 +356,8 @@ static int yaffs_WriteNewChunkToNAND(struct yaffs_DeviceStruct *dev, const __u8 { int chunk; - int writeOk = 0; + int writeOk = 1; + int attempts = 0; unsigned char rbData[YAFFS_BYTES_PER_CHUNK]; yaffs_Spare rbSpare; @@ -160,45 +367,169 @@ static int yaffs_WriteNewChunkToNAND(struct yaffs_DeviceStruct *dev, const __u8 if(chunk >= 0) { - writeOk = yaffs_WriteChunkToNAND(dev,chunk,data,spare); + + // 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_WriteChunkToNAND(dev,chunk,data,spare); + } + attempts++; if(writeOk) { // Readback & verify // If verify fails, then delete this chunk and try again // To verify we compare everything except the block and // page status bytes. - yaffs_ReadChunkFromNAND(dev,chunk,rbData,&rbSpare); + // NB We check a raw read without ECC correction applied + yaffs_ReadChunkFromNAND(dev,chunk,rbData,&rbSpare,0); - if(memcmp(data,rbData,YAFFS_BYTES_PER_CHUNK) != 0 || - spare->tagByte0 != rbSpare.tagByte0 || - spare->tagByte1 != rbSpare.tagByte1 || - spare->tagByte2 != rbSpare.tagByte2 || - spare->tagByte3 != rbSpare.tagByte3 || - spare->tagByte4 != rbSpare.tagByte4 || - spare->tagByte5 != rbSpare.tagByte5 || - spare->tagByte6 != rbSpare.tagByte6 || - spare->tagByte7 != rbSpare.tagByte7 || - spare->ecc1[0] != rbSpare.ecc1[0] || - spare->ecc1[1] != rbSpare.ecc1[1] || - spare->ecc1[2] != rbSpare.ecc1[2] || - spare->ecc2[0] != rbSpare.ecc2[0] || - spare->ecc2[1] != rbSpare.ecc2[1] || - spare->ecc2[2] != rbSpare.ecc2[2] ) +#ifndef CONFIG_YAFFS_DISABLE_WRITE_VERIFY + if(!yaffs_VerifyCompare(data,rbData,spare,&rbSpare)) { // Didn't verify - yaffs_DeleteChunk(dev,chunk); + T(YAFFS_TRACE_ERROR,(TSTR("**>> yaffs write verify failed on chunk %d" TENDSTR), chunk)); + writeOk = 0; - } + } +#endif } + if(writeOk) + { + // Copy the data into the write buffer. + // NB We do this at the end to prevent duplicates in the case of a write error. + //Todo + yaffs_HandleWriteChunkOk(dev,chunk,data,spare); + } + 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); + } + return chunk; } +/// +// Functions for robustisizing +// +// + +static void yaffs_RetireBlock(yaffs_Device *dev,int blockInNAND) +{ + // Ding the blockStatus in the first two pages of the block. + + yaffs_Spare spare; + + memset(&spare, 0xff,sizeof(yaffs_Spare)); + + spare.blockStatus = 0; + + // TODO change this retirement marking for other NAND types + yaffs_WriteChunkToNAND(dev, blockInNAND * dev->nChunksPerBlock, NULL , &spare); + yaffs_WriteChunkToNAND(dev, blockInNAND * dev->nChunksPerBlock + 1, NULL , &spare); + + yaffs_GetBlockInfo(dev,blockInNAND)->blockState = YAFFS_BLOCK_STATE_DEAD; + dev->nRetiredBlocks++; +} + + + +static int yaffs_RewriteBufferedBlock(yaffs_Device *dev) +{ + dev->doingBufferedBlockRewrite = 1; + // + // Remove erased chunks + // Rewrite existing chunks to a new block + // Set current write block to the new block + + dev->doingBufferedBlockRewrite = 0; + + return 1; +} + + +static void yaffs_HandleReadDataError(yaffs_Device *dev,int chunkInNAND) +{ + int blockInNAND = chunkInNAND/dev->nChunksPerBlock; + + // Mark the block for retirement + yaffs_GetBlockInfo(dev,blockInNAND)->needsRetiring = 1; + T(YAFFS_TRACE_ERROR | YAFFS_TRACE_BAD_BLOCKS,(TSTR("**>>Block %d marked for retirement" TENDSTR),blockInNAND)); + + + //TODO + // Just do a garbage collection on the affected block then retire the block + // NB recursion +} + + +static void yaffs_CheckWrittenBlock(yaffs_Device *dev,int chunkInNAND) +{ +} + +static void yaffs_HandleWriteChunkOk(yaffs_Device *dev,int chunkInNAND,const __u8 *data, const yaffs_Spare *spare) +{ +} + +static void yaffs_HandleUpdateChunk(yaffs_Device *dev,int chunkInNAND, const yaffs_Spare *spare) +{ +} + +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); +} + + +static int yaffs_VerifyCompare(const __u8 *d0, const __u8 * d1, const yaffs_Spare *s0, const yaffs_Spare *s1) +{ + + + if( memcmp(d0,d1,YAFFS_BYTES_PER_CHUNK) != 0 || + s0->tagByte0 != s1->tagByte0 || + s0->tagByte1 != s1->tagByte1 || + s0->tagByte2 != s1->tagByte2 || + s0->tagByte3 != s1->tagByte3 || + s0->tagByte4 != s1->tagByte4 || + s0->tagByte5 != s1->tagByte5 || + s0->tagByte6 != s1->tagByte6 || + s0->tagByte7 != s1->tagByte7 || + s0->ecc1[0] != s1->ecc1[0] || + s0->ecc1[1] != s1->ecc1[1] || + s0->ecc1[2] != s1->ecc1[2] || + s0->ecc2[0] != s1->ecc2[0] || + s0->ecc2[1] != s1->ecc2[1] || + s0->ecc2[2] != s1->ecc2[2] ) + { + return 0; + } + + return 1; +} + ///////////////////////// Object management ////////////////// // List of spare objects @@ -220,26 +551,48 @@ static __u16 yaffs_CalcNameSum(const char *name) __u16 i = 1; __u8 *bname = (__u8 *)name; - - while (*bname) + if(bname) { - sum += (*bname) * i; - i++; - bname++; + while ((*bname) && (i <=YAFFS_MAX_NAME_LENGTH)) + { + +#ifdef CONFIG_YAFFS_CASE_INSENSITIVE + sum += toupper(*bname) * i; +#else + sum += (*bname) * i; +#endif + i++; + bname++; + } } return sum; } +void yaffs_SetObjectName(yaffs_Object *obj, const char *name) +{ +#ifdef CONFIG_YAFFS_SHORT_NAMES_IN_RAM + if(name && strlen(name) <= YAFFS_SHORT_NAME_LENGTH) + { + strcpy(obj->shortName,name); + } + else + { + obj->shortName[0]='\0'; + } +#endif + obj->sum = yaffs_CalcNameSum(name); +} void yaffs_CalcECC(const __u8 *data, yaffs_Spare *spare) { - nand_calculate_ecc (data , spare->ecc1); - nand_calculate_ecc (&data[256] , spare->ecc2); + yaffs_ECCCalculate(data , spare->ecc1); + yaffs_ECCCalculate(&data[256] , spare->ecc2); } void yaffs_CalcTagsECC(yaffs_Tags *tags) { - // Todo don't do anything yet. Need to calculate ecc + // Calculate an ecc + unsigned char *b = ((yaffs_TagsUnion *)tags)->asBytes; unsigned i,j; unsigned ecc = 0; @@ -249,7 +602,7 @@ void yaffs_CalcTagsECC(yaffs_Tags *tags) for(i = 0; i < 8; i++) { - for(j = 1; j &0x7f; j<<=1) + for(j = 1; j &0xff; j<<=1) { bit++; if(b[i] & j) @@ -264,7 +617,7 @@ void yaffs_CalcTagsECC(yaffs_Tags *tags) } -void yaffs_CheckECCOnTags(yaffs_Tags *tags) +int yaffs_CheckECCOnTags(yaffs_Tags *tags) { unsigned ecc = tags->ecc; @@ -272,9 +625,9 @@ void yaffs_CheckECCOnTags(yaffs_Tags *tags) ecc ^= tags->ecc; - if(ecc) + if(ecc && ecc <= 64) { - // Needs fixing + // TODO: Handle the failure better. Retire? unsigned char *b = ((yaffs_TagsUnion *)tags)->asBytes; ecc--; @@ -283,7 +636,17 @@ void yaffs_CheckECCOnTags(yaffs_Tags *tags) // Now recvalc the ecc yaffs_CalcTagsECC(tags); + + return 1; // recovered error + } + else if(ecc) + { + // Wierd ecc failure value + // TODO Need to do somethiong here + return -1; //unrecovered error } + + return 0; } @@ -319,7 +682,7 @@ static int yaffs_CreateTnodes(yaffs_Device *dev,int nTnodes) if (!newTnodes) { - YALERT("Could not malloc tnodes"); + T(YAFFS_TRACE_ERROR,(TSTR("yaffs: Could not allocate Tnodes"TENDSTR))); return YAFFS_FAIL; } @@ -327,19 +690,27 @@ static int yaffs_CreateTnodes(yaffs_Device *dev,int nTnodes) 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] = 1; +#endif } newTnodes[nTnodes - 1].internal[0] = dev->freeTnodes; +#ifdef CONFIG_YAFFS_TNODE_LIST_DEBUG + newTnodes[nTnodes - 1].internal[YAFFS_NTNODES_INTERNAL] = 1; +#endif dev->freeTnodes = newTnodes; 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. tnl = YMALLOC(sizeof(yaffs_TnodeList)); if(!tnl) { - YALERT("Could not add tnodes to management list"); + T(YAFFS_TRACE_ERROR,(TSTR("yaffs: Could not add tnodes to management list" TENDSTR))); + } else { @@ -349,7 +720,7 @@ static int yaffs_CreateTnodes(yaffs_Device *dev,int nTnodes) } - YINFO("Tnodes created"); + T(YAFFS_TRACE_ALLOCATE,(TSTR("yaffs: Tnodes added" TENDSTR))); return YAFFS_OK; @@ -370,6 +741,13 @@ static yaffs_Tnode *yaffs_GetTnode(yaffs_Device *dev) if(dev->freeTnodes) { tn = dev->freeTnodes; +#ifdef CONFIG_YAFFS_TNODE_LIST_DEBUG + if(tn->internal[YAFFS_NTNODES_INTERNAL] != 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 @@ -384,20 +762,36 @@ static yaffs_Tnode *yaffs_GetTnode(yaffs_Device *dev) // FreeTnode frees up a tnode and puts it back on the free list static void yaffs_FreeTnode(yaffs_Device*dev, yaffs_Tnode *tn) { - tn->internal[0] = dev->freeTnodes; - dev->freeTnodes = tn; - dev->nFreeTnodes++; + 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))); + } + tn->internal[YAFFS_NTNODES_INTERNAL] = 1; +#endif + tn->internal[0] = dev->freeTnodes; + dev->freeTnodes = tn; + dev->nFreeTnodes++; + } } static void yaffs_DeinitialiseTnodes(yaffs_Device*dev) { // Free the list of allocated tnodes - + yaffs_TnodeList *tmp; + while(dev->allocatedTnodeList) { + tmp = dev->allocatedTnodeList->next; + YFREE(dev->allocatedTnodeList->tnodes); - dev->allocatedTnodeList = dev->allocatedTnodeList->next; + YFREE(dev->allocatedTnodeList); + dev->allocatedTnodeList = tmp; + } dev->freeTnodes = NULL; @@ -413,6 +807,7 @@ static void yaffs_InitialiseTnodes(yaffs_Device*dev) } +#if 0 void yaffs_TnodeTest(yaffs_Device *dev) { @@ -440,6 +835,8 @@ void yaffs_TnodeTest(yaffs_Device *dev) } } +#endif + ////////////////// END OF TNODE MANIPULATION /////////////////////////// @@ -461,22 +858,23 @@ static yaffs_Tnode *yaffs_FindLevel0Tnode(yaffs_Device *dev,yaffs_FileStructure // 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); +// char str[50]; +// sprintf(str,"Bad level %d",level); +// YALERT(str); return NULL; } + if(chunkId > YAFFS_MAX_CHUNK_ID) { - char str[50]; - sprintf(str,"Bad chunkId %d",chunkId); - YALERT(str); +// char str[50]; +// sprintf(str,"Bad chunkId %d",chunkId); +// YALERT(str); return NULL; } // First check we're tall enough (ie enough topLevel) - i = chunkId >> (dev->chunkGroupBits + YAFFS_TNODES_LEVEL0_BITS); + i = chunkId >> (/*dev->chunkGroupBits + */YAFFS_TNODES_LEVEL0_BITS); requiredTallness = 0; while(i) { @@ -495,7 +893,7 @@ static yaffs_Tnode *yaffs_FindLevel0Tnode(yaffs_Device *dev,yaffs_FileStructure // 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)) & + tn = tn->internal[(chunkId >>(/* dev->chunkGroupBits + */ YAFFS_TNODES_LEVEL0_BITS + (level-1) * YAFFS_TNODES_INTERNAL_BITS)) & YAFFS_TNODES_INTERNAL_MASK]; level--; @@ -517,41 +915,42 @@ static yaffs_Tnode *yaffs_AddOrFindLevel0Tnode(yaffs_Device *dev, yaffs_FileStru yaffs_Tnode *tn; int requiredTallness; + int i; + int l; - __u32 i; - __u32 l; - + __u32 x; + - T(("AddOrFind topLevel=%d, chunk=%d",fStruct->topLevel,chunkId)); + //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); +// char str[50]; +// sprintf(str,"Bad level %d",fStruct->topLevel); +// YALERT(str); return NULL; } if(chunkId > YAFFS_MAX_CHUNK_ID) { - char str[50]; - sprintf(str,"Bad chunkId %d",chunkId); - YALERT(str); +// char str[50]; +// sprintf(str,"Bad chunkId %d",chunkId); +// YALERT(str); return NULL; } // First check we're tall enough (ie enough topLevel) - i = chunkId >> (dev->chunkGroupBits + YAFFS_TNODES_LEVEL0_BITS); + x = chunkId >> (/*dev->chunkGroupBits + */YAFFS_TNODES_LEVEL0_BITS); requiredTallness = 0; - while(i) + while(x) { - i >>= YAFFS_TNODES_INTERNAL_BITS; + x >>= YAFFS_TNODES_INTERNAL_BITS; requiredTallness++; } - T((" required=%d",requiredTallness)); + //T((TSTR(" required=%d"),requiredTallness)); if(requiredTallness > fStruct->topLevel) @@ -559,7 +958,7 @@ static yaffs_Tnode *yaffs_AddOrFindLevel0Tnode(yaffs_Device *dev, yaffs_FileStru // Not tall enough,gotta make the tree taller for(i = fStruct->topLevel; i < requiredTallness; i++) { - T((" add new top")); + //T((TSTR(" add new top"))); tn = yaffs_GetTnode(dev); @@ -570,7 +969,7 @@ static yaffs_Tnode *yaffs_AddOrFindLevel0Tnode(yaffs_Device *dev, yaffs_FileStru } else { - YALERT("No more tnodes"); + T(YAFFS_TRACE_ERROR,(TSTR("yaffs: no more tnodes" TENDSTR))); } } @@ -584,59 +983,263 @@ static yaffs_Tnode *yaffs_AddOrFindLevel0Tnode(yaffs_Device *dev, yaffs_FileStru tn = fStruct->top; while (l > 0 && tn) { - i = (chunkId >> (dev->chunkGroupBits +YAFFS_TNODES_LEVEL0_BITS + (l-1) * YAFFS_TNODES_INTERNAL_BITS)) & + x = (chunkId >> (/*dev->chunkGroupBits + */YAFFS_TNODES_LEVEL0_BITS + (l-1) * YAFFS_TNODES_INTERNAL_BITS)) & YAFFS_TNODES_INTERNAL_MASK; - T((" [%d:%d]",l,i)); + //T((TSTR(" [%d:%d]"),l,i)); - if(!tn->internal[i]) + if(!tn->internal[x]) { - T((" added")); + //T((TSTR(" added"))); - tn->internal[i] = yaffs_GetTnode(dev); + tn->internal[x] = yaffs_GetTnode(dev); } - tn = tn->internal[i]; + tn = tn->internal[x]; l--; } - T(("\n")); + //TSTR(TENDSTR))); return tn; } +// 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. -// Pruning removes any part of the file structure tree that is beyond the -// bounds of the file. -// 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) +static int yaffs_DeleteWorker(yaffs_Object *in, yaffs_Tnode *tn, __u32 level, int chunkOffset,int *limit) { int i; - int hasData; + int chunkInInode; + int theChunk; + yaffs_Tags tags; + int found; + int chunkDeleted; + int allDone = 1; + if(tn) { - hasData = 0; - - for(i = 0; i < YAFFS_NTNODES_INTERNAL; i++) + if(level > 0) { - 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 = 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); + } + if(allDone) + { + yaffs_FreeTnode(in->myDev,tn->internal[i]); + tn->internal[i] = NULL; + } + } + + } + return (allDone) ? 1 : 0; + } + else if(level == 0) + { + int hitLimit = 0; + + for(i = YAFFS_NTNODES_LEVEL0 -1; i >= 0 && !hitLimit; i--) + { + if(tn->level0[i]) + { + int j; + + chunkInInode = (chunkOffset << YAFFS_TNODES_LEVEL0_BITS ) + i; + + theChunk = tn->level0[i] << in->myDev->chunkGroupBits; + + // Now we need to search for it + for(j = 0,found = 0; theChunk && j < in->myDev->chunkGroupSize && !found; j++) + { + yaffs_ReadChunkTagsFromNAND(in->myDev,theChunk,&tags,&chunkDeleted); + if(yaffs_TagsMatch(&tags,in->objectId,chunkInInode,chunkDeleted)) + { + // found it; + found = 1; + + } + else + { + theChunk++; + } + } + + if(found) + { + yaffs_DeleteChunk(in->myDev,theChunk,1); + in->nDataChunks--; + if(limit) + { + *limit = *limit-1; + if(*limit <= 0) + { + hitLimit = 1; + } + } + + } + + tn->level0[i] = 0; + } + + } + return (i < 0) ? 1 : 0; + + + } + + } + + return 1; + +} + +// 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 chunkInInode; + int theChunk; + yaffs_BlockInfo *theBlock; + yaffs_Tags tags; + int found; + int chunkDeleted; + int allDone = 1; + + + 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(in->myDev,tn->internal[i]); + tn->internal[i] = NULL; + } + 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] << in->myDev->chunkGroupBits); + T(YAFFS_TRACE_SCAN,(TSTR("soft delete tch %d cgb %d chunk %d" TENDSTR), + tn->level0[i],in->myDev->chunkGroupBits,theChunk)); + + theBlock = yaffs_GetBlockInfo(in->myDev, theChunk/in->myDev->nChunksPerBlock); + if(theBlock) + { + theBlock->softDeletions++; + } + tn->level0[i] = 0; + } + + } + return 1; + + } + + } + + return 1; + +} + + + +static void yaffs_SoftDeleteFile(yaffs_Object *obj) +{ + if(obj->deleted && + obj->variantType == YAFFS_OBJECT_TYPE_FILE && + !obj->softDeleted) + { + if(obj->nDataChunks <= 0) + { + // Empty file, 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) +{ + int i; + int hasData; + + 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++; } } @@ -703,6 +1306,7 @@ static int yaffs_PruneFileStructure(yaffs_Device *dev, yaffs_FileStructure *fStr + /////////////////////// End of File Structure functions. ///////////////// // yaffs_CreateFreeObjects creates a bunch more objects and @@ -721,14 +1325,14 @@ static int yaffs_CreateFreeObjects(yaffs_Device *dev, int nObjects) if (!newObjects) { - YALERT("Could not allocate more objects"); + 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++) { - (yaffs_Object *)newObjects[i].siblings.next = &newObjects[i+1]; + newObjects[i].siblings.next = (struct list_head *)(&newObjects[i+1]); } newObjects[nObjects - 1].siblings.next = (void *)dev->freeObjects; @@ -741,7 +1345,7 @@ static int yaffs_CreateFreeObjects(yaffs_Device *dev, int nObjects) list = YMALLOC(sizeof(yaffs_ObjectList)); if(!list) { - YALERT("Could not add Objects to management list"); + T(YAFFS_TRACE_ALLOCATE,(TSTR("Could not add objects to management list" TENDSTR))); } else { @@ -751,8 +1355,6 @@ static int yaffs_CreateFreeObjects(yaffs_Device *dev, int nObjects) } - YINFO("Objects created"); - return YAFFS_OK; } @@ -778,6 +1380,7 @@ static yaffs_Object *yaffs_AllocateEmptyObject(yaffs_Device *dev) // 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)); @@ -806,7 +1409,9 @@ static yaffs_Object *yaffs_CreateFakeDirectory(yaffs_Device *dev,int number,__u3 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->st_mode = mode; + obj->deleted = 0; + obj->unlinked = 0; + obj->yst_mode = mode; obj->myDev = dev; obj->chunkId = 0; // Not a valid chunk. } @@ -839,25 +1444,52 @@ 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 + tn->deferedFree = 1; + return; + } +#endif + yaffs_UnhashObject(tn); // Link into the free list. - (yaffs_Object *)(tn->siblings.next) = dev->freeObjects; + tn->siblings.next = (struct list_head *)(dev->freeObjects); dev->freeObjects = tn; dev->nFreeObjects++; } +#ifdef __KERNEL__ + +void yaffs_HandleDeferedFree(yaffs_Object *obj) +{ + if(obj->deferedFree) + { + yaffs_FreeObject(obj); + } +} + +#endif + static void yaffs_DeinitialiseObjects(yaffs_Device *dev) { // Free the list of allocated Objects + yaffs_ObjectList *tmp; + while( dev->allocatedObjectList) { + tmp = dev->allocatedObjectList->next; YFREE(dev->allocatedObjectList->objects); - dev->allocatedObjectList = dev->allocatedObjectList->next; + YFREE(dev->allocatedObjectList); + + dev->allocatedObjectList = tmp; } dev->freeObjects = NULL; @@ -935,7 +1567,7 @@ static int yaffs_CreateNewObjectNumber(yaffs_Device *dev) int found = 0; struct list_head *i; - int n = bucket; + __u32 n = (__u32)bucket; //yaffs_CheckObjectHashSanity(); @@ -948,7 +1580,7 @@ static int yaffs_CreateNewObjectNumber(yaffs_Device *dev) list_for_each(i,&dev->objectBucket[bucket].list) { // If there is already one in the list - if(list_entry(i, yaffs_Object,hashLink)->objectId == n) + if(i && list_entry(i, yaffs_Object,hashLink)->objectId == n) { found = 0; } @@ -968,16 +1600,16 @@ void yaffs_HashObject(yaffs_Object *in) if(!list_empty(&in->hashLink)) { - YINFO("!!!"); + //YINFO("!!!"); } - + list_add(&in->hashLink,&dev->objectBucket[bucket].list); dev->objectBucket[bucket].count++; } -yaffs_Object *yaffs_FindObjectByNumber(yaffs_Device *dev,int number) +yaffs_Object *yaffs_FindObjectByNumber(yaffs_Device *dev,__u32 number) { int bucket = yaffs_HashFunction(number); struct list_head *i; @@ -985,11 +1617,19 @@ yaffs_Object *yaffs_FindObjectByNumber(yaffs_Device *dev,int number) list_for_each(i,&dev->objectBucket[bucket].list) { - // Lookm if it is in the list - in = list_entry(i, yaffs_Object,hashLink); - if(in->objectId == number) + // Look if it is in the list + if(i) { - return in; + in = list_entry(i, yaffs_Object,hashLink); + if(in->objectId == number) + { +#ifdef __KERNEL__ + // Don't tell the VFS about this if it has been marked for freeing + if(in->deferedFree) + return NULL; +#endif + return in; + } } } @@ -1016,15 +1656,23 @@ yaffs_Object *yaffs_CreateNewObject(yaffs_Device *dev,int number,yaffs_ObjectTyp theObject->renameAllowed = 1; theObject->unlinkAllowed = 1; theObject->objectId = number; - theObject->myDev = dev; yaffs_HashObject(theObject); theObject->variantType = type; - theObject->st_atime = theObject->st_mtime = theObject->st_ctime = CURRENT_TIME; +#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]; +#else + + 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.topLevel = 0; theObject->variant.fileVariant.top = yaffs_GetTnode(dev); break; @@ -1037,8 +1685,12 @@ yaffs_Object *yaffs_CreateNewObject(yaffs_Device *dev,int number,yaffs_ObjectTyp 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; } } @@ -1049,7 +1701,7 @@ yaffs_Object *yaffs_FindOrCreateObjectByNumber(yaffs_Device *dev, int number,yaf { yaffs_Object *theObject = NULL; - if(number >= 0) + if(number > 0) { theObject = yaffs_FindObjectByNumber(dev,number); } @@ -1081,6 +1733,7 @@ char *yaffs_CloneString(const char *str) // 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) yaffs_Object *yaffs_MknodObject( yaffs_ObjectType type, yaffs_Object *parent, const char *name, @@ -1088,12 +1741,19 @@ yaffs_Object *yaffs_MknodObject( yaffs_ObjectType type, __u32 uid, __u32 gid, yaffs_Object *equivalentObject, - const char *aliasString) + const char *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)) + { + return NULL; + } + in = yaffs_CreateNewObject(dev,-1,type); if(in) @@ -1102,12 +1762,23 @@ yaffs_Object *yaffs_MknodObject( yaffs_ObjectType type, in->valid = 1; in->variantType = type; - in->st_mode = mode; - in->st_uid = uid; - in->st_gid = gid; - in->st_atime = in->st_mtime = in->st_ctime = CURRENT_TIME; + 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->nDataChunks = 0; - in->sum = yaffs_CalcNameSum(name); + yaffs_SetObjectName(in,name); in->dirty = 1; yaffs_AddObjectToDirectory(parent,in); @@ -1127,10 +1798,18 @@ yaffs_Object *yaffs_MknodObject( yaffs_ObjectType type, 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; } - yaffs_UpdateObjectHeader(in,name); + if(/*yaffs_GetNumberOfFreeChunks(dev) <= 0 || */ + yaffs_UpdateObjectHeader(in,name,0) < 0) + { + // Could not create the object header, fail the creation + yaffs_AbortHalfCreatedObject(in); + in = NULL; + } } @@ -1139,17 +1818,22 @@ yaffs_Object *yaffs_MknodObject( yaffs_ObjectType type, yaffs_Object *yaffs_MknodFile(yaffs_Object *parent,const char *name, __u32 mode, __u32 uid, __u32 gid) { - return yaffs_MknodObject(YAFFS_OBJECT_TYPE_FILE,parent,name,mode,uid,gid,NULL,NULL); + return yaffs_MknodObject(YAFFS_OBJECT_TYPE_FILE,parent,name,mode,uid,gid,NULL,NULL,0); } yaffs_Object *yaffs_MknodDirectory(yaffs_Object *parent,const char *name, __u32 mode, __u32 uid, __u32 gid) { - return yaffs_MknodObject(YAFFS_OBJECT_TYPE_DIRECTORY,parent,name,mode,uid,gid,NULL,NULL); + return yaffs_MknodObject(YAFFS_OBJECT_TYPE_DIRECTORY,parent,name,mode,uid,gid,NULL,NULL,0); +} + +yaffs_Object *yaffs_MknodSpecial(yaffs_Object *parent,const char *name, __u32 mode, __u32 uid, __u32 gid, __u32 rdev) +{ + return yaffs_MknodObject(YAFFS_OBJECT_TYPE_SPECIAL,parent,name,mode,uid,gid,NULL,NULL,rdev); } yaffs_Object *yaffs_MknodSymLink(yaffs_Object *parent,const char *name, __u32 mode, __u32 uid, __u32 gid,const char *alias) { - return yaffs_MknodObject(YAFFS_OBJECT_TYPE_SYMLINK,parent,name,mode,uid,gid,NULL,alias); + return yaffs_MknodObject(YAFFS_OBJECT_TYPE_SYMLINK,parent,name,mode,uid,gid,NULL,alias,0); } // NB yaffs_Link returns the object id of the equivalent object. @@ -1158,7 +1842,7 @@ yaffs_Object *yaffs_Link(yaffs_Object *parent, const char *name, yaffs_Object *e // 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)) + if(yaffs_MknodObject(YAFFS_OBJECT_TYPE_HARDLINK,parent,name,0,0,0,equivalentObject,NULL,0)) { return equivalentObject; } @@ -1170,38 +1854,63 @@ yaffs_Object *yaffs_Link(yaffs_Object *parent, const char *name, yaffs_Object *e } -static int yaffs_ChangeObjectName(yaffs_Object *obj, yaffs_Object *newDir, const char *newName) +static int yaffs_ChangeObjectName(yaffs_Object *obj, yaffs_Object *newDir, const char *newName,int force) { - //yaffs_Device *dev = obj->myDev; + int unlinkOp; if(newDir == NULL) { newDir = obj->parent; // use the old directory } + + unlinkOp = (newDir == obj->myDev->unlinkedDir && obj->variantType == YAFFS_OBJECT_TYPE_FILE); - // Only proceed if the new name does not exist and - // if we're putting it into a directory. - if(!yaffs_FindObjectByName(newDir,newName) && - newDir->variantType == YAFFS_OBJECT_TYPE_DIRECTORY) + // If the object is a file going into the unlinked directory, then it is OK to just stuff it in since + // duplicate names are allowed. + // Otherwise only proceed if the new name does not exist and if we're putting it into a directory. + if( (unlinkOp|| + force || + !yaffs_FindObjectByName(newDir,newName)) && + newDir->variantType == YAFFS_OBJECT_TYPE_DIRECTORY) { - obj->sum = yaffs_CalcNameSum(newName); + yaffs_SetObjectName(obj,newName); obj->dirty = 1; + yaffs_AddObjectToDirectory(newDir,obj); - return yaffs_UpdateObjectHeader(obj,newName); + if(unlinkOp) obj->unlinked = 1; + + + if(yaffs_UpdateObjectHeader(obj,newName,0) >= 0) + { + return YAFFS_OK; + } } return YAFFS_FAIL; } + + int yaffs_RenameObject(yaffs_Object *oldDir, const char *oldName, yaffs_Object *newDir, const char *newName) { yaffs_Object *obj; + int force = 0; + +#ifdef CONFIG_YAFFS_CASE_INSENSITIVE + // Special case for 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 && _stricmp(oldName,newName) == 0) + { + force = 1; + } +#endif obj = yaffs_FindObjectByName(oldDir,oldName); if(obj && obj->renameAllowed) { - return yaffs_ChangeObjectName(obj,newDir,newName); + return yaffs_ChangeObjectName(obj,newDir,newName,force); } return YAFFS_FAIL; } @@ -1228,7 +1937,7 @@ static int yaffs_CheckObjectHashSanity(yaffs_Device *dev) if(countEm != dev->objectBucket[bucket].count) { - YALERT("Inode hash inconsistency"); + T(YAFFS_TRACE_ERROR,(TSTR("Inode hash inconsistency" TENDSTR))); ok = YAFFS_FAIL; } } @@ -1236,6 +1945,7 @@ static int yaffs_CheckObjectHashSanity(yaffs_Device *dev) return ok; } +#if 0 void yaffs_ObjectTest(yaffs_Device *dev) { yaffs_Object *in[1000]; @@ -1251,7 +1961,7 @@ void yaffs_ObjectTest(yaffs_Device *dev) for(j = 0; j < 10; j++) { - T(("%d\n",j)); + //T(("%d\n",j)); for(i = 0; i < 1000; i++) { @@ -1270,7 +1980,7 @@ void yaffs_ObjectTest(yaffs_Device *dev) { if(yaffs_FindObjectByNumber(dev,inNo[i]) != in[i]) { - T(("Differnce in look up test\n")); + //T(("Differnce in look up test\n")); } else { @@ -1292,48 +2002,91 @@ void yaffs_ObjectTest(yaffs_Device *dev) } - +#endif /////////////////////////// Block Management and Page Allocation /////////////////// -static void yaffs_InitialiseBlocks(yaffs_Device *dev) +static int yaffs_InitialiseBlocks(yaffs_Device *dev,int nBlocks) { - dev->blockInfo = YMALLOC(dev->nBlocks * sizeof(yaffs_BlockInfo)); - memset(dev->blockInfo,0,dev->nBlocks * sizeof(yaffs_BlockInfo)); 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; + 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); + return YAFFS_OK; + } + + return YAFFS_FAIL; + } static void yaffs_DeinitialiseBlocks(yaffs_Device *dev) { YFREE(dev->blockInfo); + dev->blockInfo = NULL; + YFREE(dev->chunkBits); + dev->chunkBits = NULL; } // FindDiretiestBlock is used to select the dirtiest block (or close enough) // for garbage collection. -static int yaffs_FindDirtiestBlock(yaffs_Device *dev) +static int yaffs_FindDirtiestBlock(yaffs_Device *dev,int aggressive) { int b = dev->currentDirtyChecker; int i; + int iterations; int dirtiest = -1; - int pagesInUse = 100; // silly big number + int pagesInUse; + yaffs_BlockInfo *bi; + + // If we're doing aggressive GC then we are happy to take a less-dirty block, and + // search further. + + 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 = dev->startBlock; i <= dev->endBlock && pagesInUse > 2 ; i++) + for(i = 0; i <= iterations && pagesInUse > 0 ; i++) { b++; - if (b > dev->endBlock) + if ( b < dev->internalStartBlock || b > dev->internalEndBlock) { - b = dev->startBlock; + b = dev->internalStartBlock; } + + 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(dev->blockInfo[b].blockState == YAFFS_BLOCK_STATE_FULL && - (dev->blockInfo)[b].pagesInUse < pagesInUse) + if(bi->blockState == YAFFS_BLOCK_STATE_FULL && + (bi->pagesInUse - bi->softDeletions )< pagesInUse) { dirtiest = b; - pagesInUse = (dev->blockInfo)[b].pagesInUse; + pagesInUse = (bi->pagesInUse - bi->softDeletions); } } @@ -1343,37 +2096,76 @@ static int yaffs_FindDirtiestBlock(yaffs_Device *dev) } -static int yaffs_FindBlockForAllocation(yaffs_Device *dev,int useReserve) +static void yaffs_BlockBecameDirty(yaffs_Device *dev,int 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. + bi->blockState = YAFFS_BLOCK_STATE_DIRTY; + + if(!bi->needsRetiring) + { + erasedOk = yaffs_EraseBlockInNAND(dev,blockNo); + if(!erasedOk) + { + T(YAFFS_TRACE_ERROR | YAFFS_TRACE_BAD_BLOCKS,(TSTR("**>> Erasure failed %d" TENDSTR),blockNo)); + } + } + + if( erasedOk ) + { + // Clean it up... + bi->blockState = YAFFS_BLOCK_STATE_EMPTY; + dev->nErasedBlocks++; + bi->pagesInUse = 0; + bi->softDeletions = 0; + yaffs_ClearChunkBits(dev,blockNo); + + T(YAFFS_TRACE_ERASE,(TSTR("Erased block %d" TENDSTR),blockNo)); + } + else + { + 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) { int i; - if(useReserve && dev->nErasedBlocks < 1) + 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 space during gc" TENDSTR))); + return -1; } - else if(!useReserve && dev->nErasedBlocks <= YAFFS_RESERVED_BLOCKS) - { - // We are not in GC, so we hold some in reserve so we can get - // a gc done. - } // Find an empty block. - for(i = dev->startBlock; i <= dev->endBlock; i++) + for(i = dev->internalStartBlock; i <= dev->internalEndBlock; i++) { - - if(dev->blockInfo[i].blockState == YAFFS_BLOCK_STATE_EMPTY) + dev->allocationBlockFinder++; + if(dev->allocationBlockFinder internalStartBlock || dev->allocationBlockFinder> dev->internalEndBlock) { - dev->blockInfo[i].blockState = YAFFS_BLOCK_STATE_ALLOCATING; - dev->nErasedBlocks--; - if(dev->nErasedBlocks <= YAFFS_RESERVED_BLOCKS) - { - dev->garbageCollectionRequired = 1; - } - - return i; + dev->allocationBlockFinder = dev->internalStartBlock; + } + + bi = yaffs_GetBlockInfo(dev,dev->allocationBlockFinder); + + if(bi->blockState == YAFFS_BLOCK_STATE_EMPTY) + { + bi->blockState = YAFFS_BLOCK_STATE_ALLOCATING; + dev->nErasedBlocks--; + return dev->allocationBlockFinder; } } @@ -1381,136 +2173,166 @@ static int yaffs_FindBlockForAllocation(yaffs_Device *dev,int useReserve) } -static void yaffs_BlockBecameDirty(yaffs_Device *dev,int blockNo) -{ - yaffs_BlockInfo *bi = &dev->blockInfo[blockNo]; - - // Mark as dirty, erase it and mark as clean. - bi->blockState = YAFFS_BLOCK_STATE_DIRTY; - yaffs_EraseBlockInNAND(dev,blockNo); - bi->blockState = YAFFS_BLOCK_STATE_EMPTY; - dev->nErasedBlocks++; - bi->pagesInUse = 0; - bi->pageBits = 0; - - T(("Erased block %d\n",blockNo)); -} - static int yaffs_AllocateChunk(yaffs_Device *dev,int useReserve) { int retVal; + yaffs_BlockInfo *bi; if(dev->allocationBlock < 0) { // Get next block to allocate off - dev->allocationBlock = yaffs_FindBlockForAllocation(dev,useReserve); + dev->allocationBlock = yaffs_FindBlockForAllocation(dev); dev->allocationPage = 0; } + if(!useReserve && dev->nErasedBlocks <= dev->nReservedBlocks) + { + // Not enough space to allocate unless we're allowed to use the reserve. + return -1; + } + // Next page please.... if(dev->allocationBlock >= 0) { - retVal = (dev->allocationBlock * YAFFS_CHUNKS_PER_BLOCK) + + bi = yaffs_GetBlockInfo(dev,dev->allocationBlock); + + retVal = (dev->allocationBlock * dev->nChunksPerBlock) + dev->allocationPage; - dev->blockInfo[dev->allocationBlock].pagesInUse++; - dev->blockInfo[dev->allocationBlock].pageBits |= - (1 << (dev->allocationPage)); + bi->pagesInUse++; + yaffs_SetChunkBit(dev,dev->allocationBlock,dev->allocationPage); dev->allocationPage++; dev->nFreeChunks--; // If the block is full set the state to full - if(dev->allocationPage >= YAFFS_CHUNKS_PER_BLOCK) + if(dev->allocationPage >= dev->nChunksPerBlock) { - dev->blockInfo[dev->allocationBlock].blockState = YAFFS_BLOCK_STATE_FULL; + bi->blockState = YAFFS_BLOCK_STATE_FULL; dev->allocationBlock = -1; } -#ifdef YAFFS_PARANOID - if(yaffs_CheckChunkErased(retVal) == YAFFS_FAIL) - { - T(("..................Trying to allocate non-erased page %d\n",retVal)); - } -#endif + return retVal; } - T(("!!!!!!!!! Allocator out !!!!!!!!!!!!!!!!!\n")); + T(YAFFS_TRACE_ERROR,(TSTR("!!!!!!!!! Allocator out !!!!!!!!!!!!!!!!!" TENDSTR))); return -1; } +// To determine if we have enough space we just look at the +// number of erased blocks. +// The cache is allowed to use reserved blocks. + +static int yaffs_CheckSpaceForChunkCache(yaffs_Device *dev) +{ + return (dev->nErasedBlocks >= dev->nReservedBlocks); +} + -int yaffs_GarbageCollectBlock(yaffs_Device *dev,int block) +static int yaffs_GarbageCollectBlock(yaffs_Device *dev,int block) { int oldChunk; int newChunk; - __u32 mask; + int chunkInBlock; + int markNAND; yaffs_Spare spare; yaffs_Tags tags; - __u8 buffer[YAFFS_BYTES_PER_CHUNK]; + __u8 buffer[YAFFS_BYTES_PER_CHUNK]; - yaffs_BlockInfo *bi = &dev->blockInfo[block]; +// yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev,block); yaffs_Object *object; - T(("Collecting block %d n %d bits %x\n",block, bi->pagesInUse, bi->pageBits)); + //T(("Collecting block %d n %d bits %x\n",block, bi->pagesInUse, bi->pageBits)); - for(mask = 1,oldChunk = block * YAFFS_CHUNKS_PER_BLOCK; - mask && bi->pageBits; - mask <<= 1, oldChunk++ ) + for(chunkInBlock = 0,oldChunk = block * dev->nChunksPerBlock; + chunkInBlock < dev->nChunksPerBlock && yaffs_StillSomeChunkBits(dev,block); + chunkInBlock++, oldChunk++ ) { - if(bi->pageBits & mask) + if(yaffs_CheckChunkBit(dev,block,chunkInBlock)) { - // This page is in use and needs to be copied off + // This page is in use and might need to be copied off - T(("copying page %x from %d to %d\n",mask,oldChunk,newChunk)); + markNAND = 1; - yaffs_ReadChunkFromNAND(dev,oldChunk,buffer, &spare); + //T(("copying page %x from %d to %d\n",mask,oldChunk,newChunk)); - yaffs_GetTagsFromSpare(&spare,&tags); - tags.serialNumber++; - yaffs_LoadTagsIntoSpare(&spare,&tags); + yaffs_ReadChunkFromNAND(dev,oldChunk,buffer, &spare,1); + + yaffs_GetTagsFromSpare(dev,&spare,&tags); -#if 0 - newChunk = yaffs_AllocatePage(dev,1); - if(newChunk < 0) + object = yaffs_FindObjectByNumber(dev,tags.objectId); + + if(object && object->deleted && tags.chunkId != 0) { - return YAFFS_FAIL; + // Data chunk in a deleted file, throw it away + // It's a 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) + { + // Time to delete the file too + yaffs_FreeTnode(object->myDev,object->variant.fileVariant.top); + object->variant.fileVariant.top = NULL; + T(YAFFS_TRACE_TRACING,(TSTR("yaffs: About to finally delete object %d" TENDSTR),object->objectId)); + yaffs_DoGenericObjectDeletion(object); + } + markNAND = 0; } - - yaffs_WriteChunkToNAND(dev,newChunk, buffer, &spare); - -#else - newChunk = yaffs_WriteNewChunkToNAND(dev, buffer, &spare,1); -#endif - if(newChunk < 0) + else if( 0 /* Todo object && object->deleted && object->nDataChunks == 0 */) { - return YAFFS_FAIL; + // 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++; + yaffs_LoadTagsIntoSpare(&spare,&tags); - object = yaffs_FindObjectByNumber(dev,tags.objectId); + dev->nGCCopies++; + + newChunk = yaffs_WriteNewChunkToNAND(dev, buffer, &spare,1); - // Ok, now fix up the Tnodes etc. + if(newChunk < 0) + { + return YAFFS_FAIL; + } - if(tags.chunkId == 0) - { - // It's a header - object->chunkId = newChunk; - } - else - { - // It's a data chunk - yaffs_PutChunkIntoFile(object, tags.chunkId, newChunk,0); - + // 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); + yaffs_DeleteChunk(dev,oldChunk,markNAND); } } @@ -1518,16 +2340,88 @@ int yaffs_GarbageCollectBlock(yaffs_Device *dev,int block) return YAFFS_OK; } -int yaffs_CheckGarbageCollection(yaffs_Device *dev) + +static yaffs_Object *yaffs_FindDeletedUnlinkedFile(yaffs_Device *dev) +{ + // find a file to delete + struct list_head *i; + yaffs_Object *l; + + + //Scan the unlinked files looking for one to delete + list_for_each(i,&dev->unlinkedDir->variant.directoryVariant.children) + { + if(i) + { + l = list_entry(i, yaffs_Object,siblings); + if(l->deleted) + { + return l; + } + } + } + return NULL; +} + + +static void yaffs_DoUnlinkedFileDeletion(yaffs_Device *dev) +{ + // This does background deletion on unlinked files.. only deleted ones. + // If we don't have a file we're working on then find one + if(!dev->unlinkedDeletion && dev->nDeletedFiles > 0) + { + dev->unlinkedDeletion = yaffs_FindDeletedUnlinkedFile(dev); + } + + // OK, we're working on a file... + if(dev->unlinkedDeletion) + { + yaffs_Object *obj = dev->unlinkedDeletion; + int delresult; + int limit; // Number of chunks to delete in a file. + // NB this can be exceeded, but not by much. + + limit = -1; + + delresult = yaffs_DeleteWorker(obj, obj->variant.fileVariant.top, obj->variant.fileVariant.topLevel, 0,&limit); + + if(obj->nDataChunks == 0) + { + // Done all the deleting of data chunks. + // Now dump the header and clean up + yaffs_FreeTnode(dev,obj->variant.fileVariant.top); + obj->variant.fileVariant.top = NULL; + yaffs_DoGenericObjectDeletion(obj); + dev->nDeletedFiles--; + dev->nUnlinkedFiles--; + dev->nBackgroundDeletions++; + dev->unlinkedDeletion = NULL; + } + } +} + + +#if 0 +#define YAFFS_GARBAGE_COLLECT_LOW_WATER 2 +static int yaffs_CheckGarbageCollection(yaffs_Device *dev) { int block; + int aggressive=0; + + //yaffs_DoUnlinkedFileDeletion(dev); - if(dev->garbageCollectionRequired) + if(dev->nErasedBlocks <= (dev->nReservedBlocks + YAFFS_GARBAGE_COLLECT_LOW_WATER)) { - dev->garbageCollectionRequired = 0; - block = yaffs_FindDirtiestBlock(dev); + aggressive = 1; + } + + if(aggressive) + { + block = yaffs_FindDirtiestBlock(dev,aggressive); + if(block >= 0) { + dev->garbageCollections++; return yaffs_GarbageCollectBlock(dev,block); } else @@ -1538,6 +2432,46 @@ int yaffs_CheckGarbageCollection(yaffs_Device *dev) return YAFFS_OK; } +#endif + +// New garbage collector +// If we're very low on erased blocks then we do aggressive garbage collection +// otherwise we do "passive" 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=0; + + //yaffs_DoUnlinkedFileDeletion(dev); + + if(dev->nErasedBlocks <= (dev->nReservedBlocks + 1)) + { + aggressive = 1; + } + + block = yaffs_FindDirtiestBlock(dev,aggressive); + + if(block >= 0) + { + dev->garbageCollections++; + if(!aggressive) + { + dev->passiveGarbageCollections++; + } + + T(YAFFS_TRACE_GC,(TSTR("yaffs: GC erasedBlocks %d aggressive %d" TENDSTR),dev->nErasedBlocks,aggressive)); + + return yaffs_GarbageCollectBlock(dev,block); + } + + return aggressive ? YAFFS_FAIL : YAFFS_OK; +} //////////////////////////// TAGS /////////////////////////////////////// @@ -1558,9 +2492,10 @@ static void yaffs_LoadTagsIntoSpare(yaffs_Spare *sparePtr, yaffs_Tags *tagsPtr) sparePtr->tagByte7 = tu->asBytes[7]; } -static void yaffs_GetTagsFromSpare(yaffs_Spare *sparePtr,yaffs_Tags *tagsPtr) +static void yaffs_GetTagsFromSpare(yaffs_Device *dev, yaffs_Spare *sparePtr,yaffs_Tags *tagsPtr) { yaffs_TagsUnion *tu = (yaffs_TagsUnion *)tagsPtr; + int result; tu->asBytes[0]= sparePtr->tagByte0; tu->asBytes[1]= sparePtr->tagByte1; @@ -1571,7 +2506,15 @@ static void yaffs_GetTagsFromSpare(yaffs_Spare *sparePtr,yaffs_Tags *tagsPtr) tu->asBytes[6]= sparePtr->tagByte6; tu->asBytes[7]= sparePtr->tagByte7; - yaffs_CheckECCOnTags(tagsPtr); + result = yaffs_CheckECCOnTags(tagsPtr); + if(result> 0) + { + dev->tagsEccFixed++; + } + else if(result <0) + { + dev->tagsEccUnfixed++; + } } static void yaffs_SpareInitialise(yaffs_Spare *spare) @@ -1579,14 +2522,15 @@ static void yaffs_SpareInitialise(yaffs_Spare *spare) memset(spare,0xFF,sizeof(yaffs_Spare)); } -static int yaffs_ReadChunkTagsFromNAND(yaffs_Device *dev,int chunkInNAND, yaffs_Tags *tags) +static int yaffs_ReadChunkTagsFromNAND(yaffs_Device *dev,int chunkInNAND, yaffs_Tags *tags, int *chunkDeleted) { if(tags) { yaffs_Spare spare; - if(yaffs_ReadChunkFromNAND(dev,chunkInNAND,NULL,&spare) == YAFFS_OK) + if(yaffs_ReadChunkFromNAND(dev,chunkInNAND,NULL,&spare,1) == YAFFS_OK) { - yaffs_GetTagsFromSpare(&spare,tags); + *chunkDeleted = (yaffs_CountBits(spare.pageStatus) < 7) ? 1 : 0; + yaffs_GetTagsFromSpare(dev,&spare,tags); return YAFFS_OK; } else @@ -1598,6 +2542,7 @@ static int yaffs_ReadChunkTagsFromNAND(yaffs_Device *dev,int chunkInNAND, yaffs_ return YAFFS_OK; } +#if 0 static int yaffs_WriteChunkWithTagsToNAND(yaffs_Device *dev,int chunkInNAND, const __u8 *buffer, yaffs_Tags *tags) { // NB There must be tags, data is optional @@ -1612,8 +2557,7 @@ static int yaffs_WriteChunkWithTagsToNAND(yaffs_Device *dev,int chunkInNAND, con yaffs_SpareInitialise(&spare); - - if(buffer) + if(!dev->useNANDECC && buffer) { yaffs_CalcECC(buffer,&spare); } @@ -1623,6 +2567,8 @@ static int yaffs_WriteChunkWithTagsToNAND(yaffs_Device *dev,int chunkInNAND, con return yaffs_WriteChunkToNAND(dev,chunkInNAND,buffer,&spare); } +#endif + static int yaffs_WriteNewChunkWithTagsToNAND(yaffs_Device *dev, const __u8 *buffer, yaffs_Tags *tags, int useReserve) { @@ -1638,8 +2584,7 @@ static int yaffs_WriteNewChunkWithTagsToNAND(yaffs_Device *dev, const __u8 *buff yaffs_SpareInitialise(&spare); - - if(buffer) + if(!dev->useNANDECC && buffer) { yaffs_CalcECC(buffer,&spare); } @@ -1650,6 +2595,13 @@ static int yaffs_WriteNewChunkWithTagsToNAND(yaffs_Device *dev, const __u8 *buff } +static int yaffs_TagsMatch(const yaffs_Tags *tags, int objectId, int chunkInObject, int chunkDeleted) +{ + return ( tags->chunkId == chunkInObject && + tags->objectId == objectId && + !chunkDeleted) ? 1 : 0; + +} @@ -1661,6 +2613,8 @@ int yaffs_FindChunkInFile(yaffs_Object *in,int chunkInInode,yaffs_Tags *tags) yaffs_Tags localTags; int i; int found = 0; + int chunkDeleted; + yaffs_Device *dev = in->myDev; @@ -1677,11 +2631,10 @@ int yaffs_FindChunkInFile(yaffs_Object *in,int chunkInInode,yaffs_Tags *tags) theChunk = tn->level0[chunkInInode & YAFFS_TNODES_LEVEL0_MASK] << dev->chunkGroupBits; // Now we need to do the shifting etc and search for it - for(i = 0,found = 0; i < dev->chunkGroupSize && !found; i++) + for(i = 0,found = 0; theChunk && i < dev->chunkGroupSize && !found; i++) { - yaffs_ReadChunkTagsFromNAND(dev,theChunk,tags); - if(tags->chunkId == chunkInInode && - tags->objectId == in->objectId) + yaffs_ReadChunkTagsFromNAND(dev,theChunk,tags,&chunkDeleted); + if(yaffs_TagsMatch(tags,in->objectId,chunkInInode,chunkDeleted)) { // found it; found = 1; @@ -1704,6 +2657,7 @@ int yaffs_FindAndDeleteChunkInFile(yaffs_Object *in,int chunkInInode,yaffs_Tags int i; int found = 0; yaffs_Device *dev = in->myDev; + int chunkDeleted; if(!tags) { @@ -1719,11 +2673,10 @@ int yaffs_FindAndDeleteChunkInFile(yaffs_Object *in,int chunkInInode,yaffs_Tags theChunk = tn->level0[chunkInInode & YAFFS_TNODES_LEVEL0_MASK] << dev->chunkGroupBits; // Now we need to do the shifting etc and search for it - for(i = 0,found = 0; i < dev->chunkGroupSize && !found; i++) + for(i = 0,found = 0; theChunk && i < dev->chunkGroupSize && !found; i++) { - yaffs_ReadChunkTagsFromNAND(dev,theChunk,tags); - if(tags->chunkId == chunkInInode && - tags->objectId == in->objectId) + yaffs_ReadChunkTagsFromNAND(dev,theChunk,tags,&chunkDeleted); + if(yaffs_TagsMatch(tags,in->objectId,chunkInInode,chunkDeleted)) { // found it; found = 1; @@ -1742,18 +2695,18 @@ int yaffs_FindAndDeleteChunkInFile(yaffs_Object *in,int chunkInInode,yaffs_Tags } else { - T(("No level 0 found for %d\n", chunkInInode)); + //T(("No level 0 found for %d\n", chunkInInode)); } if(!found) { - T(("Could not find %d to delete\n",chunkInInode)); + //T(("Could not find %d to delete\n",chunkInInode)); } return found ? theChunk : -1; } -#if YAFFS_PARANOID +#ifdef YAFFS_PARANOID static int yaffs_CheckFileSanity(yaffs_Object *in) { @@ -1766,34 +2719,34 @@ static int yaffs_CheckFileSanity(yaffs_Object *in) yaffs_Tags localTags; yaffs_Tags *tags = &localTags; int theChunk; + int chunkDeleted; if(in->variantType != YAFFS_OBJECT_TYPE_FILE) { - T(("Object not a file\n")); + //T(("Object not a file\n")); return YAFFS_FAIL; } objId = in->objectId; fSize = in->variant.fileVariant.fileSize; - nChunks = (fSize + YAFFS_BYTES_PER_CHUNK -1)/YAFFS_BYTES_PER_CHUNK; + nChunks = (fSize + in->myDev->nBytesPerChunk -1)/in->myDev->nBytesPerChunk; for(chunk = 1; chunk <= nChunks; chunk++) { - tn = yaffs_FindLevel0Tnode(&in->variant.fileVariant, chunk); + tn = yaffs_FindLevel0Tnode(in->myDev,&in->variant.fileVariant, chunk); if(tn) { - theChunk = tn->level0[chunk & YAFFS_TNODES_LEVEL0_MASK] << dev->chunkGroupBits; + theChunk = tn->level0[chunk & YAFFS_TNODES_LEVEL0_MASK] << in->myDev->chunkGroupBits; - yaffs_ReadChunkTagsFromNAND(theChunk,tags); - if(tags->chunkId == chunk && - tags->objectId == in->objectId) + yaffs_ReadChunkTagsFromNAND(in->myDev,theChunk,tags,&chunkDeleted); + if(yaffs_TagsMatch(tags,in->objectId,chunk,chunkDeleted)) { // found it; - + } else { @@ -1807,7 +2760,7 @@ static int yaffs_CheckFileSanity(yaffs_Object *in) } else { - T(("No level 0 found for %d\n", chunk)); + //T(("No level 0 found for %d\n", chunk)); } } @@ -1825,8 +2778,16 @@ static int yaffs_PutChunkIntoFile(yaffs_Object *in,int chunkInInode, int chunkIn yaffs_Tags newTags; unsigned existingSerial, newSerial; + int newChunkDeleted; + tn = yaffs_AddOrFindLevel0Tnode(dev,&in->variant.fileVariant, chunkInInode); + if(!tn) + { + return YAFFS_FAIL; + } + + existingChunk = tn->level0[chunkInInode & YAFFS_TNODES_LEVEL0_MASK]; if(inScan) { @@ -1835,33 +2796,59 @@ static int yaffs_PutChunkIntoFile(yaffs_Object *in,int chunkInInode, int chunkIn // happen when the power fails during a write, then only one // chunk should ever be affected. - existingChunk = tn->level0[chunkInInode & YAFFS_TNODES_LEVEL0_MASK]; 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 // To do this we get both sets of tags and compare serial numbers. - yaffs_ReadChunkTagsFromNAND(dev,chunkInInode, &newTags); - yaffs_ReadChunkTagsFromNAND(dev,existingChunk, &existingTags); + yaffs_ReadChunkTagsFromNAND(dev,chunkInNAND, &newTags,&newChunkDeleted); + + + // 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))); + + } + + + // NB The deleted flags should be false, otherwise the chunks will + // not be loaded during a scan + newSerial = newTags.serialNumber; existingSerial = existingTags.serialNumber; - if(((existingSerial+1) & 3) == newSerial) + + if( existingChunk <= 0 || + ((existingSerial+1) & 3) == newSerial) { // Use new // Delete the old one and drop through to update the tnode - yaffs_DeleteChunk(dev,existingChunk); + yaffs_DeleteChunk(dev,existingChunk,1); } else { // Use existing. // Delete the new one and return early so that the tnode isn't changed - yaffs_DeleteChunk(dev,chunkInInode); + yaffs_DeleteChunk(dev,chunkInNAND,1); return YAFFS_OK; } } + + } + + if(existingChunk == 0) + { + in->nDataChunks++; } - tn->level0[chunkInInode & YAFFS_TNODES_LEVEL0_MASK] = chunkInNAND; + tn->level0[chunkInInode & YAFFS_TNODES_LEVEL0_MASK] = (chunkInNAND >> dev->chunkGroupBits); return YAFFS_OK; } @@ -1874,42 +2861,67 @@ int yaffs_ReadChunkDataFromObject(yaffs_Object *in,int chunkInInode, __u8 *buffe if(chunkInNAND >= 0) { - return yaffs_ReadChunkFromNAND(in->myDev,chunkInNAND,buffer,NULL); + return yaffs_ReadChunkFromNAND(in->myDev,chunkInNAND,buffer,NULL,1); } else { + memset(buffer,0,YAFFS_BYTES_PER_CHUNK); return 0; } } -static void yaffs_DeleteChunk(yaffs_Device *dev,int chunkId) +static void yaffs_DeleteChunk(yaffs_Device *dev,int chunkId,int markNAND) { - int block = chunkId / YAFFS_CHUNKS_PER_BLOCK; - int page = chunkId % YAFFS_CHUNKS_PER_BLOCK; - yaffs_Tags tags; + int block; + int page; + yaffs_Spare spare; + yaffs_BlockInfo *bi; + + if(chunkId <= 0) return; + + dev->nDeletions++; + block = chunkId / dev->nChunksPerBlock; + page = chunkId % dev->nChunksPerBlock; + + if(markNAND) + { + yaffs_SpareInitialise(&spare); + +#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); +#endif + + spare.pageStatus = 0; // To mark it as deleted. + - // Mark the deleted NAND page as deleted - tags.chunkId = 0; - tags.objectId = 0; - tags.byteCount = 0; - tags.ecc = 0; + yaffs_WriteChunkToNAND(dev,chunkId,NULL,&spare); + yaffs_HandleUpdateChunk(dev,chunkId,&spare); + } + else + { + dev->nUnmarkedDeletions++; + } - yaffs_WriteChunkWithTagsToNAND(dev,chunkId,NULL,&tags); + bi = yaffs_GetBlockInfo(dev,block); // Pull out of the management area. - if( dev->blockInfo[block].blockState == YAFFS_BLOCK_STATE_ALLOCATING || - dev->blockInfo[block].blockState == YAFFS_BLOCK_STATE_FULL) + // 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) { dev->nFreeChunks++; - dev->blockInfo[block].pageBits &= ~(1 << page); - dev->blockInfo[block].pagesInUse--; + yaffs_ClearChunkBit(dev,block,page); + bi->pagesInUse--; - if( dev->blockInfo[block].pagesInUse == 0 && - dev->blockInfo[block].blockState == YAFFS_BLOCK_STATE_FULL) + if(bi->pagesInUse == 0 && + bi->blockState == YAFFS_BLOCK_STATE_FULL) { yaffs_BlockBecameDirty(dev,block); } @@ -1917,7 +2929,7 @@ static void yaffs_DeleteChunk(yaffs_Device *dev,int chunkId) } else { - T(("Bad news deleting chunk %d\n",chunkId)); + // T(("Bad news deleting chunk %d\n",chunkId)); } } @@ -1953,36 +2965,6 @@ int yaffs_WriteChunkDataToObject(yaffs_Object *in,int chunkInInode, const __u8 * yaffs_CalcTagsECC(&newTags); - - #if 0 - // Create new chunk in NAND - newChunkId = yaffs_AllocatePage(dev,useReserve); - - - if(newChunkId >= 0) - { - - - yaffs_WriteChunkWithTagsToNAND(dev,newChunkId,buffer,&newTags); - - yaffs_PutChunkIntoFile(in,chunkInInode,newChunkId); - - - if(prevChunkId >= 0) - { - yaffs_DeleteChunk(dev,prevChunkId); - - } - - yaffs_CheckFileSanity(in); - - return newChunkId; - } - - - return -1; -#else - newChunkId = yaffs_WriteNewChunkWithTagsToNAND(dev,buffer,&newTags,useReserve); if(newChunkId >= 0) { @@ -1991,7 +2973,7 @@ int yaffs_WriteChunkDataToObject(yaffs_Object *in,int chunkInInode, const __u8 * if(prevChunkId >= 0) { - yaffs_DeleteChunk(dev,prevChunkId); + yaffs_DeleteChunk(dev,prevChunkId,1); } @@ -1999,7 +2981,7 @@ int yaffs_WriteChunkDataToObject(yaffs_Object *in,int chunkInInode, const __u8 * } return newChunkId; -#endif + @@ -2009,7 +2991,7 @@ int yaffs_WriteChunkDataToObject(yaffs_Object *in,int chunkInInode, const __u8 * // 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 char *name) +int yaffs_UpdateObjectHeader(yaffs_Object *in,const char *name, int force) { yaffs_Device *dev = in->myDev; @@ -2023,8 +3005,9 @@ int yaffs_UpdateObjectHeader(yaffs_Object *in,const char *name) yaffs_ObjectHeader *oh = (yaffs_ObjectHeader *)bufferNew; yaffs_ObjectHeader *ohOld = (yaffs_ObjectHeader *)bufferOld; + - if(!in->fake) + if(!in->fake || force) { yaffs_CheckGarbageCollection(dev); @@ -2035,30 +3018,52 @@ int yaffs_UpdateObjectHeader(yaffs_Object *in,const char *name) if(prevChunkId >= 0) { - yaffs_ReadChunkFromNAND(dev,prevChunkId,bufferOld,NULL); + yaffs_ReadChunkFromNAND(dev,prevChunkId,bufferOld,NULL,1); } // Header data oh->type = in->variantType; - - oh->st_mode = in->st_mode; - oh->st_uid = in->st_uid; - oh->st_gid = in->st_gid; - oh->st_atime = in->st_atime; - oh->st_mtime = in->st_mtime; - oh->st_ctime = in->st_ctime; - - oh->parentObjectId = in->parent->objectId; - oh->sum = in->sum; + + oh->yst_mode = in->yst_mode; + +#ifdef CONFIG_YAFFS_WINCE + oh->win_atime[0] = in->win_atime[0]; + oh->win_ctime[0] = in->win_ctime[0]; + oh->win_mtime[0] = in->win_mtime[0]; + oh->win_atime[1] = in->win_atime[1]; + oh->win_ctime[1] = in->win_ctime[1]; + oh->win_mtime[1] = in->win_mtime[1]; +#else + oh->yst_uid = in->yst_uid; + oh->yst_gid = in->yst_gid; + oh->yst_atime = in->yst_atime; + oh->yst_mtime = in->yst_mtime; + oh->yst_ctime = in->yst_ctime; + oh->yst_rdev = in->yst_rdev; +#endif + if(in->parent) + { + oh->parentObjectId = in->parent->objectId; + } + else + { + oh->parentObjectId = 0; + } + + //oh->sum = in->sum; if(name && *name) { memset(oh->name,0,YAFFS_MAX_NAME_LENGTH + 1); strncpy(oh->name,name,YAFFS_MAX_NAME_LENGTH); } - else + else if(prevChunkId) { memcpy(oh->name, ohOld->name,YAFFS_MAX_NAME_LENGTH + 1); } + else + { + memset(oh->name,0,YAFFS_MAX_NAME_LENGTH + 1); + } switch(in->variantType) { @@ -2071,6 +3076,9 @@ int yaffs_UpdateObjectHeader(yaffs_Object *in,const char *name) 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; @@ -2090,32 +3098,9 @@ int yaffs_UpdateObjectHeader(yaffs_Object *in,const char *name) yaffs_CalcTagsECC(&newTags); - - -#if 0 - // Create new chunk in NAND - newChunkId = yaffs_AllocatePage(dev,1); - - if(newChunkId >= 0) - { - yaffs_WriteChunkWithTagsToNAND(dev,newChunkId,bufferNew,&newTags); - - in->chunkId = newChunkId; - - if(prevChunkId >= 0) - { - yaffs_DeleteChunk(dev,prevChunkId); - } - - in->dirty = 0; - return newChunkId; - } - - return -1; -#else // Create new chunk in NAND - newChunkId = yaffs_WriteNewChunkWithTagsToNAND(dev,bufferNew,&newTags,1); + newChunkId = yaffs_WriteNewChunkWithTagsToNAND(dev,bufferNew,&newTags, (prevChunkId >= 0) ? 1 : 0 ); if(newChunkId >= 0) { @@ -2124,7 +3109,7 @@ int yaffs_UpdateObjectHeader(yaffs_Object *in,const char *name) if(prevChunkId >= 0) { - yaffs_DeleteChunk(dev,prevChunkId); + yaffs_DeleteChunk(dev,prevChunkId,1); } in->dirty = 0; @@ -2132,79 +3117,396 @@ int yaffs_UpdateObjectHeader(yaffs_Object *in,const char *name) return newChunkId; -#endif } return 0; } +/////////////////////// 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. -///////////////////////// 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) + + + +static void yaffs_FlushFilesChunkCache(yaffs_Object *obj) { + yaffs_Device *dev = obj->myDev; + int lowest; + int i; + yaffs_ChunkCache *cache; + int chunkWritten = 0; + int nBytes; + int nCaches = obj->myDev->nShortOpCaches; -// yaffs_Device *dev = in->myDev; - - __u8 localBuffer[YAFFS_BYTES_PER_CHUNK]; - - int chunk; - int start; - int nToCopy; - int n = nBytes; - int nDone = 0; - - while(n > 0) + if (nCaches > 0) { - chunk = offset / YAFFS_BYTES_PER_CHUNK + 1; // The first chunk is 1 - start = offset % YAFFS_BYTES_PER_CHUNK; + 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) + { + cache = &dev->srCache[i]; + lowest = cache->chunkId; + } + } + } + + if(cache) + { + //Write it out - // OK now check for the curveball where the start and end are in - // the same chunk. - if( (start + n) < YAFFS_BYTES_PER_CHUNK) - { - nToCopy = n; - } - else - { - nToCopy = YAFFS_BYTES_PER_CHUNK - start; - } - - if(nToCopy != YAFFS_BYTES_PER_CHUNK) - { - // An incomplete start or end chunk (or maybe both start and end chunk) - // Read into the local buffer then copy... +#if 0 + nBytes = cache->object->variant.fileVariant.fileSize - ((cache->chunkId -1) * YAFFS_BYTES_PER_CHUNK); + + if(nBytes > YAFFS_BYTES_PER_CHUNK) + { + nBytes= YAFFS_BYTES_PER_CHUNK; + } +#endif + chunkWritten = yaffs_WriteChunkDataToObject(cache->object, + cache->chunkId, + cache->data, + cache->nBytes,1); + + cache->dirty = 0; + cache->object = NULL; + } - yaffs_ReadChunkDataFromObject(in,chunk,localBuffer); - memcpy(buffer,&localBuffer[start],nToCopy); - } - else + } while(cache && chunkWritten > 0); + + if(cache) { - // A full chunk. Read directly into the supplied buffer. - yaffs_ReadChunkDataFromObject(in,chunk,buffer); + //Hoosterman, disk full while writing cache out. + T(YAFFS_TRACE_ERROR, (TSTR("yaffs tragedy: no space during cache write" TENDSTR))); + } + } - n -= nToCopy; - offset += nToCopy; - buffer += nToCopy; - nDone += nToCopy; - - } - - return nDone; } -int yaffs_WriteDataToFile(yaffs_Object *in,const __u8 * buffer, __u32 offset, int nBytes) -{ - __u8 localBuffer[YAFFS_BYTES_PER_CHUNK]; +// 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) +{ + 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); + + 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)) + { + 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 NULL; + } + +} + + +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... + + 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. + + theObj = dev->srCache[0].object; + usage = dev->srCache[0].lastUse; + cache = &dev->srCache[0]; + pushout = 0; + + for(i = 1; i < dev->nShortOpCaches; i++) + { + if( dev->srCache[i].object && + dev->srCache[i].lastUse < usage) + { + usage = dev->srCache[i].lastUse; + theObj = dev->srCache[i].object; + cache = &dev->srCache[i]; + pushout = i; + } + } + + if(!cache || cache->dirty) + { + + //printf("Dirty "); + yaffs_FlushFilesChunkCache(theObj); + + // Try again + cache = yaffs_GrabChunkCacheWorker(dev); + } + else + { + //printf(" pushout %d\n",pushout); + } + + } + + return cache; + } + else + return NULL; + +} + + +// 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) + { + dev->cacheHits++; + + return &dev->srCache[i]; + } + } + } + return NULL; +} + +// 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 + int i; + for(i = 1; i < dev->nShortOpCaches; i++) + { + dev->srCache[i].lastUse = 0; + } + dev->srLastUse = 0; + } + + dev->srLastUse++; + + cache->lastUse = dev->srLastUse; + + 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) +{ + 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) +{ + 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) + { + 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) +{ + + + 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 / YAFFS_BYTES_PER_CHUNK + 1; // The first chunk is 1 + start = offset % YAFFS_BYTES_PER_CHUNK; + + // OK now check for the curveball where the start and end are in + // the same chunk. + if( (start + n) < YAFFS_BYTES_PER_CHUNK) + { + nToCopy = n; + } + else + { + nToCopy = YAFFS_BYTES_PER_CHUNK - 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 != YAFFS_BYTES_PER_CHUNK) + { + 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; + yaffs_ReadChunkDataFromObject(in,chunk,cache->data); + cache->nBytes = 0; + } + + yaffs_UseChunkCache(dev,cache,0); + + memcpy(buffer,&cache->data[start],nToCopy); + } + else + { + // Read into the local buffer then copy... + yaffs_ReadChunkDataFromObject(in,chunk,dev->localBuffer); + memcpy(buffer,&dev->localBuffer[start],nToCopy); + } + + } + else + { +#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 + yaffs_ReadChunkDataFromObject(in,chunk,dev->localBuffer); + memcpy(buffer,dev->localBuffer,YAFFS_BYTES_PER_CHUNK); +#else + // 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 chunk; int start; @@ -2212,8 +3514,14 @@ int yaffs_WriteDataToFile(yaffs_Object *in,const __u8 * buffer, __u32 offset, in int n = nBytes; int nDone = 0; int nToWriteBack; - int endOfWrite = offset+nBytes; + int startOfWrite = offset; int chunkWritten = 0; + int nBytesRead; + + yaffs_Device *dev; + + dev = in->myDev; + while(n > 0 && chunkWritten >= 0) { @@ -2223,10 +3531,24 @@ int yaffs_WriteDataToFile(yaffs_Object *in,const __u8 * buffer, __u32 offset, in // OK now check for the curveball where the start and end are in // the same chunk. + if( (start + n) < YAFFS_BYTES_PER_CHUNK) { nToCopy = n; - nToWriteBack = (start + 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) * YAFFS_BYTES_PER_CHUNK); + + if(nBytesRead > YAFFS_BYTES_PER_CHUNK) + { + nBytesRead = YAFFS_BYTES_PER_CHUNK; + } + + nToWriteBack = (nBytesRead > (start + n)) ? nBytesRead : (start +n); + } else { @@ -2237,22 +3559,61 @@ int yaffs_WriteDataToFile(yaffs_Object *in,const __u8 * buffer, __u32 offset, in if(nToCopy != YAFFS_BYTES_PER_CHUNK) { // 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. + 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_CheckSpaceForChunkCache(in->myDev)) + { + cache = yaffs_GrabChunkCache(in->myDev); + cache->object = in; + cache->chunkId = chunk; + cache->dirty = 0; + yaffs_ReadChunkDataFromObject(in,chunk,cache->data); + } + + if(cache) + { + yaffs_UseChunkCache(dev,cache,1); + memcpy(&cache->data[start],buffer,nToCopy); + cache->nBytes = nToWriteBack; + } + 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. - yaffs_ReadChunkDataFromObject(in,chunk,localBuffer); + yaffs_ReadChunkDataFromObject(in,chunk,dev->localBuffer); - memcpy(&localBuffer[start],buffer,nToCopy); + memcpy(&dev->localBuffer[start],buffer,nToCopy); - chunkWritten = yaffs_WriteChunkDataToObject(in,chunk,localBuffer,nToWriteBack,0); + chunkWritten = yaffs_WriteChunkDataToObject(in,chunk,dev->localBuffer,nToWriteBack,0); - T(("Write with readback to chunk %d %d\n",chunk,chunkWritten)); + //T(("Write with readback to chunk %d %d start %d copied %d wrote back %d\n",chunk,chunkWritten,start, nToCopy, nToWriteBack)); + } } else { + +#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 + memcpy(dev->localBuffer,buffer,YAFFS_BYTES_PER_CHUNK); + chunkWritten = yaffs_WriteChunkDataToObject(in,chunk,dev->localBuffer,YAFFS_BYTES_PER_CHUNK,0); +#else // A full chunk. Write directly from the supplied buffer. chunkWritten = yaffs_WriteChunkDataToObject(in,chunk,buffer,YAFFS_BYTES_PER_CHUNK,0); - T(("Write to chunk %d %d\n",chunk,chunkWritten)); +#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)); } if(chunkWritten >= 0) @@ -2267,13 +3628,12 @@ int yaffs_WriteDataToFile(yaffs_Object *in,const __u8 * buffer, __u32 offset, in // Update file object - if(endOfWrite > in->variant.fileVariant.fileSize) + if((startOfWrite + nDone) > in->variant.fileVariant.fileSize) { - in->variant.fileVariant.fileSize = endOfWrite; + in->variant.fileVariant.fileSize = (startOfWrite + nDone); } in->dirty = 1; - in->st_mtime = CURRENT_TIME; return nDone; } @@ -2284,11 +3644,13 @@ int yaffs_ResizeFile(yaffs_Object *in, int newSize) int i; int chunkId; int oldFileSize = in->variant.fileVariant.fileSize; - int sizeOfLastChunk = newSize % YAFFS_BYTES_PER_CHUNK; + int sizeOfPartialChunk = newSize % YAFFS_BYTES_PER_CHUNK; yaffs_Device *dev = in->myDev; - __u8 localBuffer[YAFFS_BYTES_PER_CHUNK]; + + yaffs_FlushFilesChunkCache(in); + yaffs_InvalidateWholeChunkCache(in); if(in->variantType != YAFFS_OBJECT_TYPE_FILE) { @@ -2298,36 +3660,43 @@ int yaffs_ResizeFile(yaffs_Object *in, int newSize) if(newSize < oldFileSize) { - int lastDel = 1 + oldFileSize/YAFFS_BYTES_PER_CHUNK; + int lastDel = 1 + (oldFileSize-1)/YAFFS_BYTES_PER_CHUNK; int startDel = 1 + (newSize + YAFFS_BYTES_PER_CHUNK - 1)/ YAFFS_BYTES_PER_CHUNK; - for(i = startDel; i <= lastDel; i++) + // 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 || chunkId >= (dev->endBlock * 32)) + if(chunkId < (dev->internalStartBlock * dev->nChunksPerBlock) || + chunkId >= ((dev->internalEndBlock+1) * dev->nChunksPerBlock)) { - T(("Found daft chunkId %d for %d\n",chunkId,i)); + //T(("Found daft chunkId %d for %d\n",chunkId,i)); } else { - yaffs_DeleteChunk(dev,chunkId); + in->nDataChunks--; + yaffs_DeleteChunk(dev,chunkId,1); } } - if(sizeOfLastChunk != 0) + if(sizeOfPartialChunk != 0) { int lastChunk = 1+ newSize/YAFFS_BYTES_PER_CHUNK; // Got to read and rewrite the last chunk with its new size. - yaffs_ReadChunkDataFromObject(in,lastChunk,localBuffer); - - yaffs_WriteChunkDataToObject(in,lastChunk,localBuffer,sizeOfLastChunk,1); + // NB Got to zero pad to nuke old data + yaffs_ReadChunkDataFromObject(in,lastChunk,dev->localBuffer); + memset(dev->localBuffer + sizeOfPartialChunk,0, YAFFS_BYTES_PER_CHUNK - sizeOfPartialChunk); + + yaffs_WriteChunkDataToObject(in,lastChunk,dev->localBuffer,sizeOfPartialChunk,1); } @@ -2365,12 +3734,24 @@ loff_t yaffs_GetFileSize(yaffs_Object *obj) // yaffs_FlushFile() updates the file's // objectId in NAND -int yaffs_FlushFile(yaffs_Object *in) +int yaffs_FlushFile(yaffs_Object *in, int updateTime) { int retVal; if(in->dirty) { - retVal = yaffs_UpdateObjectHeader(in,NULL); + //T(("flushing object header\n")); + + yaffs_FlushFilesChunkCache(in); + if(updateTime) + { +#ifdef CONFIG_YAFFS_WINCE + yfsd_WinFileTimeNow(in->win_mtime); +#else + in->yst_mtime = Y_CURRENT_TIME; +#endif + } + + retVal = (yaffs_UpdateObjectHeader(in,NULL,0) >= 0)? YAFFS_OK : YAFFS_FAIL; } else { @@ -2384,8 +3765,22 @@ int yaffs_FlushFile(yaffs_Object *in) static int yaffs_DoGenericObjectDeletion(yaffs_Object *in) { + + // First off, invalidate the file's data in the cache, without flushing. + yaffs_InvalidateWholeChunkCache(in); + yaffs_RemoveObjectFromDirectory(in); - yaffs_DeleteChunk(in->myDev,in->chunkId); + yaffs_DeleteChunk(in->myDev,in->chunkId,1); + in->chunkId = -1; +#if 0 +#ifdef __KERNEL__ + if(in->myInode) + { + in->myInode->u.generic_ip = NULL; + in->myInode = NULL; + } +#endif +#endif yaffs_FreeObject(in); return YAFFS_OK; @@ -2394,13 +3789,92 @@ static int yaffs_DoGenericObjectDeletion(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_DeleteFile(yaffs_Object *in) +static int yaffs_UnlinkFile(yaffs_Object *in) { + +#ifdef CONFIG_YAFFS_DISABLE_BACKGROUND_DELETION + // Delete the file data & tnodes - yaffs_ResizeFile(in,0); + + yaffs_DeleteWorker(in, in->variant.fileVariant.top, in->variant.fileVariant.topLevel, 0,NULL); + + yaffs_FreeTnode(in->myDev,in->variant.fileVariant.top); return yaffs_DoGenericObjectDeletion(in); +#else + int retVal; + int immediateDeletion=0; + retVal = yaffs_ChangeObjectName(in, in->myDev->unlinkedDir,NULL,0); + if(1 || // Ignore the result of the change name. This will only fail + // if the disk was completely full (an error condition) + // We ignore the error so we can delete files to recover the disk + retVal == YAFFS_OK) + { + //in->unlinked = 1; + //in->myDev->nUnlinkedFiles++; + //in->renameAllowed = 0; +#ifdef __KERNEL__ + if(!in->myInode) + { + // Might be open at present, + // Caught by delete_inode in yaffs_fs.c + immediateDeletion = 1; + + } +#else + if(in->inUse <= 0) + { + immediateDeletion = 1; + + } +#endif + + if(immediateDeletion) + { + T(YAFFS_TRACE_TRACING,(TSTR("yaffs: immediate deletion of file %d" TENDSTR),in->objectId)); + in->deleted=1; + in->myDev->nDeletedFiles++; + yaffs_SoftDeleteFile(in); + } + + } + return retVal; + + +#endif +} + +int yaffs_DeleteFile(yaffs_Object *in) +{ + int retVal = YAFFS_OK; + + if(in->nDataChunks > 0) + { + // Use soft deletion + if(!in->unlinked) + { + retVal = yaffs_UnlinkFile(in); + } + 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); + in->variant.fileVariant.top = NULL; + yaffs_DoGenericObjectDeletion(in); + + return YAFFS_OK; + } } static int yaffs_DeleteDirectory(yaffs_Object *in) @@ -2431,6 +3905,20 @@ static int yaffs_DeleteHardLink(yaffs_Object *in) } +static void yaffs_AbortHalfCreatedObject(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. + } +} + + static int yaffs_UnlinkWorker(yaffs_Object *obj) { @@ -2441,85 +3929,6 @@ static int yaffs_UnlinkWorker(yaffs_Object *obj) } else if(!list_empty(&obj->hardLinks)) { -#if 0 - // Curve ball: We're unlinking an object that has a hardlink. - // Therefore we can't really delete the object. - // Instead, we do the following: - // - Select a hardlink. - // - Re-type a hardlink as the equivalent object and populate the fields, including the - // objectId. Updating the object id is important so that all the hardlinks do not need - // to be rewritten. - // - Update the equivalet object pointers. - // - Delete all object. - - yaffs_Object *hl; - struct list_head *i; - - - yaffs_RemoveObjectFromDirectory(obj); - - - - hl = list_entry(obj->hardLinks.next, yaffs_Object,hardLinks); - - hl->dirty = 1; - hl->st_mode = obj->st_mode; - hl->st_uid = obj->st_uid; - hl->st_gid = obj->st_gid; - hl->st_atime = obj->st_atime; - hl->st_mtime = obj->st_mtime; - hl->st_ctime = obj->st_ctime; - - hl->variantType = obj->variantType; - - switch(hl->variantType) - { - case YAFFS_OBJECT_TYPE_FILE: - case YAFFS_OBJECT_TYPE_SYMLINK: - // These types are OK to just copy across. - hl->variant = obj->variant; - break; - case YAFFS_OBJECT_TYPE_DIRECTORY: - // Fix the list up - list_add(&hl->variant.directoryVariant.children, - &obj->variant.directoryVariant.children); - list_del(&obj->variant.directoryVariant.children); - - // Now change all the directory children to point to the new parent. - list_for_each(i,&hl->variant.directoryVariant.children) - { - list_entry(i,yaffs_Object,siblings)->parent = hl; - } - break; - - case YAFFS_OBJECT_TYPE_HARDLINK: - case YAFFS_OBJECT_TYPE_UNKNOWN: - // Should not be either of these types. - } - - // Now fix up the hardlink chain - list_del(&obj->hardLinks); - - list_for_each(i,&hl->hardLinks) - { - list_entry(i,yaffs_Object,hardLinks)->variant.hardLinkVariant.equivalentObject = hl; - list_entry(i,yaffs_Object,hardLinks)->variant.hardLinkVariant.equivalentObjectId = hl->objectId; - } - - // Now fix up the hash links. - yaffs_UnhashObject(hl); - hl->objectId = obj->objectId; - yaffs_HashObject(hl); - - // Update the hardlink which has become an object - yaffs_UpdateObjectHeader(hl,NULL); - - // Finally throw away the deleted object - yaffs_DeleteChunk(obj->myDev,obj->chunkId); - yaffs_FreeObject(obj); - - return YAFFS_OK; -#else // Curve ball: We're unlinking an object that has a hardlink. // // This problem arises because we are not strictly following @@ -2539,20 +3948,19 @@ static int yaffs_UnlinkWorker(yaffs_Object *obj) char 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); + retVal = yaffs_ChangeObjectName(obj, hl->parent, name,0); + if(retVal == YAFFS_OK) { retVal = yaffs_DoGenericObjectDeletion(hl); } return retVal; - -#endif - } else @@ -2560,7 +3968,7 @@ static int yaffs_UnlinkWorker(yaffs_Object *obj) switch(obj->variantType) { case YAFFS_OBJECT_TYPE_FILE: - return yaffs_DeleteFile(obj); + return yaffs_UnlinkFile(obj); break; case YAFFS_OBJECT_TYPE_DIRECTORY: return yaffs_DeleteDirectory(obj); @@ -2568,6 +3976,9 @@ static int yaffs_UnlinkWorker(yaffs_Object *obj) 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: @@ -2591,9 +4002,50 @@ int yaffs_Unlink(yaffs_Object *dir, const char *name) } -//////////////// Initialisation Scanning ///////////////// - - +//////////////// Initialisation Scanning ///////////////// + + + +// For now we use the SmartMedia check. +// We look at the blockStatus byte in the first two chunks +// These must be 0xFF to pass as OK. +// todo: this function needs to be modifyable foir different NAND types +// and different chunk sizes. Suggest make this into a per-device configurable +// function. +static int yaffs_IsBlockBad(yaffs_Device *dev, int blk) +{ + yaffs_Spare spare; + + yaffs_ReadChunkFromNAND(dev,blk * dev->nChunksPerBlock,NULL,&spare,1); +#if 1 + if(yaffs_CountBits(spare.blockStatus) < 7) + { + return 1; + } +#else + if(spare.blockStatus != 0xFF) + { + return 1; + } +#endif + yaffs_ReadChunkFromNAND(dev,blk * dev->nChunksPerBlock + 1,NULL,&spare,1); + +#if 1 + if(yaffs_CountBits(spare.blockStatus) < 7) + { + return 1; + } +#else + if(spare.blockStatus != 0xFF) + { + return 1; + } +#endif + + return 0; + +} + static int yaffs_Scan(yaffs_Device *dev) { yaffs_Spare spare; @@ -2602,12 +4054,11 @@ static int yaffs_Scan(yaffs_Device *dev) int chunk; int c; int deleted; - int inuse; yaffs_BlockState state; yaffs_Object *hardList = NULL; yaffs_Object *hl; - - __u32 pageBits; + yaffs_BlockInfo *bi; + yaffs_ObjectHeader *oh; yaffs_Object *in; @@ -2615,102 +4066,183 @@ static int yaffs_Scan(yaffs_Device *dev) __u8 chunkData[YAFFS_BYTES_PER_CHUNK]; - for(blk = dev->startBlock; blk <= dev->endBlock; blk++) + + // Scan all the blocks... + + for(blk = dev->internalStartBlock; blk <= dev->internalEndBlock; blk++) { deleted = 0; - pageBits = 0; - inuse = 0; - state = YAFFS_BLOCK_STATE_UNKNOWN; + bi = yaffs_GetBlockInfo(dev,blk); + yaffs_ClearChunkBits(dev,blk); + bi->pagesInUse = 0; + bi->softDeletions = 0; + state = YAFFS_BLOCK_STATE_SCANNING; + + + if(yaffs_IsBlockBad(dev,blk)) + { + state = YAFFS_BLOCK_STATE_DEAD; + T(YAFFS_TRACE_BAD_BLOCKS,(TSTR("block %d is bad" TENDSTR),blk)); + } + + // Read each chunk in the block. - for(c = 0; c < YAFFS_CHUNKS_PER_BLOCK && - state == YAFFS_BLOCK_STATE_UNKNOWN; c++) + for(c = 0; c < dev->nChunksPerBlock && + state == YAFFS_BLOCK_STATE_SCANNING; c++) { // Read the spare area and decide what to do - chunk = blk * YAFFS_CHUNKS_PER_BLOCK + c; - yaffs_ReadChunkFromNAND(dev,chunk,NULL,&spare); + chunk = blk * dev->nChunksPerBlock + c; + + yaffs_ReadChunkFromNAND(dev,chunk,NULL,&spare,1); - // Is this a valid block? - if(yaffs_countBits[spare.blockStatus] >= 7) + // This block looks ok, now what's in this chunk? + yaffs_GetTagsFromSpare(dev,&spare,&tags); + + if(yaffs_CountBits(spare.pageStatus) < 6) + { + // A deleted chunk + deleted++; + dev->nFreeChunks ++; + //T((" %d %d deleted\n",blk,c)); + } + else if(tags.objectId == YAFFS_UNUSED_OBJECT_ID) + { + // 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) + { + // 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)); + state = YAFFS_BLOCK_STATE_ALLOCATING; + dev->allocationBlock = blk; + dev->allocationPage = c; + } + + dev->nFreeChunks += (dev->nChunksPerBlock - c); + } + else if(tags.chunkId > 0) + { + int endpos; + // A data chunk. + 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)* YAFFS_BYTES_PER_CHUNK + tags.byteCount; + if(in->variant.fileVariant.scannedFileSize variant.fileVariant.scannedFileSize = endpos; +#ifndef CONFIG_YAFFS_USE_HEADER_FILE_SIZE + in->variant.fileVariant.fileSize = + in->variant.fileVariant.scannedFileSize; +#endif + + } + //T((" %d %d data %d %d\n",blk,c,tags.objectId,tags.chunkId)); + } + else { - // This block looks ok, now what's in this chunk? - yaffs_GetTagsFromSpare(&spare,&tags); + // 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_ReadChunkFromNAND(dev,chunk,chunkData,NULL,1); + + oh = (yaffs_ObjectHeader *)chunkData; + + in = yaffs_FindOrCreateObjectByNumber(dev,tags.objectId,oh->type); - if(tags.objectId == YAFFS_UNUSED_OBJECT_ID) + if(in->valid) { - // An unassigned chunk in the block - // This means that either the block is empty or - // this is the one being allocated from + // We have already filled this one. We have a duplicate and need to resolve it. - if(c == 0) + unsigned existingSerial = in->serial; + unsigned newSerial = tags.serialNumber; + + if(((existingSerial+1) & 3) == newSerial) { - // the block is unused - state = YAFFS_BLOCK_STATE_EMPTY; - dev->nErasedBlocks++; + // Use new one - destroy the exisiting one + yaffs_DeleteChunk(dev,in->chunkId,1); + in->valid = 0; } else { - // this is the block being allocated from - T((" allocating %d %d\n",blk,c)); - state = YAFFS_BLOCK_STATE_ALLOCATING; - dev->allocationBlock = blk; - dev->allocationPage = c; + // Use existing - destroy this one. + yaffs_DeleteChunk(dev,chunk,1); } - - dev->nFreeChunks += (YAFFS_CHUNKS_PER_BLOCK - c); - } - else if(tags.objectId == 0) - { - // A deleted chunk - deleted++; - dev->nFreeChunks ++; - T((" %d %d deleted\n",blk,c)); } - else if(tags.chunkId > 0) + + if(!in->valid && + (tags.objectId == YAFFS_OBJECTID_ROOT || + tags.objectId == YAFFS_OBJECTID_LOSTNFOUND)) { - // A data chunk. - inuse++; - pageBits |= ( 1 <valid = 1; + in->variantType = oh->type; + + 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]; + in->win_mtime[0] = oh->win_mtime[0]; + in->win_atime[1] = oh->win_atime[1]; + 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_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 + else if(!in->valid) { - // chunkId == 0, so it is an ObjectHeader. - inuse++; - pageBits |= ( 1 <type); - if(in->valid) - { - // todo we have already filled this one. We have - // a duplicate. Need to fix - } - - // we don't have a duplicate... - + // we need to load this info + in->valid = 1; in->variantType = oh->type; - - in->st_mode = oh->st_mode; - in->st_uid = oh->st_uid; - in->st_gid = oh->st_gid; - in->st_atime = oh->st_atime; - in->st_mtime = oh->st_mtime; - in->st_ctime = oh->st_ctime; + + 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]; + in->win_mtime[0] = oh->win_mtime[0]; + in->win_atime[1] = oh->win_atime[1]; + 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_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; - in->sum = oh->sum; + 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) { @@ -2722,60 +4254,72 @@ static int yaffs_Scan(yaffs_Device *dev) { // Hoosterman, another problem.... // We're trying to use a non-directory as a directory - // Todo ... handle + + 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); - + + yaffs_AddObjectToDirectory(parent,in); + if(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: +#ifdef CONFIG_YAFFS_USE_HEADER_FILE_SIZE in->variant.fileVariant.fileSize = oh->fileSize; +#endif break; case YAFFS_OBJECT_TYPE_HARDLINK: in->variant.hardLinkVariant.equivalentObjectId = oh->equivalentObjectId; - (yaffs_Object *)(in->hardLinks.next) = hardList; + 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; } - T((" %d %d header %d \"%s\" type %d\n",blk,c,tags.objectId,oh->name,in->variantType)); + //T((" %d %d header %d \"%s\" type %d\n",blk,c,tags.objectId,oh->name,in->variantType)); } } - else - { - // it's a bad block - state = YAFFS_BLOCK_STATE_DEAD; - } } - if(state == YAFFS_BLOCK_STATE_UNKNOWN) + if(state == YAFFS_BLOCK_STATE_SCANNING) { - // If we got this far, then the block is fully allocated. - // ie. Full or Dirty - state = (inuse) ? YAFFS_BLOCK_STATE_FULL : YAFFS_BLOCK_STATE_DIRTY; - + // If we got this far while scanning, then the block is fully allocated. + state = YAFFS_BLOCK_STATE_FULL; } - dev->blockInfo[blk].pageBits = pageBits; - dev->blockInfo[blk].pagesInUse = inuse; - dev->blockInfo[blk].blockState = state; + bi->blockState = state; + // Now let's see if it was dirty + if( bi->pagesInUse == 0 && + bi->blockState == YAFFS_BLOCK_STATE_FULL) + { + yaffs_BlockBecameDirty(dev,blk); + } + } - // Todo fix up the hard link chains + // 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; @@ -2785,12 +4329,14 @@ static int yaffs_Scan(yaffs_Device *dev) if(in) { + // Add the hardlink pointers hl->variant.hardLinkVariant.equivalentObject=in; list_add(&hl->hardLinks,&in->hardLinks); } else { - //Todo Need to report this better. + //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); @@ -2798,6 +4344,24 @@ static int yaffs_Scan(yaffs_Device *dev) } + { + 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); + if(l->deleted) + { + yaffs_SoftDeleteFile(l); + } + } + } + } return YAFFS_OK; @@ -2824,6 +4388,13 @@ static void yaffs_AddObjectToDirectory(yaffs_Object *directory, yaffs_Object *ob // Now add it list_add(&obj->siblings,&directory->variant.directoryVariant.children); obj->parent = directory; + + if(directory == obj->myDev->unlinkedDir) + { + obj->unlinked = 1; + obj->myDev->nUnlinkedFiles++; + obj->renameAllowed = 0; + } } static void yaffs_RemoveObjectFromDirectory(yaffs_Object *obj) @@ -2837,8 +4408,7 @@ yaffs_Object *yaffs_FindObjectByName(yaffs_Object *directory,const char *name) int sum; struct list_head *i; - __u8 buffer[YAFFS_BYTES_PER_CHUNK]; - yaffs_ObjectHeader *oh = (yaffs_ObjectHeader *)buffer; + char buffer[YAFFS_MAX_NAME_LENGTH+1]; yaffs_Object *l; @@ -2846,26 +4416,28 @@ yaffs_Object *yaffs_FindObjectByName(yaffs_Object *directory,const char *name) list_for_each(i,&directory->variant.directoryVariant.children) { - l = list_entry(i, yaffs_Object,siblings); - - // Special case for lost-n-found - if(l->objectId == YAFFS_OBJECTID_LOSTNFOUND) + if(i) { - if(strcmp(name,YAFFS_LOSTNFOUND_NAME) == 0) + l = list_entry(i, yaffs_Object,siblings); + + // Special case for lost-n-found + if(l->objectId == YAFFS_OBJECTID_LOSTNFOUND) { - return l; + if(yaffs_strcmp(name,YAFFS_LOSTNFOUND_NAME) == 0) + { + return l; + } } - } - else if(l->sum == sum) - { - // Do a real check - yaffs_ReadChunkFromNAND(l->myDev,l->chunkId,buffer,NULL); - if(strcmp(name,oh->name) == 0) + else if(yaffs_SumCompare(l->sum, sum)) { - return l; - } - + // Do a real check + yaffs_GetObjectName(l,buffer,YAFFS_MAX_NAME_LENGTH); + if(yaffs_strcmp(name,buffer) == 0) + { + return l; + } + } } } @@ -2881,10 +4453,13 @@ int yaffs_ApplyToDirectoryChildren(yaffs_Object *theDir,int (*fn)(yaffs_Object * list_for_each(i,&theDir->variant.directoryVariant.children) { - l = list_entry(i, yaffs_Object,siblings); - if(!fn(l)) + if(i) { - return YAFFS_FAIL; + l = list_entry(i, yaffs_Object,siblings); + if(l && !fn(l)) + { + return YAFFS_FAIL; + } } } @@ -2896,7 +4471,7 @@ int yaffs_ApplyToDirectoryChildren(yaffs_Object *theDir,int (*fn)(yaffs_Object * // GetEquivalentObject dereferences any hard links to get to the // actual object. -static yaffs_Object *yaffs_GetEquivalentObject(yaffs_Object *obj) +yaffs_Object *yaffs_GetEquivalentObject(yaffs_Object *obj) { if(obj && obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK) { @@ -2915,6 +4490,20 @@ int yaffs_GetObjectName(yaffs_Object *obj,char *name,int buffSize) { strncpy(name,YAFFS_LOSTNFOUND_NAME,buffSize - 1); } + else if(obj->chunkId <= 0) + { + char locName[20]; + // make up a name + sprintf(locName,"%s%d",YAFFS_LOSTNFOUND_PREFIX,obj->objectId); + strncpy(name,locName,buffSize - 1); + + } +#ifdef CONFIG_YAFFS_SHORT_NAMES_IN_RAM + else if(obj->shortName[0]) + { + strcpy(name,obj->shortName); + } +#endif else { __u8 buffer[YAFFS_BYTES_PER_CHUNK]; @@ -2924,7 +4513,7 @@ int yaffs_GetObjectName(yaffs_Object *obj,char *name,int buffSize) if(obj->chunkId >= 0) { - yaffs_ReadChunkFromNAND(obj->myDev,obj->chunkId,buffer,NULL); + yaffs_ReadChunkFromNAND(obj->myDev,obj->chunkId,buffer,NULL,1); } strncpy(name,oh->name,buffSize - 1); } @@ -2955,12 +4544,16 @@ int yaffs_GetObjectFileLength(yaffs_Object *obj) int yaffs_GetObjectLinkCount(yaffs_Object *obj) { - int count = 1; // the object itself + int count = 0; struct list_head *i; + if(!obj->unlinked) + { + count++; // the object itself + } list_for_each(i,&obj->hardLinks) { - count++; + count++; // add the hard links; } return count; @@ -2984,6 +4577,11 @@ unsigned yaffs_GetObjectType(yaffs_Object *obj) 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; } } @@ -3001,38 +4599,42 @@ char *yaffs_GetSymlinkAlias(yaffs_Object *obj) } } +#ifndef CONFIG_YAFFS_WINCE int yaffs_SetAttributes(yaffs_Object *obj, struct iattr *attr) { unsigned int valid = attr->ia_valid; - if(valid & ATTR_MODE) obj->st_mode = attr->ia_mode; - if(valid & ATTR_UID) obj->st_uid = attr->ia_uid; - if(valid & ATTR_GID) obj->st_gid = attr->ia_gid; + 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->st_atime = attr->ia_atime; - if(valid & ATTR_CTIME) obj->st_ctime = attr->ia_ctime; - if(valid & ATTR_MTIME) obj->st_mtime = attr->ia_mtime; + 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); + yaffs_UpdateObjectHeader(obj,NULL,1); return YAFFS_OK; } + int yaffs_GetAttributes(yaffs_Object *obj, struct iattr *attr) { unsigned int valid = 0; - attr->ia_mode = obj->st_mode; valid |= ATTR_MODE; - attr->ia_uid = obj->st_uid; valid |= ATTR_UID; - attr->ia_gid = obj->st_gid; valid |= ATTR_GID; + 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; - attr->ia_atime = obj->st_atime; valid |= ATTR_ATIME; - attr->ia_ctime = obj->st_ctime; valid |= ATTR_CTIME; - attr->ia_mtime = obj->st_mtime; valid |= ATTR_MTIME; + 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; @@ -3041,25 +4643,25 @@ int yaffs_GetAttributes(yaffs_Object *obj, struct iattr *attr) } - +#endif int yaffs_DumpObject(yaffs_Object *obj) { - __u8 buffer[YAFFS_BYTES_PER_CHUNK]; - char name[256]; +// __u8 buffer[YAFFS_BYTES_PER_CHUNK]; + char name[257]; // yaffs_ObjectHeader *oh = (yaffs_ObjectHeader *)buffer; - memset(buffer,0,YAFFS_BYTES_PER_CHUNK); +// memset(buffer,0,YAFFS_BYTES_PER_CHUNK); - if(obj->chunkId >= 0) - { - yaffs_ReadChunkFromNAND(obj->myDev,obj->chunkId,buffer,NULL); - } +// if(obj->chunkId >= 0) +// { +// yaffs_ReadChunkFromNAND(obj->myDev,obj->chunkId,buffer,NULL); +// } yaffs_GetObjectName(obj,name,256); - YPRINTF(("Object %d \"%s\"\n dirty %d valid %d serial %d sum %d chunk %d type %d size %d\n", - yaffs_GetObjectInode(obj), name, obj->dirty, obj->valid, obj->serial, + 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))); #if 0 @@ -3091,68 +4693,179 @@ int yaffs_DumpObject(yaffs_Object *obj) int yaffs_GutsInitialise(yaffs_Device *dev) { - unsigned nChunks,x; + unsigned x; int bits; + int extraBits; + int nBlocks; + + if( dev->nBytesPerChunk != YAFFS_BYTES_PER_CHUNK || + dev->nChunksPerBlock < 2 || + dev->nReservedBlocks < 2 || + dev->startBlock < 0 || + dev->endBlock <= 0 || + dev->endBlock <= (dev->startBlock + dev->nReservedBlocks) + ) + { + //these parameters must be set before stating yaffs + // Other parameters internalStartBlock, + return YAFFS_FAIL; + } - dev = dev; 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))); return YAFFS_FAIL; } + dev->isMounted = 1; + + if(dev->startBlock < 0 || + (dev->endBlock - dev->startBlock) < 10) + { + T(YAFFS_TRACE_ALWAYS,(TSTR("startBlock %d or endBlock %d invalid\n" TENDSTR), + dev->startBlock, dev->endBlock)); + return YAFFS_FAIL; + } + + + // Do we need to add an offset to use block 0? + + dev->internalStartBlock = dev->startBlock; + dev->internalEndBlock = dev->endBlock; + dev->blockOffset = 0; + dev->chunkOffset = 0; + + if(dev->startBlock == 0) + { + dev->internalStartBlock++; + dev->internalEndBlock++; + dev->blockOffset++; + dev->chunkOffset = dev->nChunksPerBlock; + } + + + nBlocks = dev->internalEndBlock - dev->internalStartBlock + 1; + + // OK now calculate a few things for the device // Calculate chunkGroupBits. - // If there are 64k or less chunks then this is 1 - // Else it is log2(nChunks) - 16 - // - x = nChunks = YAFFS_CHUNKS_PER_BLOCK * dev->nBlocks; + // We need to find the next power of 2 > than internalEndBlock + + x = dev->nChunksPerBlock * (dev->internalEndBlock+1); - for(bits = 0, x = nChunks; (x & 1) == 0; bits++) + for(bits = extraBits = 0; x > 1; bits++) { + if(x & 1) extraBits++; x >>= 1; } + + if(extraBits > 0) bits++; - if( x != 1) - { - // Not a power of 2 - YPRINTF(("nBlocks should be a power of 2 but is %u\n", - dev->nBlocks)); - return YAFFS_FAIL; - } + // 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; - dev->chunkGroupSize = 1; } else { dev->chunkGroupBits = bits - 16; - dev->chunkGroupSize = nChunks/0x10000; } + 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". + + return YAFFS_FAIL; + } + + + + // More device initialisation - dev->garbageCollectionRequired = 0; + dev->garbageCollections = 0; + dev->passiveGarbageCollections = 0; dev->currentDirtyChecker = 0; + dev->bufferedBlock = -1; + dev->doingBufferedBlockRewrite = 0; + dev->nDeletedFiles = 0; + dev->nBackgroundDeletions=0; + dev->nUnlinkedFiles = 0; + dev->eccFixed=0; + dev->eccUnfixed=0; + dev->tagsEccFixed=0; + dev->tagsEccUnfixed=0; + dev->nErasedBlocks=0; + + dev->localBuffer = YMALLOC(dev->nBytesPerChunk); + + - yaffs_InitialiseBlocks(dev); + + yaffs_InitialiseBlocks(dev,nBlocks); yaffs_InitialiseTnodes(dev); yaffs_InitialiseObjects(dev); + if(dev->nShortOpCaches > 0) + { + int i; + + 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[i].object = NULL; + dev->srCache[i].lastUse = 0; + dev->srCache[i].dirty = 0; + } + dev->srLastUse = 0; + } + + dev->cacheHits = 0; + + + // Initialise the unlinked, root and lost and found directories + dev->lostNFoundDir = dev->rootDir = dev->unlinkedDir = NULL; - // Initialise the root and lost and found directories - dev->lostNFoundDir = dev->rootDir = NULL; + dev->unlinkedDir = yaffs_CreateFakeDirectory(dev,YAFFS_OBJECTID_UNLINKED, S_IFDIR); + dev->rootDir = yaffs_CreateFakeDirectory(dev,YAFFS_OBJECTID_ROOT,YAFFS_ROOT_MODE | S_IFDIR); - dev->lostNFoundDir = yaffs_CreateFakeDirectory(dev,YAFFS_OBJECTID_LOSTNFOUND,YAFFS_ROOT_MODE | S_IFDIR); + dev->lostNFoundDir = yaffs_CreateFakeDirectory(dev,YAFFS_OBJECTID_LOSTNFOUND,YAFFS_LOSTNFOUND_MODE | S_IFDIR); yaffs_AddObjectToDirectory(dev->rootDir,dev->lostNFoundDir); + // Now scan the flash. yaffs_Scan(dev); + + // Zero out stats + dev->nPageReads = 0; + dev->nPageWrites = 0; + dev->nBlockErasures = 0; + dev->nGCCopies = 0; + dev->nRetriedWrites = 0; + dev->nRetiredBlocks = 0; return YAFFS_OK; @@ -3161,26 +4874,133 @@ int yaffs_GutsInitialise(yaffs_Device *dev) void yaffs_Deinitialise(yaffs_Device *dev) { - yaffs_DeinitialiseBlocks(dev); - yaffs_DeinitialiseTnodes(dev); - yaffs_DeinitialiseObjects(dev); + if(dev->isMounted) + { + + yaffs_DeinitialiseBlocks(dev); + yaffs_DeinitialiseTnodes(dev); + yaffs_DeinitialiseObjects(dev); + if(dev->nShortOpCaches > 0) + YFREE(dev->srCache); + YFREE(dev->localBuffer); + dev->isMounted = 0; + } + +} + +#if 0 + +int yaffs_GetNumberOfFreeChunks(yaffs_Device *dev) +{ + int nFree = dev->nFreeChunks - (dev->nChunksPerBlock * YAFFS_RESERVED_BLOCKS); + + struct list_head *i; + yaffs_Object *l; + + + // To the free chunks add the chunks that are in the deleted unlinked files. + list_for_each(i,&dev->unlinkedDir->variant.directoryVariant.children) + { + l = list_entry(i, yaffs_Object,siblings); + if(l->deleted) + { + nFree++; + nFree += l->nDataChunks; + } + } + + + // printf("___________ nFreeChunks is %d nFree is %d\n",dev->nFreeChunks,nFree); + + if(nFree < 0) nFree = 0; + + return nFree; } +#endif + int yaffs_GetNumberOfFreeChunks(yaffs_Device *dev) { - int nFree = dev->nFreeChunks - (YAFFS_CHUNKS_PER_BLOCK * YAFFS_RESERVED_BLOCKS); + int nFree; + int pending; + int b; + int nDirtyCacheChunks=0; + + yaffs_BlockInfo *blk; + + struct list_head *i; + yaffs_Object *l; + + 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_FULL: nFree += (dev->nChunksPerBlock - blk->pagesInUse); break; + default: break; + } + } + + + pending = 0; + + // To the free chunks add the chunks that are in the deleted unlinked files. + list_for_each(i,&dev->unlinkedDir->variant.directoryVariant.children) + { + if(i) + { + l = list_entry(i, yaffs_Object,siblings); + if(l->deleted) + { + pending++; + pending += l->nDataChunks; + } + } + } + + + + //printf("___________ really free is %d, pending %d, nFree is %d\n",nFree,pending, nFree+pending); + + if(nFree != dev->nFreeChunks) + { + // printf("___________Different! really free is %d, nFreeChunks %d\n",nFree dev->nFreeChunks); + } + + nFree += pending; + + // Now count the number of dirty chunks in the cache and subtract those + + { + int i; + for(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 < 0) ? 0 : nFree; + return nFree; } + /////////////////// YAFFS test code ////////////////////////////////// #define yaffs_CheckStruct(structure,syze, name) \ if(sizeof(structure) != syze) \ - { YPRINTF(("%s should be %d but is %d\n",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; \ } @@ -3190,27 +5010,33 @@ 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") +#ifndef CONFIG_YAFFS_TNODE_LIST_DEBUG yaffs_CheckStruct(yaffs_Tnode,2* YAFFS_NTNODES_LEVEL0,"yaffs_Tnode") +#endif yaffs_CheckStruct(yaffs_ObjectHeader,512,"yaffs_ObjectHeader") return YAFFS_OK; } +#if 0 void yaffs_GutsTest(yaffs_Device *dev) { if(yaffs_CheckStructures() != YAFFS_OK) { - YPRINTF(("One or more structures malformed-- aborting\n")); - } - else - { - YPRINTF(("Structures OK\n")); + T(YAFFS_TRACE_ALWAYS,(TSTR("One or more structures malformed-- aborting\n" TENDSTR))); + return; } yaffs_TnodeTest(dev); yaffs_ObjectTest(dev); } +#endif + + + + +