projects
/
yaffs2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Further integration of 64-bit time changes
[yaffs2.git]
/
direct
/
yaffs_attribs.c
diff --git
a/direct/yaffs_attribs.c
b/direct/yaffs_attribs.c
index 5486bdd142b9512ab1cabe65b14cec0f5d772c30..e798a88b3c3f96281ae54df9e6d80a7f6283e88f 100644
(file)
--- a/
direct/yaffs_attribs.c
+++ b/
direct/yaffs_attribs.c
@@
-15,6
+15,7
@@
void yaffs_load_attribs(struct yaffs_obj *obj, struct yaffs_obj_hdr *oh)
{
void yaffs_load_attribs(struct yaffs_obj *obj, struct yaffs_obj_hdr *oh)
{
+
#ifdef CONFIG_YAFFS_WINCE
obj->win_atime[0] = oh->win_atime[0];
obj->win_ctime[0] = oh->win_ctime[0];
#ifdef CONFIG_YAFFS_WINCE
obj->win_atime[0] = oh->win_atime[0];
obj->win_ctime[0] = oh->win_ctime[0];
@@
-25,9
+26,11
@@
void yaffs_load_attribs(struct yaffs_obj *obj, struct yaffs_obj_hdr *oh)
#else
obj->yst_uid = oh->yst_uid;
obj->yst_gid = oh->yst_gid;
#else
obj->yst_uid = oh->yst_uid;
obj->yst_gid = oh->yst_gid;
- obj->yst_atime = oh->yst_atime;
- obj->yst_mtime = oh->yst_mtime;
- obj->yst_ctime = oh->yst_ctime;
+
+ obj->yst_ctime = yaffs_oh_ctime_fetch(oh);
+ obj->yst_mtime = yaffs_oh_mtime_fetch(oh);
+ obj->yst_atime = yaffs_oh_atime_fetch(oh);
+
obj->yst_rdev = oh->yst_rdev;
#endif
}
obj->yst_rdev = oh->yst_rdev;
#endif
}
@@
-45,9
+48,11
@@
void yaffs_load_attribs_oh(struct yaffs_obj_hdr *oh, struct yaffs_obj *obj)
#else
oh->yst_uid = obj->yst_uid;
oh->yst_gid = obj->yst_gid;
#else
oh->yst_uid = obj->yst_uid;
oh->yst_gid = obj->yst_gid;
- oh->yst_atime = obj->yst_atime;
- oh->yst_mtime = obj->yst_mtime;
- oh->yst_ctime = obj->yst_ctime;
+
+ yaffs_oh_ctime_load(obj, oh);
+ yaffs_oh_mtime_load(obj, oh);
+ yaffs_oh_atime_load(obj, oh);
+
oh->yst_rdev = obj->yst_rdev;
#endif
}
oh->yst_rdev = obj->yst_rdev;
#endif
}
@@
-81,8
+86,8
@@
void yaffs_load_current_time(struct yaffs_obj *obj, int do_a, int do_c)
obj->yst_mtime = Y_CURRENT_TIME;
if (do_a)
obj->yst_mtime = Y_CURRENT_TIME;
if (do_a)
- obj->yst_atime = obj->yst_
a
time;
+ obj->yst_atime = obj->yst_
m
time;
if (do_c)
if (do_c)
- obj->yst_ctime = obj->yst_
a
time;
+ obj->yst_ctime = obj->yst_
m
time;
#endif
}
#endif
}