timothy-tests: Fix paths for wrongly failing tests

[yaffs2.git] / yaffs_attribs.c

diff --git a/yaffs_attribs.c b/yaffs_attribs.c
index 3d778f2266248d47658eacc0882ef13ef720a668..5eb7c5a94a45704c30e7a5cb674bc07444d7c1dd 100644 (file)
--- a/yaffs_attribs.c
+++ b/yaffs_attribs.c
@@ -14,6 +14,18 @@
 #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;
@@ -77,9 +89,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);
@@ -103,9 +115,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;