projects
/
yaffs
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
*** empty log message ***
[yaffs/.git]
/
yaffs_guts.c
diff --git
a/yaffs_guts.c
b/yaffs_guts.c
index 5784d7956cc63d008c4df3045968e0839c90f70a..d8cdcb7f150a97addca40dcacb71e00ae845a091 100644
(file)
--- a/
yaffs_guts.c
+++ b/
yaffs_guts.c
@@
-14,7
+14,7
@@
*/
//yaffs_guts.c
*/
//yaffs_guts.c
-const char *yaffs_guts_c_version="$Id: yaffs_guts.c,v 1.
25 2003-05-20 22:30:35
charles Exp $";
+const char *yaffs_guts_c_version="$Id: yaffs_guts.c,v 1.
38 2005-01-06 23:28:34
charles Exp $";
#include "yportenv.h"
#include "yportenv.h"
@@
-782,11
+782,16
@@
static void yaffs_FreeTnode(yaffs_Device*dev, yaffs_Tnode *tn)
static void yaffs_DeinitialiseTnodes(yaffs_Device*dev)
{
// Free the list of allocated tnodes
static void yaffs_DeinitialiseTnodes(yaffs_Device*dev)
{
// Free the list of allocated tnodes
-
+ yaffs_TnodeList *tmp;
+
while(dev->allocatedTnodeList)
{
while(dev->allocatedTnodeList)
{
+ tmp = dev->allocatedTnodeList->next;
+
YFREE(dev->allocatedTnodeList->tnodes);
YFREE(dev->allocatedTnodeList->tnodes);
- dev->allocatedTnodeList = dev->allocatedTnodeList->next;
+ YFREE(dev->allocatedTnodeList);
+ dev->allocatedTnodeList = tmp;
+
}
dev->freeTnodes = NULL;
}
dev->freeTnodes = NULL;
@@
-1080,7
+1085,7
@@
static int yaffs_DeleteWorker(yaffs_Object *in, yaffs_Tnode *tn, __u32 level, in
if(limit)
{
*limit = *limit-1;
if(limit)
{
*limit = *limit-1;
- if(limit <= 0)
+ if(
*
limit <= 0)
{
hitLimit = 1;
}
{
hitLimit = 1;
}
@@
-1151,6
+1156,8
@@
static int yaffs_SoftDeleteWorker(yaffs_Object *in, yaffs_Tnode *tn, __u32 level
{
if(tn->level0[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));
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));
@@
-1437,6
+1444,16
@@
static void yaffs_FreeObject(yaffs_Object *tn)
yaffs_Device *dev = tn->myDev;
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_UnhashObject(tn);
// Link into the free list.
@@
-1446,16
+1463,33
@@
static void yaffs_FreeObject(yaffs_Object *tn)
}
}
+#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
static void yaffs_DeinitialiseObjects(yaffs_Device *dev)
{
// Free the list of allocated Objects
+ yaffs_ObjectList *tmp;
+
while( dev->allocatedObjectList)
{
while( dev->allocatedObjectList)
{
+ tmp = dev->allocatedObjectList->next;
YFREE(dev->allocatedObjectList->objects);
YFREE(dev->allocatedObjectList->objects);
- dev->allocatedObjectList = dev->allocatedObjectList->next;
+ YFREE(dev->allocatedObjectList);
+
+ dev->allocatedObjectList = tmp;
}
dev->freeObjects = NULL;
}
dev->freeObjects = NULL;
@@
-1589,6
+1623,11
@@
yaffs_Object *yaffs_FindObjectByNumber(yaffs_Device *dev,__u32 number)
in = list_entry(i, yaffs_Object,hashLink);
if(in->objectId == number)
{
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;
}
}
return in;
}
}
@@
-1625,7
+1664,9
@@
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->win_ctime[1] = theObject->win_mtime[1] = theObject->win_atime[1];
#else
- theObject->st_atime = theObject->st_mtime = theObject->st_ctime = CURRENT_TIME;
+
+ theObject->st_atime = theObject->st_mtime = theObject->st_ctime = Y_CURRENT_TIME;
+
#endif
switch(type)
{
#endif
switch(type)
{
@@
-1726,10
+1767,11
@@
yaffs_Object *yaffs_MknodObject( yaffs_ObjectType type,
#ifdef CONFIG_YAFFS_WINCE
yfsd_WinFileTimeNow(in->win_atime);
in->win_ctime[0] = in->win_mtime[0] = in->win_atime[0];
#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[
0
];
+ in->win_ctime[1] = in->win_mtime[1] = in->win_atime[
1
];
#else
#else
- in->st_atime = in->st_mtime = in->st_ctime = CURRENT_TIME;
+
+ in->st_atime = in->st_mtime = in->st_ctime = Y_CURRENT_TIME;
in->st_rdev = rdev;
in->st_uid = uid;
in->st_gid = gid;
in->st_rdev = rdev;
in->st_uid = uid;
in->st_gid = gid;
@@
-2281,6
+2323,7
@@
static int yaffs_GarbageCollectBlock(yaffs_Device *dev,int block)
{
// It's a header
object->chunkId = newChunk;
{
// It's a header
object->chunkId = newChunk;
+ object->serial = tags.serialNumber;
}
else
{
}
else
{
@@
-2822,6
+2865,7
@@
int yaffs_ReadChunkDataFromObject(yaffs_Object *in,int chunkInInode, __u8 *buffe
}
else
{
}
else
{
+ memset(buffer,0,YAFFS_BYTES_PER_CHUNK);
return 0;
}
return 0;
}
@@
-2844,7
+2888,14
@@
static void yaffs_DeleteChunk(yaffs_Device *dev,int chunkId,int markNAND)
if(markNAND)
{
yaffs_SpareInitialise(&spare);
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.
spare.pageStatus = 0; // To mark it as deleted.
@@
-3090,7
+3141,7
@@
static void yaffs_FlushFilesChunkCache(yaffs_Object *obj)
int lowest;
int i;
yaffs_ChunkCache *cache;
int lowest;
int i;
yaffs_ChunkCache *cache;
- int chunkWritten;
+ int chunkWritten
= 0
;
int nBytes;
int nCaches = obj->myDev->nShortOpCaches;
int nBytes;
int nCaches = obj->myDev->nShortOpCaches;
@@
-3640,8
+3691,10
@@
int yaffs_ResizeFile(yaffs_Object *in, int newSize)
int lastChunk = 1+ newSize/YAFFS_BYTES_PER_CHUNK;
// Got to read and rewrite the last chunk with its new size.
int lastChunk = 1+ newSize/YAFFS_BYTES_PER_CHUNK;
// Got to read and rewrite the last chunk with its new size.
+ // NB Got to zero pad to nuke old data
yaffs_ReadChunkDataFromObject(in,lastChunk,dev->localBuffer);
yaffs_ReadChunkDataFromObject(in,lastChunk,dev->localBuffer);
-
+ memset(dev->localBuffer + sizeOfPartialChunk,0, YAFFS_BYTES_PER_CHUNK - sizeOfPartialChunk);
+
yaffs_WriteChunkDataToObject(in,lastChunk,dev->localBuffer,sizeOfPartialChunk,1);
}
yaffs_WriteChunkDataToObject(in,lastChunk,dev->localBuffer,sizeOfPartialChunk,1);
}
@@
-3693,7
+3746,7
@@
int yaffs_FlushFile(yaffs_Object *in, int updateTime)
#ifdef CONFIG_YAFFS_WINCE
yfsd_WinFileTimeNow(in->win_mtime);
#else
#ifdef CONFIG_YAFFS_WINCE
yfsd_WinFileTimeNow(in->win_mtime);
#else
- in->st_mtime = CURRENT_TIME;
+ in->st_mtime =
Y_
CURRENT_TIME;
#endif
}
#endif
}
@@
-3717,12
+3770,15
@@
static int yaffs_DoGenericObjectDeletion(yaffs_Object *in)
yaffs_RemoveObjectFromDirectory(in);
yaffs_DeleteChunk(in->myDev,in->chunkId,1);
yaffs_RemoveObjectFromDirectory(in);
yaffs_DeleteChunk(in->myDev,in->chunkId,1);
+ in->chunkId = -1;
+#if 0
#ifdef __KERNEL__
if(in->myInode)
{
in->myInode->u.generic_ip = NULL;
#ifdef __KERNEL__
if(in->myInode)
{
in->myInode->u.generic_ip = NULL;
- in->myInode =
0
;
+ in->myInode =
NULL
;
}
}
+#endif
#endif
yaffs_FreeObject(in);
return YAFFS_OK;
#endif
yaffs_FreeObject(in);
return YAFFS_OK;
@@
-3760,6
+3816,8
@@
static int yaffs_UnlinkFile(yaffs_Object *in)
#ifdef __KERNEL__
if(!in->myInode)
{
#ifdef __KERNEL__
if(!in->myInode)
{
+ // Might be open at present,
+ // Caught by delete_inode in yaffs_fs.c
immediateDeletion = 1;
}
immediateDeletion = 1;
}
@@
-4192,8
+4250,9
@@
static int yaffs_Scan(yaffs_Device *dev)
{
// Hoosterman, another problem....
// We're trying to use a non-directory as a directory
{
// 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" TENDSTR)));
+
+ 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;
}
}
@@
-4546,9
+4605,10
@@
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(valid & ATTR_UID) obj->st_uid = attr->ia_uid;
if(valid & ATTR_GID) obj->st_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->st_atime = Y_TIME_CONVERT(attr->ia_atime);
+ if(valid & ATTR_CTIME) obj->st_ctime = Y_TIME_CONVERT(attr->ia_ctime);
+ if(valid & ATTR_MTIME) obj->st_mtime = Y_TIME_CONVERT(attr->ia_mtime);
+
if(valid & ATTR_SIZE) yaffs_ResizeFile(obj,attr->ia_size);
if(valid & ATTR_SIZE) yaffs_ResizeFile(obj,attr->ia_size);
@@
-4557,6
+4617,7
@@
int yaffs_SetAttributes(yaffs_Object *obj, struct iattr *attr)
return YAFFS_OK;
}
return YAFFS_OK;
}
+
int yaffs_GetAttributes(yaffs_Object *obj, struct iattr *attr)
{
unsigned int valid = 0;
int yaffs_GetAttributes(yaffs_Object *obj, struct iattr *attr)
{
unsigned int valid = 0;
@@
-4565,10
+4626,11
@@
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;
attr->ia_uid = obj->st_uid; valid |= ATTR_UID;
attr->ia_gid = obj->st_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->st_atime; valid |= ATTR_ATIME;
+ Y_TIME_CONVERT(attr->ia_ctime) = obj->st_ctime; valid |= ATTR_CTIME;
+ Y_TIME_CONVERT(attr->ia_mtime) = obj->st_mtime; valid |= ATTR_MTIME;
+
attr->ia_size = yaffs_GetFileSize(obj); valid |= ATTR_SIZE;
attr->ia_valid = valid;
attr->ia_size = yaffs_GetFileSize(obj); valid |= ATTR_SIZE;
attr->ia_valid = valid;
@@
-4632,8
+4694,7
@@
int yaffs_GutsInitialise(yaffs_Device *dev)
int extraBits;
int nBlocks;
int extraBits;
int nBlocks;
- if( dev->nBytesPerChunk != YAFFS_BYTES_PER_CHUNK ||
-
+ if( dev->nBytesPerChunk != YAFFS_BYTES_PER_CHUNK ||
dev->nChunksPerBlock < 2 ||
dev->nReservedBlocks < 2 ||
dev->startBlock <= 0 ||
dev->nChunksPerBlock < 2 ||
dev->nReservedBlocks < 2 ||
dev->startBlock <= 0 ||
@@
-4700,7
+4761,18
@@
int yaffs_GutsInitialise(yaffs_Device *dev)
{
dev->chunkGroupBits = bits - 16;
}
{
dev->chunkGroupBits = bits - 16;
}
+
dev->chunkGroupSize = 1 << dev->chunkGroupBits;
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;
+ }
+
@@
-4786,6
+4858,8
@@
void yaffs_Deinitialise(yaffs_Device *dev)
yaffs_DeinitialiseBlocks(dev);
yaffs_DeinitialiseTnodes(dev);
yaffs_DeinitialiseObjects(dev);
yaffs_DeinitialiseBlocks(dev);
yaffs_DeinitialiseTnodes(dev);
yaffs_DeinitialiseObjects(dev);
+ if(dev->nShortOpCaches > 0)
+ YFREE(dev->srCache);
YFREE(dev->localBuffer);
}
YFREE(dev->localBuffer);
}
@@
-4939,3
+5013,6
@@
void yaffs_GutsTest(yaffs_Device *dev)
+
+
+