X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_attribs.c;h=c441185a68dcb07a45b1bb2b829ffda8afe3ac12;hp=3d778f2266248d47658eacc0882ef13ef720a668;hb=HEAD;hpb=cb185cec287359727e44321979ad2324b4fad7cb

diff --git a/yaffs_attribs.c b/yaffs_attribs.c
index 3d778f2..c441185 100644
--- a/yaffs_attribs.c
+++ b/yaffs_attribs.c
@@ -1,8 +1,7 @@
 /*
  * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
  *
- * Copyright (C) 2002-2011 Aleph One Ltd.
- *   for Toby Churchill Ltd and Brightstar Engineering
+ * Copyright (C) 2002-2018 Aleph One Ltd.
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
  *
@@ -14,13 +13,27 @@
 #include "yaffs_guts.h"
 #include "yaffs_attribs.h"
 
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 14, 0))
+#define IATTR_UID ia_uid
+#define IATTR_GID ia_gid
+#else
+#define IATTR_UID ia_uid.val
+#define IATTR_GID ia_gid.val
+#endif
+
+/*
+ * Loading attibs from/to object header assumes the object header
+ * is in cpu endian.
+ */
 void yaffs_load_attribs(struct yaffs_obj *obj, struct yaffs_obj_hdr *oh)
 {
 	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;
 }
 
@@ -28,9 +41,11 @@ void yaffs_load_attribs_oh(struct yaffs_obj_hdr *oh, struct yaffs_obj *obj)
 {
 	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;
 
 }
@@ -77,9 +92,9 @@ int yaffs_set_attribs(struct yaffs_obj *obj, struct iattr *attr)
 	if (valid & ATTR_MODE)
 		obj->yst_mode = attr->ia_mode;
 	if (valid & ATTR_UID)
-		obj->yst_uid = attr->ia_uid;
+		obj->yst_uid = attr->IATTR_UID;
 	if (valid & ATTR_GID)
-		obj->yst_gid = attr->ia_gid;
+		obj->yst_gid = attr->IATTR_GID;
 
 	if (valid & ATTR_ATIME)
 		obj->yst_atime = Y_TIME_CONVERT(attr->ia_atime);
@@ -94,7 +109,6 @@ int yaffs_set_attribs(struct yaffs_obj *obj, struct iattr *attr)
 	yaffs_update_oh(obj, NULL, 1, 0, 0, NULL);
 
 	return YAFFS_OK;
-
 }
 
 int yaffs_get_attribs(struct yaffs_obj *obj, struct iattr *attr)
@@ -103,9 +117,9 @@ int yaffs_get_attribs(struct yaffs_obj *obj, struct iattr *attr)
 
 	attr->ia_mode = obj->yst_mode;
 	valid |= ATTR_MODE;
-	attr->ia_uid = obj->yst_uid;
+	attr->IATTR_UID = obj->yst_uid;
 	valid |= ATTR_UID;
-	attr->ia_gid = obj->yst_gid;
+	attr->IATTR_GID = obj->yst_gid;
 	valid |= ATTR_GID;
 
 	Y_TIME_CONVERT(attr->ia_atime) = obj->yst_atime;