@@ -45,11 +45,11 @@ struct inode {
struct timespec i_ctime;
};
-#define xfs_uid_to_kuid(uid) (uid)
-#define xfs_kuid_to_uid(uid) (uid)
+#define i_uid_write(inode, uid) (inode)->i_uid = (uid)
+#define i_uid_read(inode) ((inode)->i_uid)
-#define xfs_gid_to_kgid(gid) (gid)
-#define xfs_kgid_to_gid(gid) (gid)
+#define i_gid_write(inode, gid) (inode)->i_gid = (gid)
+#define i_gid_read(inode) ((inode)->i_gid)
typedef struct xfs_inode {
struct cache_node i_node;
@@ -219,8 +219,8 @@ xfs_inode_from_disk(
}
to->di_format = from->di_format;
- inode->i_uid = xfs_uid_to_kuid(be32_to_cpu(from->di_uid));
- inode->i_gid = xfs_gid_to_kgid(be32_to_cpu(from->di_gid));
+ i_uid_write(inode, be32_to_cpu(from->di_uid));
+ i_gid_write(inode, be32_to_cpu(from->di_gid));
to->di_flushiter = be16_to_cpu(from->di_flushiter);
/*
@@ -273,8 +273,8 @@ xfs_inode_to_disk(
to->di_version = from->di_version;
to->di_format = from->di_format;
- to->di_uid = cpu_to_be32(xfs_kuid_to_uid(inode->i_uid));
- to->di_gid = cpu_to_be32(xfs_kgid_to_gid(inode->i_gid));
+ to->di_uid = cpu_to_be32(i_uid_read(inode));
+ to->di_gid = cpu_to_be32(i_gid_read(inode));
to->di_projid_lo = cpu_to_be16(from->di_projid & 0xffff);
to->di_projid_hi = cpu_to_be16(from->di_projid >> 16);