|
@@ -2082,24 +2082,21 @@ xfs_qm_vop_create_dqattach(
|
|
|
ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL));
|
|
|
ASSERT(XFS_IS_QUOTA_RUNNING(mp));
|
|
|
|
|
|
- if (udqp) {
|
|
|
+ if (udqp && XFS_IS_UQUOTA_ON(mp)) {
|
|
|
ASSERT(ip->i_udquot == NULL);
|
|
|
- ASSERT(XFS_IS_UQUOTA_ON(mp));
|
|
|
ASSERT(ip->i_d.di_uid == be32_to_cpu(udqp->q_core.d_id));
|
|
|
|
|
|
ip->i_udquot = xfs_qm_dqhold(udqp);
|
|
|
xfs_trans_mod_dquot(tp, udqp, XFS_TRANS_DQ_ICOUNT, 1);
|
|
|
}
|
|
|
- if (gdqp) {
|
|
|
+ if (gdqp && XFS_IS_GQUOTA_ON(mp)) {
|
|
|
ASSERT(ip->i_gdquot == NULL);
|
|
|
- ASSERT(XFS_IS_GQUOTA_ON(mp));
|
|
|
ASSERT(ip->i_d.di_gid == be32_to_cpu(gdqp->q_core.d_id));
|
|
|
ip->i_gdquot = xfs_qm_dqhold(gdqp);
|
|
|
xfs_trans_mod_dquot(tp, gdqp, XFS_TRANS_DQ_ICOUNT, 1);
|
|
|
}
|
|
|
- if (pdqp) {
|
|
|
+ if (pdqp && XFS_IS_PQUOTA_ON(mp)) {
|
|
|
ASSERT(ip->i_pdquot == NULL);
|
|
|
- ASSERT(XFS_IS_PQUOTA_ON(mp));
|
|
|
ASSERT(xfs_get_projid(ip) == be32_to_cpu(pdqp->q_core.d_id));
|
|
|
|
|
|
ip->i_pdquot = xfs_qm_dqhold(pdqp);
|