*** empty log message ***

[yaffs/.git] / yaffs_guts.c

diff --git a/yaffs_guts.c b/yaffs_guts.c
index 4aa52f6c8132cf4863ab8f6458b9fc1c8c90e7ad..4757ff6802ceed1571b8fad2c556522010a454b7 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.33 2003-11-16 07:40:42 charles Exp $";
+const char *yaffs_guts_c_version="$Id: yaffs_guts.c,v 1.35 2004-09-21 03:03:12 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,7 +1638,8 @@ yaffs_Object *yaffs_CreateNewObject(yaffs_Device *dev,int number,yaffs_ObjectTyp
 
 #else
 
-#if defined(CONFIG_KERNEL_2_5)
+//#if defined(CONFIG_KERNEL_2_5)
+#if defined(__KERNEL__) && (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
                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;             
@@ -1746,7 +1747,8 @@ yaffs_Object *yaffs_MknodObject( yaffs_ObjectType type,
                in->win_ctime[1] = in->win_mtime[1] = in->win_atime[1];
                
 #else
-#if defined(CONFIG_KERNEL_2_5)
+//#if defined(CONFIG_KERNEL_2_5)
+#if defined(__KERNEL__) && (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
                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;
@@ -3725,7 +3727,8 @@ int yaffs_FlushFile(yaffs_Object *in, int updateTime)
 #ifdef CONFIG_YAFFS_WINCE
                        yfsd_WinFileTimeNow(in->win_mtime);
 #else
-#if defined(CONFIG_KERNEL_2_5)
+//#if defined(CONFIG_KERNEL_2_5)
+#if defined(__KERNEL__) && (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
                        in->st_mtime = CURRENT_TIME.tv_sec;
 #else
                        in->st_mtime = CURRENT_TIME;
@@ -4583,7 +4586,9 @@ 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 defined(CONFIG_KERNEL_2_5)
+#if defined(__KERNEL__) && (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
+
        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;
@@ -4608,7 +4613,8 @@ 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)
+//#if defined(CONFIG_KERNEL_2_5)
+#if defined(__KERNEL__) && (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
        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;
@@ -4999,3 +5005,4 @@ void yaffs_GutsTest(yaffs_Device *dev)
 
 
 
+