xfs: remove the icdinode di_uid/di_gid members

Use the Linux inode i_uid/i_gid members everywhere and just convert
from/to the scalar value when reading or writing the on-disk inode.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
This commit is contained in:
Christoph Hellwig
2020-02-21 08:31:27 -08:00
committed by Darrick J. Wong
parent 3d8f282150
commit 542951592c
11 changed files with 46 additions and 52 deletions

View File

@@ -222,10 +222,8 @@ xfs_inode_from_disk(
}
to->di_format = from->di_format;
to->di_uid = be32_to_cpu(from->di_uid);
inode->i_uid = xfs_uid_to_kuid(to->di_uid);
to->di_gid = be32_to_cpu(from->di_gid);
inode->i_gid = xfs_gid_to_kgid(to->di_gid);
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));
to->di_flushiter = be16_to_cpu(from->di_flushiter);
/*
@@ -278,8 +276,8 @@ xfs_inode_to_disk(
to->di_version = from->di_version;
to->di_format = from->di_format;
to->di_uid = cpu_to_be32(from->di_uid);
to->di_gid = cpu_to_be32(from->di_gid);
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_projid_lo = cpu_to_be16(from->di_projid & 0xffff);
to->di_projid_hi = cpu_to_be16(from->di_projid >> 16);