|
@@ -835,7 +835,7 @@ xfs_qm_dqattach_locked(
|
|
|
xfs_qm_dqattach_one(ip, ip->i_d.di_gid, XFS_DQ_GROUP,
|
|
|
flags & XFS_QMOPT_DQALLOC,
|
|
|
ip->i_udquot, &ip->i_gdquot) :
|
|
|
- xfs_qm_dqattach_one(ip, ip->i_d.di_projid, XFS_DQ_PROJ,
|
|
|
+ xfs_qm_dqattach_one(ip, xfs_get_projid(ip), XFS_DQ_PROJ,
|
|
|
flags & XFS_QMOPT_DQALLOC,
|
|
|
ip->i_udquot, &ip->i_gdquot);
|
|
|
/*
|
|
@@ -1630,7 +1630,7 @@ xfs_qm_dqusage_adjust(
|
|
|
}
|
|
|
|
|
|
if (XFS_IS_PQUOTA_ON(mp)) {
|
|
|
- error = xfs_qm_quotacheck_dqadjust(ip, ip->i_d.di_projid,
|
|
|
+ error = xfs_qm_quotacheck_dqadjust(ip, xfs_get_projid(ip),
|
|
|
XFS_DQ_PROJ, nblks, rtblks);
|
|
|
if (error)
|
|
|
goto error0;
|
|
@@ -2249,7 +2249,7 @@ xfs_qm_vop_dqalloc(
|
|
|
xfs_dqunlock(gq);
|
|
|
}
|
|
|
} else if ((flags & XFS_QMOPT_PQUOTA) && XFS_IS_PQUOTA_ON(mp)) {
|
|
|
- if (ip->i_d.di_projid != prid) {
|
|
|
+ if (xfs_get_projid(ip) != prid) {
|
|
|
xfs_iunlock(ip, lockflags);
|
|
|
if ((error = xfs_qm_dqget(mp, NULL, (xfs_dqid_t)prid,
|
|
|
XFS_DQ_PROJ,
|
|
@@ -2371,7 +2371,7 @@ xfs_qm_vop_chown_reserve(
|
|
|
}
|
|
|
if (XFS_IS_OQUOTA_ON(ip->i_mount) && gdqp) {
|
|
|
if (XFS_IS_PQUOTA_ON(ip->i_mount) &&
|
|
|
- ip->i_d.di_projid != be32_to_cpu(gdqp->q_core.d_id))
|
|
|
+ xfs_get_projid(ip) != be32_to_cpu(gdqp->q_core.d_id))
|
|
|
prjflags = XFS_QMOPT_ENOSPC;
|
|
|
|
|
|
if (prjflags ||
|
|
@@ -2475,7 +2475,7 @@ xfs_qm_vop_create_dqattach(
|
|
|
ip->i_gdquot = gdqp;
|
|
|
ASSERT(XFS_IS_OQUOTA_ON(mp));
|
|
|
ASSERT((XFS_IS_GQUOTA_ON(mp) ?
|
|
|
- ip->i_d.di_gid : ip->i_d.di_projid) ==
|
|
|
+ ip->i_d.di_gid : xfs_get_projid(ip)) ==
|
|
|
be32_to_cpu(gdqp->q_core.d_id));
|
|
|
xfs_trans_mod_dquot(tp, gdqp, XFS_TRANS_DQ_ICOUNT, 1);
|
|
|
}
|