korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-11 12:28:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

xfs: merge the projid fields in struct xfs_icdinode

Browse Source 
There is no point in splitting the fields like this in an purely
in-memory structure.

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 2019-11-12 08:22:54 -08:00 committed by Darrick J. Wong
parent 8d2d878db8
commit de7a866fd4
12 changed files with 26 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -213,13 +213,12 @@ xfs_inode_from_disk(
to->di_version = from->di_version; to->di_version = from->di_version;
if (to->di_version == 1) { if (to->di_version == 1) {
set_nlink(inode, be16_to_cpu(from->di_onlink)); set_nlink(inode, be16_to_cpu(from->di_onlink));
to->di_projid_lo = 0; to->di_projid = 0;
to->di_projid_hi = 0;
to->di_version = 2; to->di_version = 2;
} else { } else {
set_nlink(inode, be32_to_cpu(from->di_nlink)); set_nlink(inode, be32_to_cpu(from->di_nlink));
to->di_projid_lo = be16_to_cpu(from->di_projid_lo); to->di_projid = (prid_t)be16_to_cpu(from->di_projid_hi) << 16 |
to->di_projid_hi = be16_to_cpu(from->di_projid_hi); be16_to_cpu(from->di_projid_lo);
} }
to->di_format = from->di_format; to->di_format = from->di_format;
@ -279,8 +278,8 @@ xfs_inode_to_disk(
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(from->di_uid);
to->di_gid = cpu_to_be32(from->di_gid); to->di_gid = cpu_to_be32(from->di_gid);
to->di_projid_lo = cpu_to_be16(from->di_projid_lo); to->di_projid_lo = cpu_to_be16(from->di_projid & 0xffff);
to->di_projid_hi = cpu_to_be16(from->di_projid_hi); to->di_projid_hi = cpu_to_be16(from->di_projid >> 16);
memset(to->di_pad, 0, sizeof(to->di_pad)); memset(to->di_pad, 0, sizeof(to->di_pad));
to->di_atime.t_sec = cpu_to_be32(inode->i_atime.tv_sec); to->di_atime.t_sec = cpu_to_be32(inode->i_atime.tv_sec);

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

@ -21,8 +21,7 @@ struct xfs_icdinode {
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_uid; /* owner's user id */
uint32_t di_gid; /* owner's group id */ uint32_t di_gid; /* owner's group id */
uint16_t di_projid_lo; /* lower part of owner's project id */ uint32_t di_projid; /* owner's project id */
uint16_t di_projid_hi; /* higher part of 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 */
xfs_extlen_t di_extsize; /* basic/minimum extent size for file */ xfs_extlen_t di_extsize; /* basic/minimum extent size for file */

2
fs/xfs/xfs_dquot.c
View File

@ -833,7 +833,7 @@ xfs_qm_id_for_quotatype(
case XFS_DQ_GROUP: case XFS_DQ_GROUP:
return ip->i_d.di_gid; return ip->i_d.di_gid;
case XFS_DQ_PROJ: case XFS_DQ_PROJ:
return xfs_get_projid(ip); return ip->i_d.di_projid;
} }
ASSERT(0); ASSERT(0);
return 0; return 0;

4
fs/xfs/xfs_icache.c
View File

@ -1419,7 +1419,7 @@ xfs_inode_match_id(
return 0; return 0;
if ((eofb->eof_flags & XFS_EOF_FLAGS_PRID) && if ((eofb->eof_flags & XFS_EOF_FLAGS_PRID) &&
xfs_get_projid(ip) != eofb->eof_prid) ip->i_d.di_projid != eofb->eof_prid)
return 0; return 0;
return 1; return 1;
@ -1443,7 +1443,7 @@ xfs_inode_match_id_union(
return 1; return 1;
if ((eofb->eof_flags & XFS_EOF_FLAGS_PRID) && if ((eofb->eof_flags & XFS_EOF_FLAGS_PRID) &&
xfs_get_projid(ip) == eofb->eof_prid) ip->i_d.di_projid == eofb->eof_prid)
return 1; return 1;
return 0; return 0;

6
fs/xfs/xfs_inode.c
View File

@ -815,7 +815,7 @@ xfs_ialloc(
ip->i_d.di_uid = xfs_kuid_to_uid(current_fsuid()); ip->i_d.di_uid = xfs_kuid_to_uid(current_fsuid());
ip->i_d.di_gid = xfs_kgid_to_gid(current_fsgid()); ip->i_d.di_gid = xfs_kgid_to_gid(current_fsgid());
inode->i_rdev = rdev; inode->i_rdev = rdev;
xfs_set_projid(ip, prid); ip->i_d.di_projid = prid;
if (pip && XFS_INHERIT_GID(pip)) { if (pip && XFS_INHERIT_GID(pip)) {
ip->i_d.di_gid = pip->i_d.di_gid; ip->i_d.di_gid = pip->i_d.di_gid;
@ -1423,7 +1423,7 @@ xfs_link(
* the tree quota mechanism could be circumvented. * the tree quota mechanism could be circumvented.
*/ */
if (unlikely((tdp->i_d.di_flags & XFS_DIFLAG_PROJINHERIT) && if (unlikely((tdp->i_d.di_flags & XFS_DIFLAG_PROJINHERIT) &&
(xfs_get_projid(tdp) != xfs_get_projid(sip)))) { tdp->i_d.di_projid != sip->i_d.di_projid)) {
error = -EXDEV; error = -EXDEV;
goto error_return; goto error_return;
} }
@ -3284,7 +3284,7 @@ xfs_rename(
* tree quota mechanism would be circumvented. * tree quota mechanism would be circumvented.
*/ */
if (unlikely((target_dp->i_d.di_flags & XFS_DIFLAG_PROJINHERIT) && if (unlikely((target_dp->i_d.di_flags & XFS_DIFLAG_PROJINHERIT) &&
(xfs_get_projid(target_dp) != xfs_get_projid(src_ip)))) { target_dp->i_d.di_projid != src_ip->i_d.di_projid)) {
error = -EXDEV; error = -EXDEV;
goto out_trans_cancel; goto out_trans_cancel;
} }

21
fs/xfs/xfs_inode.h
View File

@ -174,30 +174,11 @@ xfs_iflags_test_and_set(xfs_inode_t *ip, unsigned short flags)
return ret; return ret;
} }
/*
* Project quota id helpers (previously projid was 16bit only
* and using two 16bit values to hold new 32bit projid was chosen
* to retain compatibility with "old" filesystems).
*/
static inline prid_t
xfs_get_projid(struct xfs_inode *ip)
{
return (prid_t)ip->i_d.di_projid_hi << 16 | ip->i_d.di_projid_lo;
}
static inline void
xfs_set_projid(struct xfs_inode *ip,
prid_t projid)
{
ip->i_d.di_projid_hi = (uint16_t) (projid >> 16);
ip->i_d.di_projid_lo = (uint16_t) (projid & 0xffff);
}
static inline prid_t static inline prid_t
xfs_get_initial_prid(struct xfs_inode *dp) xfs_get_initial_prid(struct xfs_inode *dp)
{ {
if (dp->i_d.di_flags & XFS_DIFLAG_PROJINHERIT) if (dp->i_d.di_flags & XFS_DIFLAG_PROJINHERIT)
return xfs_get_projid(dp); return dp->i_d.di_projid;
return XFS_PROJID_DEFAULT; return XFS_PROJID_DEFAULT;
} }

4
fs/xfs/xfs_inode_item.c
View File

@ -310,8 +310,8 @@ xfs_inode_to_log_dinode(
to->di_format = from->di_format; to->di_format = from->di_format;
to->di_uid = from->di_uid; to->di_uid = from->di_uid;
to->di_gid = from->di_gid; to->di_gid = from->di_gid;
to->di_projid_lo = from->di_projid_lo; to->di_projid_lo = from->di_projid & 0xffff;
to->di_projid_hi = from->di_projid_hi; to->di_projid_hi = from->di_projid >> 16;
memset(to->di_pad, 0, sizeof(to->di_pad)); memset(to->di_pad, 0, sizeof(to->di_pad));
memset(to->di_pad3, 0, sizeof(to->di_pad3)); memset(to->di_pad3, 0, sizeof(to->di_pad3));

8
fs/xfs/xfs_ioctl.c
View File

@ -1069,7 +1069,7 @@ xfs_fill_fsxattr(
fa->fsx_extsize = ip->i_d.di_extsize << ip->i_mount->m_sb.sb_blocklog; fa->fsx_extsize = ip->i_d.di_extsize << ip->i_mount->m_sb.sb_blocklog;
fa->fsx_cowextsize = ip->i_d.di_cowextsize << fa->fsx_cowextsize = ip->i_d.di_cowextsize <<
ip->i_mount->m_sb.sb_blocklog; ip->i_mount->m_sb.sb_blocklog;
fa->fsx_projid = xfs_get_projid(ip); fa->fsx_projid = ip->i_d.di_projid;
if (attr) { if (attr) {
if (ip->i_afp) { if (ip->i_afp) {
@ -1521,7 +1521,7 @@ xfs_ioctl_setattr(
} }
if (XFS_IS_QUOTA_RUNNING(mp) && XFS_IS_PQUOTA_ON(mp) && if (XFS_IS_QUOTA_RUNNING(mp) && XFS_IS_PQUOTA_ON(mp) &&
xfs_get_projid(ip) != fa->fsx_projid) { ip->i_d.di_projid != fa->fsx_projid) {
code = xfs_qm_vop_chown_reserve(tp, ip, udqp, NULL, pdqp, code = xfs_qm_vop_chown_reserve(tp, ip, udqp, NULL, pdqp,
capable(CAP_FOWNER) ? XFS_QMOPT_FORCE_RES : 0); capable(CAP_FOWNER) ? XFS_QMOPT_FORCE_RES : 0);
if (code) /* out of quota */ if (code) /* out of quota */
@ -1558,13 +1558,13 @@ xfs_ioctl_setattr(
VFS_I(ip)->i_mode &= ~(S_ISUID|S_ISGID); VFS_I(ip)->i_mode &= ~(S_ISUID|S_ISGID);
/* Change the ownerships and register project quota modifications */ /* Change the ownerships and register project quota modifications */
if (xfs_get_projid(ip) != fa->fsx_projid) { if (ip->i_d.di_projid != fa->fsx_projid) {
if (XFS_IS_QUOTA_RUNNING(mp) && XFS_IS_PQUOTA_ON(mp)) { if (XFS_IS_QUOTA_RUNNING(mp) && XFS_IS_PQUOTA_ON(mp)) {
olddquot = xfs_qm_vop_chown(tp, ip, olddquot = xfs_qm_vop_chown(tp, ip,
&ip->i_pdquot, pdqp); &ip->i_pdquot, pdqp);
} }
ASSERT(ip->i_d.di_version > 1); ASSERT(ip->i_d.di_version > 1);
xfs_set_projid(ip, fa->fsx_projid); ip->i_d.di_projid = fa->fsx_projid;
} }
/* /*

2
fs/xfs/xfs_iops.c
View File

@ -692,7 +692,7 @@ xfs_setattr_nonsize(
ASSERT(gdqp == NULL); ASSERT(gdqp == NULL);
error = xfs_qm_vop_dqalloc(ip, xfs_kuid_to_uid(uid), error = xfs_qm_vop_dqalloc(ip, xfs_kuid_to_uid(uid),
xfs_kgid_to_gid(gid), xfs_kgid_to_gid(gid),
xfs_get_projid(ip), ip->i_d.di_projid,
qflags, &udqp, &gdqp, NULL); qflags, &udqp, &gdqp, NULL);
if (error) if (error)
return error; return error;

2
fs/xfs/xfs_itable.c
View File

@ -84,7 +84,7 @@ xfs_bulkstat_one_int(
/* xfs_iget returns the following without needing /* xfs_iget returns the following without needing
* further change. * further change.
*/ */
buf->bs_projectid = xfs_get_projid(ip); 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 = dic->di_uid;
buf->bs_gid = dic->di_gid; buf->bs_gid = dic->di_gid;

8
fs/xfs/xfs_qm.c
View File

@ -342,7 +342,7 @@ xfs_qm_dqattach_locked(
} }
if (XFS_IS_PQUOTA_ON(mp) && !ip->i_pdquot) { if (XFS_IS_PQUOTA_ON(mp) && !ip->i_pdquot) {
error = xfs_qm_dqattach_one(ip, xfs_get_projid(ip), XFS_DQ_PROJ, error = xfs_qm_dqattach_one(ip, ip->i_d.di_projid, XFS_DQ_PROJ,
doalloc, &ip->i_pdquot); doalloc, &ip->i_pdquot);
if (error) if (error)
goto done; goto done;
@ -1698,7 +1698,7 @@ xfs_qm_vop_dqalloc(
} }
} }
if ((flags & XFS_QMOPT_PQUOTA) && XFS_IS_PQUOTA_ON(mp)) { if ((flags & XFS_QMOPT_PQUOTA) && XFS_IS_PQUOTA_ON(mp)) {
if (xfs_get_projid(ip) != prid) { if (ip->i_d.di_projid != prid) {
xfs_iunlock(ip, lockflags); xfs_iunlock(ip, lockflags);
error = xfs_qm_dqget(mp, (xfs_dqid_t)prid, XFS_DQ_PROJ, error = xfs_qm_dqget(mp, (xfs_dqid_t)prid, XFS_DQ_PROJ,
true, &pq); true, &pq);
@ -1832,7 +1832,7 @@ xfs_qm_vop_chown_reserve(
} }
if (XFS_IS_PQUOTA_ON(ip->i_mount) && pdqp && if (XFS_IS_PQUOTA_ON(ip->i_mount) && pdqp &&
xfs_get_projid(ip) != be32_to_cpu(pdqp->q_core.d_id)) { ip->i_d.di_projid != be32_to_cpu(pdqp->q_core.d_id)) {
prjflags = XFS_QMOPT_ENOSPC; prjflags = XFS_QMOPT_ENOSPC;
pdq_delblks = pdqp; pdq_delblks = pdqp;
if (delblks) { if (delblks) {
@ -1933,7 +1933,7 @@ xfs_qm_vop_create_dqattach(
} }
if (pdqp && XFS_IS_PQUOTA_ON(mp)) { if (pdqp && XFS_IS_PQUOTA_ON(mp)) {
ASSERT(ip->i_pdquot == NULL); ASSERT(ip->i_pdquot == NULL);
ASSERT(xfs_get_projid(ip) == be32_to_cpu(pdqp->q_core.d_id)); ASSERT(ip->i_d.di_projid == be32_to_cpu(pdqp->q_core.d_id));
ip->i_pdquot = xfs_qm_dqhold(pdqp); ip->i_pdquot = xfs_qm_dqhold(pdqp);
xfs_trans_mod_dquot(tp, pdqp, XFS_TRANS_DQ_ICOUNT, 1); xfs_trans_mod_dquot(tp, pdqp, XFS_TRANS_DQ_ICOUNT, 1);

2
fs/xfs/xfs_qm_bhv.c
View File

@ -60,7 +60,7 @@ xfs_qm_statvfs(
xfs_mount_t *mp = ip->i_mount; xfs_mount_t *mp = ip->i_mount;
xfs_dquot_t *dqp; xfs_dquot_t *dqp;
if (!xfs_qm_dqget(mp, xfs_get_projid(ip), XFS_DQ_PROJ, false, &dqp)) { if (!xfs_qm_dqget(mp, ip->i_d.di_projid, XFS_DQ_PROJ, false, &dqp)) {
xfs_fill_statvfs_from_dquot(statp, dqp); xfs_fill_statvfs_from_dquot(statp, dqp);
xfs_qm_dqput(dqp); xfs_qm_dqput(dqp);
} }