*** empty log message ***

[yaffs/.git] / yaffs_guts.c

diff --git a/yaffs_guts.c b/yaffs_guts.c
index 49e3180f7e895bdbf4184b76d5dd68ecb507d23e..91fb73c598fda9e44ed5052abc06a0ff8de1b38d 100644 (file)
--- a/yaffs_guts.c
+++ b/yaffs_guts.c
@@ -14,7 +14,7 @@
  */
  //yaffs_guts.c
 
-const char *yaffs_guts_c_version="$Id: yaffs_guts.c,v 1.32 2003-11-11 00:44:51 charles Exp $";
+const char *yaffs_guts_c_version="$Id: yaffs_guts.c,v 1.36 2004-10-10 17:54:59 charles Exp $";
 
 #include "yportenv.h"
 
@@ -1085,7 +1085,7 @@ static int yaffs_DeleteWorker(yaffs_Object *in, yaffs_Tnode *tn, __u32 level, in
                                                if(limit)
                                                { 
                                                        *limit = *limit-1;
-                                                       if(limit <= 0) 
+                                                       if(*limit <= 0) 
                                                        { 
                                                                hitLimit = 1;
                                                        }
@@ -1638,11 +1638,8 @@ yaffs_Object *yaffs_CreateNewObject(yaffs_Device *dev,int number,yaffs_ObjectTyp
 
 #else
 
-#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
+               theObject->st_atime = theObject->st_mtime =     theObject->st_ctime = Y_CURRENT_TIME;
+
 #endif
                switch(type)
                {
@@ -1743,14 +1740,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];
-               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
-#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_atime = in->st_mtime = in->st_ctime = Y_CURRENT_TIME;
                in->st_rdev  = rdev;
                in->st_uid   = uid;
                in->st_gid   = gid;
@@ -2302,6 +2296,7 @@ static int  yaffs_GarbageCollectBlock(yaffs_Device *dev,int block)
                                {
                                        // It's a header
                                        object->chunkId = newChunk;
+                                       object->serial = tags.serialNumber;
                                }
                                else
                                {
@@ -3724,11 +3719,7 @@ 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
+                       in->st_mtime = Y_CURRENT_TIME;
 #endif
                }
 
@@ -4227,8 +4218,9 @@ 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" 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;
 
                                        }
                                
@@ -4581,15 +4573,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 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_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);
        
@@ -4598,6 +4585,7 @@ int yaffs_SetAttributes(yaffs_Object *obj, struct iattr *attr)
        return YAFFS_OK;
        
 }
+
 int yaffs_GetAttributes(yaffs_Object *obj, struct iattr *attr)
 {
        unsigned int valid = 0;
@@ -4606,15 +4594,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;
        
-#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 
+       
+       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;
@@ -4842,6 +4826,8 @@ void yaffs_Deinitialise(yaffs_Device *dev)
                yaffs_DeinitialiseBlocks(dev);
                yaffs_DeinitialiseTnodes(dev);
                yaffs_DeinitialiseObjects(dev);
+               if(dev->nShortOpCaches > 0)
+                       YFREE(dev->srCache);
                YFREE(dev->localBuffer);
        }
        
@@ -4995,3 +4981,6 @@ void yaffs_GutsTest(yaffs_Device *dev)
 
 
 
+
+
+