X-Git-Url: http://aleph1.co.uk/gitweb/?a=blobdiff_plain;f=yaffs_guts.c;h=5cbd371a938ecafc39814e049f7ca0381eac1e78;hb=2f1fbd5011ef15fa3d1c95dc24dcc656a9aa9b5f;hp=d7246590925400795b7831e3e74fe9d4fac54c8e;hpb=f312fc5a4e1e46509129caf3d7fd2edafc743d15;p=yaffs%2F.git diff --git a/yaffs_guts.c b/yaffs_guts.c index d724659..5cbd371 100644 --- a/yaffs_guts.c +++ b/yaffs_guts.c @@ -14,22 +14,25 @@ */ //yaffs_guts.c -const char *yaffs_guts_c_version="$Id: yaffs_guts.c,v 1.23 2003-04-03 17:32:11 charles Exp $"; +const char *yaffs_guts_c_version="$Id: yaffs_guts.c,v 1.27 2003-08-16 08:17:32 charles Exp $"; #include "yportenv.h" #include "yaffsinterface.h" #include "yaffs_guts.h" - - - #define YAFFS_PASSIVE_GC_CHUNKS 2 +#if 0 +// 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. @@ -239,10 +242,10 @@ int yaffs_ReadChunkFromNAND(struct yaffs_DeviceStruct *dev, int eccResult1,eccResult2; __u8 calcEcc[3]; - nand_calculate_ecc(data,calcEcc); - eccResult1 = nand_correct_data (data,spare->ecc1, calcEcc); - nand_calculate_ecc(&data[256],calcEcc); - eccResult2 = nand_correct_data (&data[256],spare->ecc2, calcEcc); + 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) { @@ -582,8 +585,8 @@ void yaffs_SetObjectName(yaffs_Object *obj, const char *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) @@ -1622,7 +1625,12 @@ yaffs_Object *yaffs_CreateNewObject(yaffs_Device *dev,int number,yaffs_ObjectTyp theObject->win_ctime[1] = theObject->win_mtime[1] = theObject->win_atime[1]; #else - theObject->st_atime = theObject->st_mtime = theObject->st_ctime = CURRENT_TIME; + +#if defined(CONFIG_KERNEL_2_5) + theObject->st_atime = theObject->st_mtime = theObject->st_ctime = CURRENT_TIME.tv_sec; +#else + theObject->st_atime = theObject->st_mtime = theObject->st_ctime = CURRENT_TIME; +#endif #endif switch(type) { @@ -1725,8 +1733,12 @@ yaffs_Object *yaffs_MknodObject( yaffs_ObjectType type, in->win_ctime[0] = in->win_mtime[0] = in->win_atime[0]; in->win_ctime[1] = in->win_mtime[1] = in->win_atime[0]; +#else +#if defined(CONFIG_KERNEL_2_5) + in->st_atime = in->st_mtime = in->st_ctime = CURRENT_TIME.tv_sec; #else in->st_atime = in->st_mtime = in->st_ctime = CURRENT_TIME; +#endif in->st_rdev = rdev; in->st_uid = uid; in->st_gid = gid; @@ -3162,7 +3174,7 @@ static yaffs_ChunkCache *yaffs_GrabChunkCacheWorker(yaffs_Device *dev) { //T(("Grabbing empty %d\n",i)); - printf("Grabbing empty %d\n",i); + //printf("Grabbing empty %d\n",i); return &dev->srCache[i]; } @@ -3186,7 +3198,7 @@ static yaffs_ChunkCache *yaffs_GrabChunkCacheWorker(yaffs_Device *dev) //T(("Grabbing non-empty %d\n",theOne)); - if(theOne >= 0) printf("Grabbed non-empty cache %d\n",theOne); + //if(theOne >= 0) printf("Grabbed non-empty cache %d\n",theOne); return theOne >= 0 ? &dev->srCache[theOne] : NULL; } @@ -3239,7 +3251,7 @@ static yaffs_ChunkCache *yaffs_GrabChunkCache(yaffs_Device *dev) if(!cache || cache->dirty) { - printf("Dirty "); + //printf("Dirty "); yaffs_FlushFilesChunkCache(theObj); // Try again @@ -3247,7 +3259,7 @@ static yaffs_ChunkCache *yaffs_GrabChunkCache(yaffs_Device *dev) } else { - printf(" pushout %d\n",pushout); + //printf(" pushout %d\n",pushout); } } @@ -3620,7 +3632,7 @@ int yaffs_ResizeFile(yaffs_Object *in, int newSize) // using yaffs_DeleteChunk chunkId = yaffs_FindAndDeleteChunkInFile(in,i,NULL); - if(chunkId <= 0 || chunkId >= (dev->endBlock * 32)) + if(chunkId < (dev->startBlock * 32) || chunkId >= ((dev->endBlock+1) * 32)) { //T(("Found daft chunkId %d for %d\n",chunkId,i)); } @@ -3689,8 +3701,12 @@ int yaffs_FlushFile(yaffs_Object *in, int updateTime) { #ifdef CONFIG_YAFFS_WINCE yfsd_WinFileTimeNow(in->win_mtime); +#else +#if defined(CONFIG_KERNEL_2_5) + in->st_mtime = CURRENT_TIME.tv_sec; #else in->st_mtime = CURRENT_TIME; +#endif #endif } @@ -4543,9 +4559,15 @@ int yaffs_SetAttributes(yaffs_Object *obj, struct iattr *attr) if(valid & ATTR_UID) obj->st_uid = attr->ia_uid; if(valid & ATTR_GID) obj->st_gid = attr->ia_gid; +#if defined(CONFIG_KERNEL_2_5) + if(valid & ATTR_ATIME) obj->st_atime = attr->ia_atime.tv_sec; + if(valid & ATTR_CTIME) obj->st_ctime = attr->ia_ctime.tv_sec; + if(valid & ATTR_MTIME) obj->st_mtime = attr->ia_mtime.tv_sec; +#else 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; +#endif if(valid & ATTR_SIZE) yaffs_ResizeFile(obj,attr->ia_size); @@ -4562,10 +4584,15 @@ int yaffs_GetAttributes(yaffs_Object *obj, struct iattr *attr) attr->ia_uid = obj->st_uid; valid |= ATTR_UID; attr->ia_gid = obj->st_gid; valid |= ATTR_GID; +#if defined(CONFIG_KERNEL_2_5) + attr->ia_atime.tv_sec = obj->st_atime; valid |= ATTR_ATIME; + attr->ia_ctime.tv_sec = obj->st_ctime; valid |= ATTR_CTIME; + attr->ia_mtime.tv_sec = obj->st_mtime; valid |= ATTR_MTIME; +#else 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; - +#endif attr->ia_size = yaffs_GetFileSize(obj); valid |= ATTR_SIZE; attr->ia_valid = valid; @@ -4810,7 +4837,7 @@ int yaffs_GetNumberOfFreeChunks(yaffs_Device *dev) } - printf("___________ nFreeChunks is %d nFree is %d\n",dev->nFreeChunks,nFree); + // printf("___________ nFreeChunks is %d nFree is %d\n",dev->nFreeChunks,nFree); if(nFree < 0) nFree = 0; @@ -4825,6 +4852,7 @@ int yaffs_GetNumberOfFreeChunks(yaffs_Device *dev) int nFree; int pending; int b; + int nDirtyCacheChunks=0; yaffs_BlockInfo *blk; @@ -4872,6 +4900,20 @@ int yaffs_GetNumberOfFreeChunks(yaffs_Device *dev) 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;