xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xfs: remove the icdinode di_uid/di_gid members

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

10
fs/xfs/libxfs/xfs_inode_buf.c
View File

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

2
fs/xfs/libxfs/xfs_inode_buf.h
View File

@@ -19,8 +19,6 @@ struct xfs_icdinode {
int8_t di_version; /* inode version */ int8_t di_version; /* inode version */
int8_t di_format; /* format of di_c data */ int8_t di_format; /* format of di_c data */
uint16_t di_flushiter; /* incremented on flush */ uint16_t di_flushiter; /* incremented on flush */
uint32_t di_uid; /* owner's user id */
uint32_t di_gid; /* owner's group id */
uint32_t di_projid; /* owner's project id */ uint32_t di_projid; /* owner's project id */
xfs_fsize_t di_size; /* number of bytes in file */ xfs_fsize_t di_size; /* number of bytes in file */
xfs_rfsblock_t di_nblocks; /* # of direct & btree blocks used */ xfs_rfsblock_t di_nblocks; /* # of direct & btree blocks used */

4
fs/xfs/xfs_dquot.c
View File

@@ -829,9 +829,9 @@ xfs_qm_id_for_quotatype(
{ {
switch (type) { switch (type) {
case XFS_DQ_USER: case XFS_DQ_USER:
return ip->i_d.di_uid; return xfs_kuid_to_uid(VFS_I(ip)->i_uid);
case XFS_DQ_GROUP: case XFS_DQ_GROUP:
return ip->i_d.di_gid; return xfs_kgid_to_gid(VFS_I(ip)->i_gid);
case XFS_DQ_PROJ: case XFS_DQ_PROJ:
return ip->i_d.di_projid; return ip->i_d.di_projid;
} }

14
fs/xfs/xfs_inode.c
View File

@@ -813,18 +813,15 @@ xfs_ialloc(
inode->i_mode = mode; inode->i_mode = mode;
set_nlink(inode, nlink); set_nlink(inode, nlink);
inode->i_uid = current_fsuid(); inode->i_uid = current_fsuid();
ip->i_d.di_uid = xfs_kuid_to_uid(inode->i_uid);
inode->i_rdev = rdev; inode->i_rdev = rdev;
ip->i_d.di_projid = prid; ip->i_d.di_projid = prid;
if (pip && XFS_INHERIT_GID(pip)) { if (pip && XFS_INHERIT_GID(pip)) {
inode->i_gid = VFS_I(pip)->i_gid; inode->i_gid = VFS_I(pip)->i_gid;
ip->i_d.di_gid = pip->i_d.di_gid;
if ((VFS_I(pip)->i_mode & S_ISGID) && S_ISDIR(mode)) if ((VFS_I(pip)->i_mode & S_ISGID) && S_ISDIR(mode))
inode->i_mode |= S_ISGID; inode->i_mode |= S_ISGID;
} else { } else {
inode->i_gid = current_fsgid(); inode->i_gid = current_fsgid();
ip->i_d.di_gid = xfs_kgid_to_gid(inode->i_gid);
} }
/* /*
@@ -832,9 +829,8 @@ xfs_ialloc(
* ID or one of the supplementary group IDs, the S_ISGID bit is cleared * ID or one of the supplementary group IDs, the S_ISGID bit is cleared
* (and only if the irix_sgid_inherit compatibility variable is set). * (and only if the irix_sgid_inherit compatibility variable is set).
*/ */
if ((irix_sgid_inherit) && if (irix_sgid_inherit &&
(inode->i_mode & S_ISGID) && (inode->i_mode & S_ISGID) && !in_group_p(inode->i_gid))
(!in_group_p(xfs_gid_to_kgid(ip->i_d.di_gid))))
inode->i_mode &= ~S_ISGID; inode->i_mode &= ~S_ISGID;
ip->i_d.di_size = 0; ip->i_d.di_size = 0;
@@ -1162,8 +1158,7 @@ xfs_create(
/* /*
* Make sure that we have allocated dquot(s) on disk. * Make sure that we have allocated dquot(s) on disk.
*/ */
error = xfs_qm_vop_dqalloc(dp, xfs_kuid_to_uid(current_fsuid()), error = xfs_qm_vop_dqalloc(dp, current_fsuid(), current_fsgid(), prid,
xfs_kgid_to_gid(current_fsgid()), prid,
XFS_QMOPT_QUOTALL | XFS_QMOPT_INHERIT, XFS_QMOPT_QUOTALL | XFS_QMOPT_INHERIT,
&udqp, &gdqp, &pdqp); &udqp, &gdqp, &pdqp);
if (error) if (error)
@@ -1313,8 +1308,7 @@ xfs_create_tmpfile(
/* /*
* Make sure that we have allocated dquot(s) on disk. * Make sure that we have allocated dquot(s) on disk.
*/ */
error = xfs_qm_vop_dqalloc(dp, xfs_kuid_to_uid(current_fsuid()), error = xfs_qm_vop_dqalloc(dp, current_fsuid(), current_fsgid(), prid,
xfs_kgid_to_gid(current_fsgid()), prid,
XFS_QMOPT_QUOTALL | XFS_QMOPT_INHERIT, XFS_QMOPT_QUOTALL | XFS_QMOPT_INHERIT,
&udqp, &gdqp, &pdqp); &udqp, &gdqp, &pdqp);
if (error) if (error)

4
fs/xfs/xfs_inode_item.c
View File

@@ -308,8 +308,8 @@ xfs_inode_to_log_dinode(
to->di_version = from->di_version; to->di_version = from->di_version;
to->di_format = from->di_format; to->di_format = from->di_format;
to->di_uid = from->di_uid; to->di_uid = xfs_kuid_to_uid(inode->i_uid);
to->di_gid = from->di_gid; to->di_gid = xfs_kgid_to_gid(inode->i_gid);
to->di_projid_lo = from->di_projid & 0xffff; to->di_projid_lo = from->di_projid & 0xffff;
to->di_projid_hi = from->di_projid >> 16; to->di_projid_hi = from->di_projid >> 16;

6
fs/xfs/xfs_ioctl.c
View File

@@ -1434,9 +1434,9 @@ xfs_ioctl_setattr(
* because the i_*dquot fields will get updated anyway. * because the i_*dquot fields will get updated anyway.
*/ */
if (XFS_IS_QUOTA_ON(mp)) { if (XFS_IS_QUOTA_ON(mp)) {
code = xfs_qm_vop_dqalloc(ip, ip->i_d.di_uid, code = xfs_qm_vop_dqalloc(ip, VFS_I(ip)->i_uid,
ip->i_d.di_gid, fa->fsx_projid, VFS_I(ip)->i_gid, fa->fsx_projid,
XFS_QMOPT_PQUOTA, &udqp, NULL, &pdqp); XFS_QMOPT_PQUOTA, &udqp, NULL, &pdqp);
if (code) if (code)
return code; return code;
} }

6
fs/xfs/xfs_iops.c
View File

@@ -692,9 +692,7 @@ xfs_setattr_nonsize(
*/ */
ASSERT(udqp == NULL); ASSERT(udqp == NULL);
ASSERT(gdqp == NULL); ASSERT(gdqp == NULL);
error = xfs_qm_vop_dqalloc(ip, xfs_kuid_to_uid(uid), error = xfs_qm_vop_dqalloc(ip, uid, gid, ip->i_d.di_projid,
xfs_kgid_to_gid(gid),
ip->i_d.di_projid,
qflags, &udqp, &gdqp, NULL); qflags, &udqp, &gdqp, NULL);
if (error) if (error)
return error; return error;
@@ -763,7 +761,6 @@ xfs_setattr_nonsize(
olddquot1 = xfs_qm_vop_chown(tp, ip, olddquot1 = xfs_qm_vop_chown(tp, ip,
&ip->i_udquot, udqp); &ip->i_udquot, udqp);
} }
ip->i_d.di_uid = xfs_kuid_to_uid(uid);
inode->i_uid = uid; inode->i_uid = uid;
} }
if (!gid_eq(igid, gid)) { if (!gid_eq(igid, gid)) {
@@ -775,7 +772,6 @@ xfs_setattr_nonsize(
olddquot2 = xfs_qm_vop_chown(tp, ip, olddquot2 = xfs_qm_vop_chown(tp, ip,
&ip->i_gdquot, gdqp); &ip->i_gdquot, gdqp);
} }
ip->i_d.di_gid = xfs_kgid_to_gid(gid);
inode->i_gid = gid; inode->i_gid = gid;
} }
} }

4
fs/xfs/xfs_itable.c
View File

@@ -86,8 +86,8 @@ xfs_bulkstat_one_int(
*/ */
buf->bs_projectid = ip->i_d.di_projid; buf->bs_projectid = ip->i_d.di_projid;
buf->bs_ino = ino; buf->bs_ino = ino;
buf->bs_uid = dic->di_uid; buf->bs_uid = xfs_kuid_to_uid(inode->i_uid);
buf->bs_gid = dic->di_gid; buf->bs_gid = xfs_kgid_to_gid(inode->i_gid);
buf->bs_size = dic->di_size; buf->bs_size = dic->di_size;
buf->bs_nlink = inode->i_nlink; buf->bs_nlink = inode->i_nlink;

40
fs/xfs/xfs_qm.c
View File

@@ -326,16 +326,18 @@ xfs_qm_dqattach_locked(
ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL)); ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL));
if (XFS_IS_UQUOTA_ON(mp) && !ip->i_udquot) { if (XFS_IS_UQUOTA_ON(mp) && !ip->i_udquot) {
error = xfs_qm_dqattach_one(ip, ip->i_d.di_uid, XFS_DQ_USER, error = xfs_qm_dqattach_one(ip,
doalloc, &ip->i_udquot); xfs_kuid_to_uid(VFS_I(ip)->i_uid),
XFS_DQ_USER, doalloc, &ip->i_udquot);
if (error) if (error)
goto done; goto done;
ASSERT(ip->i_udquot); ASSERT(ip->i_udquot);
} }
if (XFS_IS_GQUOTA_ON(mp) && !ip->i_gdquot) { if (XFS_IS_GQUOTA_ON(mp) && !ip->i_gdquot) {
error = xfs_qm_dqattach_one(ip, ip->i_d.di_gid, XFS_DQ_GROUP, error = xfs_qm_dqattach_one(ip,
doalloc, &ip->i_gdquot); xfs_kgid_to_gid(VFS_I(ip)->i_gid),
XFS_DQ_GROUP, doalloc, &ip->i_gdquot);
if (error) if (error)
goto done; goto done;
ASSERT(ip->i_gdquot); ASSERT(ip->i_gdquot);
@@ -1613,8 +1615,8 @@ xfs_qm_dqfree_one(
int int
xfs_qm_vop_dqalloc( xfs_qm_vop_dqalloc(
struct xfs_inode *ip, struct xfs_inode *ip,
xfs_dqid_t uid, kuid_t uid,
xfs_dqid_t gid, kgid_t gid,
prid_t prid, prid_t prid,
uint flags, uint flags,
struct xfs_dquot **O_udqpp, struct xfs_dquot **O_udqpp,
@@ -1622,6 +1624,7 @@ xfs_qm_vop_dqalloc(
struct xfs_dquot **O_pdqpp) struct xfs_dquot **O_pdqpp)
{ {
struct xfs_mount *mp = ip->i_mount; struct xfs_mount *mp = ip->i_mount;
struct inode *inode = VFS_I(ip);
struct xfs_dquot *uq = NULL; struct xfs_dquot *uq = NULL;
struct xfs_dquot *gq = NULL; struct xfs_dquot *gq = NULL;
struct xfs_dquot *pq = NULL; struct xfs_dquot *pq = NULL;
@@ -1635,7 +1638,7 @@ xfs_qm_vop_dqalloc(
xfs_ilock(ip, lockflags); xfs_ilock(ip, lockflags);
if ((flags & XFS_QMOPT_INHERIT) && XFS_INHERIT_GID(ip)) if ((flags & XFS_QMOPT_INHERIT) && XFS_INHERIT_GID(ip))
gid = ip->i_d.di_gid; gid = inode->i_gid;
/* /*
* Attach the dquot(s) to this inode, doing a dquot allocation * Attach the dquot(s) to this inode, doing a dquot allocation
@@ -1650,7 +1653,7 @@ xfs_qm_vop_dqalloc(
} }
if ((flags & XFS_QMOPT_UQUOTA) && XFS_IS_UQUOTA_ON(mp)) { if ((flags & XFS_QMOPT_UQUOTA) && XFS_IS_UQUOTA_ON(mp)) {
if (ip->i_d.di_uid != uid) { if (!uid_eq(inode->i_uid, uid)) {
/* /*
* What we need is the dquot that has this uid, and * What we need is the dquot that has this uid, and
* if we send the inode to dqget, the uid of the inode * if we send the inode to dqget, the uid of the inode
@@ -1661,7 +1664,8 @@ xfs_qm_vop_dqalloc(
* holding ilock. * holding ilock.
*/ */
xfs_iunlock(ip, lockflags); xfs_iunlock(ip, lockflags);
error = xfs_qm_dqget(mp, uid, XFS_DQ_USER, true, &uq); error = xfs_qm_dqget(mp, xfs_kuid_to_uid(uid),
XFS_DQ_USER, true, &uq);
if (error) { if (error) {
ASSERT(error != -ENOENT); ASSERT(error != -ENOENT);
return error; return error;
@@ -1682,9 +1686,10 @@ xfs_qm_vop_dqalloc(
} }
} }
if ((flags & XFS_QMOPT_GQUOTA) && XFS_IS_GQUOTA_ON(mp)) { if ((flags & XFS_QMOPT_GQUOTA) && XFS_IS_GQUOTA_ON(mp)) {
if (ip->i_d.di_gid != gid) { if (!gid_eq(inode->i_gid, gid)) {
xfs_iunlock(ip, lockflags); xfs_iunlock(ip, lockflags);
error = xfs_qm_dqget(mp, gid, XFS_DQ_GROUP, true, &gq); error = xfs_qm_dqget(mp, xfs_kgid_to_gid(gid),
XFS_DQ_GROUP, true, &gq);
if (error) { if (error) {
ASSERT(error != -ENOENT); ASSERT(error != -ENOENT);
goto error_rele; goto error_rele;
@@ -1810,7 +1815,8 @@ xfs_qm_vop_chown_reserve(
XFS_QMOPT_RES_RTBLKS : XFS_QMOPT_RES_REGBLKS; XFS_QMOPT_RES_RTBLKS : XFS_QMOPT_RES_REGBLKS;
if (XFS_IS_UQUOTA_ON(mp) && udqp && if (XFS_IS_UQUOTA_ON(mp) && udqp &&
ip->i_d.di_uid != be32_to_cpu(udqp->q_core.d_id)) { xfs_kuid_to_uid(VFS_I(ip)->i_uid) !=
be32_to_cpu(udqp->q_core.d_id)) {
udq_delblks = udqp; udq_delblks = udqp;
/* /*
* If there are delayed allocation blocks, then we have to * If there are delayed allocation blocks, then we have to
@@ -1823,7 +1829,8 @@ xfs_qm_vop_chown_reserve(
} }
} }
if (XFS_IS_GQUOTA_ON(ip->i_mount) && gdqp && if (XFS_IS_GQUOTA_ON(ip->i_mount) && gdqp &&
ip->i_d.di_gid != be32_to_cpu(gdqp->q_core.d_id)) { xfs_kgid_to_gid(VFS_I(ip)->i_gid) !=
be32_to_cpu(gdqp->q_core.d_id)) {
gdq_delblks = gdqp; gdq_delblks = gdqp;
if (delblks) { if (delblks) {
ASSERT(ip->i_gdquot); ASSERT(ip->i_gdquot);
@@ -1920,14 +1927,17 @@ xfs_qm_vop_create_dqattach(
if (udqp && XFS_IS_UQUOTA_ON(mp)) { if (udqp && XFS_IS_UQUOTA_ON(mp)) {
ASSERT(ip->i_udquot == NULL); ASSERT(ip->i_udquot == NULL);
ASSERT(ip->i_d.di_uid == be32_to_cpu(udqp->q_core.d_id)); ASSERT(xfs_kuid_to_uid(VFS_I(ip)->i_uid) ==
be32_to_cpu(udqp->q_core.d_id));
ip->i_udquot = xfs_qm_dqhold(udqp); ip->i_udquot = xfs_qm_dqhold(udqp);
xfs_trans_mod_dquot(tp, udqp, XFS_TRANS_DQ_ICOUNT, 1); xfs_trans_mod_dquot(tp, udqp, XFS_TRANS_DQ_ICOUNT, 1);
} }
if (gdqp && XFS_IS_GQUOTA_ON(mp)) { if (gdqp && XFS_IS_GQUOTA_ON(mp)) {
ASSERT(ip->i_gdquot == NULL); ASSERT(ip->i_gdquot == NULL);
ASSERT(ip->i_d.di_gid == be32_to_cpu(gdqp->q_core.d_id)); ASSERT(xfs_kgid_to_gid(VFS_I(ip)->i_gid) ==
be32_to_cpu(gdqp->q_core.d_id));
ip->i_gdquot = xfs_qm_dqhold(gdqp); ip->i_gdquot = xfs_qm_dqhold(gdqp);
xfs_trans_mod_dquot(tp, gdqp, XFS_TRANS_DQ_ICOUNT, 1); xfs_trans_mod_dquot(tp, gdqp, XFS_TRANS_DQ_ICOUNT, 1);
} }

4
fs/xfs/xfs_quota.h
View File

@@ -86,7 +86,7 @@ extern int xfs_trans_reserve_quota_bydquots(struct xfs_trans *,
struct xfs_mount *, struct xfs_dquot *, struct xfs_mount *, struct xfs_dquot *,
struct xfs_dquot *, struct xfs_dquot *, int64_t, long, uint); struct xfs_dquot *, struct xfs_dquot *, int64_t, long, uint);
extern int xfs_qm_vop_dqalloc(struct xfs_inode *, xfs_dqid_t, xfs_dqid_t, extern int xfs_qm_vop_dqalloc(struct xfs_inode *, kuid_t, kgid_t,
prid_t, uint, struct xfs_dquot **, struct xfs_dquot **, prid_t, uint, struct xfs_dquot **, struct xfs_dquot **,
struct xfs_dquot **); struct xfs_dquot **);
extern void xfs_qm_vop_create_dqattach(struct xfs_trans *, struct xfs_inode *, extern void xfs_qm_vop_create_dqattach(struct xfs_trans *, struct xfs_inode *,
@@ -109,7 +109,7 @@ extern void xfs_qm_unmount_quotas(struct xfs_mount *);
#else #else
static inline int static inline int
xfs_qm_vop_dqalloc(struct xfs_inode *ip, xfs_dqid_t uid, xfs_dqid_t gid, xfs_qm_vop_dqalloc(struct xfs_inode *ip, kuid_t kuid, kgid_t kgid,
prid_t prid, uint flags, struct xfs_dquot **udqp, prid_t prid, uint flags, struct xfs_dquot **udqp,
struct xfs_dquot **gdqp, struct xfs_dquot **pdqp) struct xfs_dquot **gdqp, struct xfs_dquot **pdqp)
{ {

4
fs/xfs/xfs_symlink.c
View File

@@ -182,9 +182,7 @@ xfs_symlink(
/* /*
* Make sure that we have allocated dquot(s) on disk. * Make sure that we have allocated dquot(s) on disk.
*/ */
error = xfs_qm_vop_dqalloc(dp, error = xfs_qm_vop_dqalloc(dp, current_fsuid(), current_fsgid(), prid,
xfs_kuid_to_uid(current_fsuid()),
xfs_kgid_to_gid(current_fsgid()), prid,
XFS_QMOPT_QUOTALL | XFS_QMOPT_INHERIT, XFS_QMOPT_QUOTALL | XFS_QMOPT_INHERIT,
&udqp, &gdqp, &pdqp); &udqp, &gdqp, &pdqp);
if (error) if (error)