| Message ID | 159353174298.2864738.13894827380600479929.stgit@magnolia (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | xfs: remove xfs_disk_quot from incore dquot | expand |
On Tuesday 30 June 2020 9:12:23 PM IST Darrick J. Wong wrote: > From: Darrick J. Wong <darrick.wong@oracle.com> > > Add a dquot id field to the incore dquot, and use that instead of the > one in qcore. This eliminates a bunch of endian conversions and will > eventually allow us to remove qcore entirely. > > We also rearrange the start of xfs_dquot to remove padding holes, saving > 8 bytes. The changes look good to me. Reviewed-by: Chandan Babu R <chandanrlinux@gmail.com> > > Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> > --- > fs/xfs/scrub/quota.c | 19 ++++++++++++------- > fs/xfs/xfs_dquot.c | 25 +++++++++++-------------- > fs/xfs/xfs_dquot.h | 5 +++-- > fs/xfs/xfs_dquot_item.c | 2 +- > fs/xfs/xfs_qm.c | 22 ++++++++++------------ > fs/xfs/xfs_qm_syscalls.c | 4 ++-- > fs/xfs/xfs_trace.h | 2 +- > fs/xfs/xfs_trans_dquot.c | 8 +++----- > 8 files changed, 43 insertions(+), 44 deletions(-) > > > diff --git a/fs/xfs/scrub/quota.c b/fs/xfs/scrub/quota.c > index 710659d3fa28..9a271f115882 100644 > --- a/fs/xfs/scrub/quota.c > +++ b/fs/xfs/scrub/quota.c > @@ -92,7 +92,6 @@ xchk_quota_item( > unsigned long long icount; > unsigned long long rcount; > xfs_ino_t fs_icount; > - xfs_dqid_t id = be32_to_cpu(d->d_id); > int error = 0; > > if (xchk_should_terminate(sc, &error)) > @@ -102,11 +101,11 @@ xchk_quota_item( > * Except for the root dquot, the actual dquot we got must either have > * the same or higher id as we saw before. > */ > - offset = id / qi->qi_dqperchunk; > - if (id && id <= sqi->last_id) > + offset = dq->q_id / qi->qi_dqperchunk; > + if (dq->q_id && dq->q_id <= sqi->last_id) > xchk_fblock_set_corrupt(sc, XFS_DATA_FORK, offset); > > - sqi->last_id = id; > + sqi->last_id = dq->q_id; > > if (d->d_pad0 != cpu_to_be32(0) || d->d_pad != cpu_to_be16(0)) > xchk_fblock_set_corrupt(sc, XFS_DATA_FORK, offset); > @@ -171,13 +170,19 @@ xchk_quota_item( > * lower limit than the actual usage. However, we flag it for > * admin review. > */ > - if (id != 0 && bhard != 0 && bcount > bhard) > + if (dq->q_id == 0) > + goto out; > + > + if (bhard != 0 && bcount > bhard) > xchk_fblock_set_warning(sc, XFS_DATA_FORK, offset); > - if (id != 0 && ihard != 0 && icount > ihard) > + > + if (ihard != 0 && icount > ihard) > xchk_fblock_set_warning(sc, XFS_DATA_FORK, offset); > - if (id != 0 && rhard != 0 && rcount > rhard) > + > + if (rhard != 0 && rcount > rhard) > xchk_fblock_set_warning(sc, XFS_DATA_FORK, offset); > > +out: > if (sc->sm->sm_flags & XFS_SCRUB_OFLAG_CORRUPT) > return -EFSCORRUPTED; > > diff --git a/fs/xfs/xfs_dquot.c b/fs/xfs/xfs_dquot.c > index 59d1bce34a98..76b35888e726 100644 > --- a/fs/xfs/xfs_dquot.c > +++ b/fs/xfs/xfs_dquot.c > @@ -74,7 +74,7 @@ xfs_qm_adjust_dqlimits( > struct xfs_def_quota *defq; > int prealloc = 0; > > - ASSERT(d->d_id); > + ASSERT(dq->q_id); > defq = xfs_get_defquota(q, xfs_dquot_type(dq)); > > if (defq->bsoftlimit && !d->d_blk_softlimit) { > @@ -120,7 +120,7 @@ xfs_qm_adjust_dqtimers( > struct xfs_disk_dquot *d = &dq->q_core; > struct xfs_def_quota *defq; > > - ASSERT(d->d_id); > + ASSERT(dq->q_id); > defq = xfs_get_defquota(qi, xfs_dquot_type(dq)); > > #ifdef DEBUG > @@ -365,7 +365,7 @@ xfs_dquot_disk_alloc( > * Make a chunk of dquots out of this buffer and log > * the entire thing. > */ > - xfs_qm_init_dquot_blk(tp, mp, be32_to_cpu(dqp->q_core.d_id), > + xfs_qm_init_dquot_blk(tp, mp, dqp->q_id, > dqp->dq_flags & XFS_DQ_ALLTYPES, bp); > xfs_buf_set_ref(bp, XFS_DQUOT_REF); > > @@ -478,7 +478,7 @@ xfs_dquot_alloc( > dqp = kmem_zone_zalloc(xfs_qm_dqzone, 0); > > dqp->dq_flags = type; > - dqp->q_core.d_id = cpu_to_be32(id); > + dqp->q_id = id; > dqp->q_mount = mp; > INIT_LIST_HEAD(&dqp->q_lru); > mutex_init(&dqp->q_qlock); > @@ -537,10 +537,10 @@ xfs_dquot_from_disk( > */ > if ((dqp->dq_flags & XFS_DQ_ALLTYPES) != > (ddqp->d_flags & XFS_DQ_ALLTYPES) || > - dqp->q_core.d_id != ddqp->d_id) { > + dqp->q_id != be32_to_cpu(ddqp->d_id)) { > xfs_alert(bp->b_mount, > "Metadata corruption detected at %pS, quota %u", > - __this_address, be32_to_cpu(dqp->q_core.d_id)); > + __this_address, dqp->q_id); > xfs_alert(bp->b_mount, "Unmount and run xfs_repair"); > return -EFSCORRUPTED; > } > @@ -1177,11 +1177,10 @@ xfs_qm_dqflush( > ddqp = &dqb->dd_diskdq; > > /* sanity check the in-core structure before we flush */ > - fa = xfs_dquot_verify(mp, &dqp->q_core, be32_to_cpu(dqp->q_core.d_id), > - 0); > + fa = xfs_dquot_verify(mp, &dqp->q_core, dqp->q_id, 0); > if (fa) { > xfs_alert(mp, "corrupt dquot ID 0x%x in memory at %pS", > - be32_to_cpu(dqp->q_core.d_id), fa); > + dqp->q_id, fa); > xfs_buf_relse(bp); > error = -EFSCORRUPTED; > goto out_abort; > @@ -1190,7 +1189,7 @@ xfs_qm_dqflush( > fa = xfs_qm_dqflush_check(dqp); > if (fa) { > xfs_alert(mp, "corrupt dquot ID 0x%x in memory at %pS", > - be32_to_cpu(dqp->q_core.d_id), fa); > + dqp->q_id, fa); > xfs_buf_relse(bp); > error = -EFSCORRUPTED; > goto out_abort; > @@ -1263,8 +1262,7 @@ xfs_dqlock2( > { > if (d1 && d2) { > ASSERT(d1 != d2); > - if (be32_to_cpu(d1->q_core.d_id) > > - be32_to_cpu(d2->q_core.d_id)) { > + if (d1->q_id > d2->q_id) { > mutex_lock(&d2->q_qlock); > mutex_lock_nested(&d1->q_qlock, XFS_QLOCK_NESTED); > } else { > @@ -1332,9 +1330,8 @@ xfs_qm_dqiterate( > return error; > > error = iter_fn(dq, dqtype, priv); > - id = be32_to_cpu(dq->q_core.d_id); > + id = dq->q_id + 1; > xfs_qm_dqput(dq); > - id++; > } while (error == 0 && id != 0); > > return error; > diff --git a/fs/xfs/xfs_dquot.h b/fs/xfs/xfs_dquot.h > index 1b1a4261a580..5ea1f1515979 100644 > --- a/fs/xfs/xfs_dquot.h > +++ b/fs/xfs/xfs_dquot.h > @@ -31,12 +31,13 @@ enum { > * The incore dquot structure > */ > struct xfs_dquot { > - uint dq_flags; > struct list_head q_lru; > struct xfs_mount *q_mount; > + xfs_dqid_t q_id; > + uint dq_flags; > uint q_nrefs; > - xfs_daddr_t q_blkno; > int q_bufoffset; > + xfs_daddr_t q_blkno; > xfs_fileoff_t q_fileoffset; > > struct xfs_disk_dquot q_core; > diff --git a/fs/xfs/xfs_dquot_item.c b/fs/xfs/xfs_dquot_item.c > index ff0ab65cf413..378d919997f1 100644 > --- a/fs/xfs/xfs_dquot_item.c > +++ b/fs/xfs/xfs_dquot_item.c > @@ -53,7 +53,7 @@ xfs_qm_dquot_logitem_format( > qlf = xlog_prepare_iovec(lv, &vecp, XLOG_REG_TYPE_QFORMAT); > qlf->qlf_type = XFS_LI_DQUOT; > qlf->qlf_size = 2; > - qlf->qlf_id = be32_to_cpu(qlip->qli_dquot->q_core.d_id); > + qlf->qlf_id = qlip->qli_dquot->q_id; > qlf->qlf_blkno = qlip->qli_dquot->q_blkno; > qlf->qlf_len = 1; > qlf->qlf_boffset = qlip->qli_dquot->q_bufoffset; > diff --git a/fs/xfs/xfs_qm.c b/fs/xfs/xfs_qm.c > index 632025c2f00b..95e51186bd57 100644 > --- a/fs/xfs/xfs_qm.c > +++ b/fs/xfs/xfs_qm.c > @@ -79,7 +79,7 @@ xfs_qm_dquot_walk( > for (i = 0; i < nr_found; i++) { > struct xfs_dquot *dqp = batch[i]; > > - next_index = be32_to_cpu(dqp->q_core.d_id) + 1; > + next_index = dqp->q_id + 1; > > error = execute(batch[i], data); > if (error == -EAGAIN) { > @@ -161,8 +161,7 @@ xfs_qm_dqpurge( > xfs_dqfunlock(dqp); > xfs_dqunlock(dqp); > > - radix_tree_delete(xfs_dquot_tree(qi, dqp->dq_flags), > - be32_to_cpu(dqp->q_core.d_id)); > + radix_tree_delete(xfs_dquot_tree(qi, dqp->dq_flags), dqp->q_id); > qi->qi_dquots--; > > /* > @@ -1112,7 +1111,7 @@ xfs_qm_quotacheck_dqadjust( > * > * There are no timers for the default values set in the root dquot. > */ > - if (dqp->q_core.d_id) { > + if (dqp->q_id) { > xfs_qm_adjust_dqlimits(mp, dqp); > xfs_qm_adjust_dqtimers(mp, dqp); > } > @@ -1598,8 +1597,7 @@ xfs_qm_dqfree_one( > struct xfs_quotainfo *qi = mp->m_quotainfo; > > mutex_lock(&qi->qi_tree_lock); > - radix_tree_delete(xfs_dquot_tree(qi, dqp->dq_flags), > - be32_to_cpu(dqp->q_core.d_id)); > + radix_tree_delete(xfs_dquot_tree(qi, dqp->dq_flags), dqp->q_id); > > qi->qi_dquots--; > mutex_unlock(&qi->qi_tree_lock); > @@ -1823,7 +1821,7 @@ xfs_qm_vop_chown_reserve( > XFS_QMOPT_RES_RTBLKS : XFS_QMOPT_RES_REGBLKS; > > if (XFS_IS_UQUOTA_ON(mp) && udqp && > - i_uid_read(VFS_I(ip)) != be32_to_cpu(udqp->q_core.d_id)) { > + i_uid_read(VFS_I(ip)) != udqp->q_id) { > udq_delblks = udqp; > /* > * If there are delayed allocation blocks, then we have to > @@ -1836,7 +1834,7 @@ xfs_qm_vop_chown_reserve( > } > } > if (XFS_IS_GQUOTA_ON(ip->i_mount) && gdqp && > - i_gid_read(VFS_I(ip)) != be32_to_cpu(gdqp->q_core.d_id)) { > + i_gid_read(VFS_I(ip)) != gdqp->q_id) { > gdq_delblks = gdqp; > if (delblks) { > ASSERT(ip->i_gdquot); > @@ -1845,7 +1843,7 @@ xfs_qm_vop_chown_reserve( > } > > if (XFS_IS_PQUOTA_ON(ip->i_mount) && pdqp && > - ip->i_d.di_projid != be32_to_cpu(pdqp->q_core.d_id)) { > + ip->i_d.di_projid != pdqp->q_id) { > pdq_delblks = pdqp; > if (delblks) { > ASSERT(ip->i_pdquot); > @@ -1929,21 +1927,21 @@ xfs_qm_vop_create_dqattach( > > if (udqp && XFS_IS_UQUOTA_ON(mp)) { > ASSERT(ip->i_udquot == NULL); > - ASSERT(i_uid_read(VFS_I(ip)) == be32_to_cpu(udqp->q_core.d_id)); > + ASSERT(i_uid_read(VFS_I(ip)) == udqp->q_id); > > ip->i_udquot = xfs_qm_dqhold(udqp); > xfs_trans_mod_dquot(tp, udqp, XFS_TRANS_DQ_ICOUNT, 1); > } > if (gdqp && XFS_IS_GQUOTA_ON(mp)) { > ASSERT(ip->i_gdquot == NULL); > - ASSERT(i_gid_read(VFS_I(ip)) == be32_to_cpu(gdqp->q_core.d_id)); > + ASSERT(i_gid_read(VFS_I(ip)) == gdqp->q_id); > > ip->i_gdquot = xfs_qm_dqhold(gdqp); > xfs_trans_mod_dquot(tp, gdqp, XFS_TRANS_DQ_ICOUNT, 1); > } > if (pdqp && XFS_IS_PQUOTA_ON(mp)) { > ASSERT(ip->i_pdquot == NULL); > - ASSERT(ip->i_d.di_projid == be32_to_cpu(pdqp->q_core.d_id)); > + ASSERT(ip->i_d.di_projid == pdqp->q_id); > > ip->i_pdquot = xfs_qm_dqhold(pdqp); > xfs_trans_mod_dquot(tp, pdqp, XFS_TRANS_DQ_ICOUNT, 1); > diff --git a/fs/xfs/xfs_qm_syscalls.c b/fs/xfs/xfs_qm_syscalls.c > index 8cbb65f01bf1..90a11e7daf92 100644 > --- a/fs/xfs/xfs_qm_syscalls.c > +++ b/fs/xfs/xfs_qm_syscalls.c > @@ -656,7 +656,7 @@ xfs_qm_scall_getquota_fill_qc( > if (((XFS_IS_UQUOTA_ENFORCED(mp) && type == XFS_DQ_USER) || > (XFS_IS_GQUOTA_ENFORCED(mp) && type == XFS_DQ_GROUP) || > (XFS_IS_PQUOTA_ENFORCED(mp) && type == XFS_DQ_PROJ)) && > - dqp->q_core.d_id != 0) { > + dqp->q_id != 0) { > if ((dst->d_space > dst->d_spc_softlimit) && > (dst->d_spc_softlimit > 0)) { > ASSERT(dst->d_spc_timer != 0); > @@ -723,7 +723,7 @@ xfs_qm_scall_getquota_next( > return error; > > /* Fill in the ID we actually read from disk */ > - *id = be32_to_cpu(dqp->q_core.d_id); > + *id = dqp->q_id; > > xfs_qm_scall_getquota_fill_qc(mp, type, dqp, dst); > > diff --git a/fs/xfs/xfs_trace.h b/fs/xfs/xfs_trace.h > index 2c5df8315351..78d9dbc7614d 100644 > --- a/fs/xfs/xfs_trace.h > +++ b/fs/xfs/xfs_trace.h > @@ -876,7 +876,7 @@ DECLARE_EVENT_CLASS(xfs_dquot_class, > ), \ > TP_fast_assign( > __entry->dev = dqp->q_mount->m_super->s_dev; > - __entry->id = be32_to_cpu(dqp->q_core.d_id); > + __entry->id = dqp->q_id; > __entry->flags = dqp->dq_flags; > __entry->nrefs = dqp->q_nrefs; > __entry->res_bcount = dqp->q_res_bcount; > diff --git a/fs/xfs/xfs_trans_dquot.c b/fs/xfs/xfs_trans_dquot.c > index ed0ce8b301b4..a2656ec6ea76 100644 > --- a/fs/xfs/xfs_trans_dquot.c > +++ b/fs/xfs/xfs_trans_dquot.c > @@ -386,7 +386,7 @@ xfs_trans_apply_dquot_deltas( > * Get any default limits in use. > * Start/reset the timer(s) if needed. > */ > - if (d->d_id) { > + if (dqp->q_id) { > xfs_qm_adjust_dqlimits(tp->t_mountp, dqp); > xfs_qm_adjust_dqtimers(tp->t_mountp, dqp); > } > @@ -558,8 +558,7 @@ xfs_quota_warn( > else > qtype = GRPQUOTA; > > - quota_send_warning(make_kqid(&init_user_ns, qtype, > - be32_to_cpu(dqp->q_core.d_id)), > + quota_send_warning(make_kqid(&init_user_ns, qtype, dqp->q_id), > mp->m_super->s_dev, type); > } > > @@ -618,8 +617,7 @@ xfs_trans_dqresv( > resbcountp = &dqp->q_res_rtbcount; > } > > - if ((flags & XFS_QMOPT_FORCE_RES) == 0 && > - dqp->q_core.d_id && > + if ((flags & XFS_QMOPT_FORCE_RES) == 0 && dqp->q_id && > ((XFS_IS_UQUOTA_ENFORCED(dqp->q_mount) && XFS_QM_ISUDQ(dqp)) || > (XFS_IS_GQUOTA_ENFORCED(dqp->q_mount) && XFS_QM_ISGDQ(dqp)) || > (XFS_IS_PQUOTA_ENFORCED(dqp->q_mount) && XFS_QM_ISPDQ(dqp)))) { > >
On Tue, Jun 30, 2020 at 08:42:23AM -0700, Darrick J. Wong wrote: > From: Darrick J. Wong <darrick.wong@oracle.com> > > Add a dquot id field to the incore dquot, and use that instead of the > one in qcore. This eliminates a bunch of endian conversions and will > eventually allow us to remove qcore entirely. > > We also rearrange the start of xfs_dquot to remove padding holes, saving > 8 bytes. > > Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Looks good, Reviewed-by: Christoph Hellwig <hch@lst.de>
On 6/30/20 8:42 AM, Darrick J. Wong wrote: > From: Darrick J. Wong <darrick.wong@oracle.com> > > Add a dquot id field to the incore dquot, and use that instead of the > one in qcore. This eliminates a bunch of endian conversions and will > eventually allow us to remove qcore entirely. > > We also rearrange the start of xfs_dquot to remove padding holes, saving > 8 bytes. > > Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Ok looks straight forward to me Reviewed-by: Allison Collins <allison.henderson@oracle.com> > --- > fs/xfs/scrub/quota.c | 19 ++++++++++++------- > fs/xfs/xfs_dquot.c | 25 +++++++++++-------------- > fs/xfs/xfs_dquot.h | 5 +++-- > fs/xfs/xfs_dquot_item.c | 2 +- > fs/xfs/xfs_qm.c | 22 ++++++++++------------ > fs/xfs/xfs_qm_syscalls.c | 4 ++-- > fs/xfs/xfs_trace.h | 2 +- > fs/xfs/xfs_trans_dquot.c | 8 +++----- > 8 files changed, 43 insertions(+), 44 deletions(-) > > > diff --git a/fs/xfs/scrub/quota.c b/fs/xfs/scrub/quota.c > index 710659d3fa28..9a271f115882 100644 > --- a/fs/xfs/scrub/quota.c > +++ b/fs/xfs/scrub/quota.c > @@ -92,7 +92,6 @@ xchk_quota_item( > unsigned long long icount; > unsigned long long rcount; > xfs_ino_t fs_icount; > - xfs_dqid_t id = be32_to_cpu(d->d_id); > int error = 0; > > if (xchk_should_terminate(sc, &error)) > @@ -102,11 +101,11 @@ xchk_quota_item( > * Except for the root dquot, the actual dquot we got must either have > * the same or higher id as we saw before. > */ > - offset = id / qi->qi_dqperchunk; > - if (id && id <= sqi->last_id) > + offset = dq->q_id / qi->qi_dqperchunk; > + if (dq->q_id && dq->q_id <= sqi->last_id) > xchk_fblock_set_corrupt(sc, XFS_DATA_FORK, offset); > > - sqi->last_id = id; > + sqi->last_id = dq->q_id; > > if (d->d_pad0 != cpu_to_be32(0) || d->d_pad != cpu_to_be16(0)) > xchk_fblock_set_corrupt(sc, XFS_DATA_FORK, offset); > @@ -171,13 +170,19 @@ xchk_quota_item( > * lower limit than the actual usage. However, we flag it for > * admin review. > */ > - if (id != 0 && bhard != 0 && bcount > bhard) > + if (dq->q_id == 0) > + goto out; > + > + if (bhard != 0 && bcount > bhard) > xchk_fblock_set_warning(sc, XFS_DATA_FORK, offset); > - if (id != 0 && ihard != 0 && icount > ihard) > + > + if (ihard != 0 && icount > ihard) > xchk_fblock_set_warning(sc, XFS_DATA_FORK, offset); > - if (id != 0 && rhard != 0 && rcount > rhard) > + > + if (rhard != 0 && rcount > rhard) > xchk_fblock_set_warning(sc, XFS_DATA_FORK, offset); > > +out: > if (sc->sm->sm_flags & XFS_SCRUB_OFLAG_CORRUPT) > return -EFSCORRUPTED; > > diff --git a/fs/xfs/xfs_dquot.c b/fs/xfs/xfs_dquot.c > index 59d1bce34a98..76b35888e726 100644 > --- a/fs/xfs/xfs_dquot.c > +++ b/fs/xfs/xfs_dquot.c > @@ -74,7 +74,7 @@ xfs_qm_adjust_dqlimits( > struct xfs_def_quota *defq; > int prealloc = 0; > > - ASSERT(d->d_id); > + ASSERT(dq->q_id); > defq = xfs_get_defquota(q, xfs_dquot_type(dq)); > > if (defq->bsoftlimit && !d->d_blk_softlimit) { > @@ -120,7 +120,7 @@ xfs_qm_adjust_dqtimers( > struct xfs_disk_dquot *d = &dq->q_core; > struct xfs_def_quota *defq; > > - ASSERT(d->d_id); > + ASSERT(dq->q_id); > defq = xfs_get_defquota(qi, xfs_dquot_type(dq)); > > #ifdef DEBUG > @@ -365,7 +365,7 @@ xfs_dquot_disk_alloc( > * Make a chunk of dquots out of this buffer and log > * the entire thing. > */ > - xfs_qm_init_dquot_blk(tp, mp, be32_to_cpu(dqp->q_core.d_id), > + xfs_qm_init_dquot_blk(tp, mp, dqp->q_id, > dqp->dq_flags & XFS_DQ_ALLTYPES, bp); > xfs_buf_set_ref(bp, XFS_DQUOT_REF); > > @@ -478,7 +478,7 @@ xfs_dquot_alloc( > dqp = kmem_zone_zalloc(xfs_qm_dqzone, 0); > > dqp->dq_flags = type; > - dqp->q_core.d_id = cpu_to_be32(id); > + dqp->q_id = id; > dqp->q_mount = mp; > INIT_LIST_HEAD(&dqp->q_lru); > mutex_init(&dqp->q_qlock); > @@ -537,10 +537,10 @@ xfs_dquot_from_disk( > */ > if ((dqp->dq_flags & XFS_DQ_ALLTYPES) != > (ddqp->d_flags & XFS_DQ_ALLTYPES) || > - dqp->q_core.d_id != ddqp->d_id) { > + dqp->q_id != be32_to_cpu(ddqp->d_id)) { > xfs_alert(bp->b_mount, > "Metadata corruption detected at %pS, quota %u", > - __this_address, be32_to_cpu(dqp->q_core.d_id)); > + __this_address, dqp->q_id); > xfs_alert(bp->b_mount, "Unmount and run xfs_repair"); > return -EFSCORRUPTED; > } > @@ -1177,11 +1177,10 @@ xfs_qm_dqflush( > ddqp = &dqb->dd_diskdq; > > /* sanity check the in-core structure before we flush */ > - fa = xfs_dquot_verify(mp, &dqp->q_core, be32_to_cpu(dqp->q_core.d_id), > - 0); > + fa = xfs_dquot_verify(mp, &dqp->q_core, dqp->q_id, 0); > if (fa) { > xfs_alert(mp, "corrupt dquot ID 0x%x in memory at %pS", > - be32_to_cpu(dqp->q_core.d_id), fa); > + dqp->q_id, fa); > xfs_buf_relse(bp); > error = -EFSCORRUPTED; > goto out_abort; > @@ -1190,7 +1189,7 @@ xfs_qm_dqflush( > fa = xfs_qm_dqflush_check(dqp); > if (fa) { > xfs_alert(mp, "corrupt dquot ID 0x%x in memory at %pS", > - be32_to_cpu(dqp->q_core.d_id), fa); > + dqp->q_id, fa); > xfs_buf_relse(bp); > error = -EFSCORRUPTED; > goto out_abort; > @@ -1263,8 +1262,7 @@ xfs_dqlock2( > { > if (d1 && d2) { > ASSERT(d1 != d2); > - if (be32_to_cpu(d1->q_core.d_id) > > - be32_to_cpu(d2->q_core.d_id)) { > + if (d1->q_id > d2->q_id) { > mutex_lock(&d2->q_qlock); > mutex_lock_nested(&d1->q_qlock, XFS_QLOCK_NESTED); > } else { > @@ -1332,9 +1330,8 @@ xfs_qm_dqiterate( > return error; > > error = iter_fn(dq, dqtype, priv); > - id = be32_to_cpu(dq->q_core.d_id); > + id = dq->q_id + 1; > xfs_qm_dqput(dq); > - id++; > } while (error == 0 && id != 0); > > return error; > diff --git a/fs/xfs/xfs_dquot.h b/fs/xfs/xfs_dquot.h > index 1b1a4261a580..5ea1f1515979 100644 > --- a/fs/xfs/xfs_dquot.h > +++ b/fs/xfs/xfs_dquot.h > @@ -31,12 +31,13 @@ enum { > * The incore dquot structure > */ > struct xfs_dquot { > - uint dq_flags; > struct list_head q_lru; > struct xfs_mount *q_mount; > + xfs_dqid_t q_id; > + uint dq_flags; > uint q_nrefs; > - xfs_daddr_t q_blkno; > int q_bufoffset; > + xfs_daddr_t q_blkno; > xfs_fileoff_t q_fileoffset; > > struct xfs_disk_dquot q_core; > diff --git a/fs/xfs/xfs_dquot_item.c b/fs/xfs/xfs_dquot_item.c > index ff0ab65cf413..378d919997f1 100644 > --- a/fs/xfs/xfs_dquot_item.c > +++ b/fs/xfs/xfs_dquot_item.c > @@ -53,7 +53,7 @@ xfs_qm_dquot_logitem_format( > qlf = xlog_prepare_iovec(lv, &vecp, XLOG_REG_TYPE_QFORMAT); > qlf->qlf_type = XFS_LI_DQUOT; > qlf->qlf_size = 2; > - qlf->qlf_id = be32_to_cpu(qlip->qli_dquot->q_core.d_id); > + qlf->qlf_id = qlip->qli_dquot->q_id; > qlf->qlf_blkno = qlip->qli_dquot->q_blkno; > qlf->qlf_len = 1; > qlf->qlf_boffset = qlip->qli_dquot->q_bufoffset; > diff --git a/fs/xfs/xfs_qm.c b/fs/xfs/xfs_qm.c > index 632025c2f00b..95e51186bd57 100644 > --- a/fs/xfs/xfs_qm.c > +++ b/fs/xfs/xfs_qm.c > @@ -79,7 +79,7 @@ xfs_qm_dquot_walk( > for (i = 0; i < nr_found; i++) { > struct xfs_dquot *dqp = batch[i]; > > - next_index = be32_to_cpu(dqp->q_core.d_id) + 1; > + next_index = dqp->q_id + 1; > > error = execute(batch[i], data); > if (error == -EAGAIN) { > @@ -161,8 +161,7 @@ xfs_qm_dqpurge( > xfs_dqfunlock(dqp); > xfs_dqunlock(dqp); > > - radix_tree_delete(xfs_dquot_tree(qi, dqp->dq_flags), > - be32_to_cpu(dqp->q_core.d_id)); > + radix_tree_delete(xfs_dquot_tree(qi, dqp->dq_flags), dqp->q_id); > qi->qi_dquots--; > > /* > @@ -1112,7 +1111,7 @@ xfs_qm_quotacheck_dqadjust( > * > * There are no timers for the default values set in the root dquot. > */ > - if (dqp->q_core.d_id) { > + if (dqp->q_id) { > xfs_qm_adjust_dqlimits(mp, dqp); > xfs_qm_adjust_dqtimers(mp, dqp); > } > @@ -1598,8 +1597,7 @@ xfs_qm_dqfree_one( > struct xfs_quotainfo *qi = mp->m_quotainfo; > > mutex_lock(&qi->qi_tree_lock); > - radix_tree_delete(xfs_dquot_tree(qi, dqp->dq_flags), > - be32_to_cpu(dqp->q_core.d_id)); > + radix_tree_delete(xfs_dquot_tree(qi, dqp->dq_flags), dqp->q_id); > > qi->qi_dquots--; > mutex_unlock(&qi->qi_tree_lock); > @@ -1823,7 +1821,7 @@ xfs_qm_vop_chown_reserve( > XFS_QMOPT_RES_RTBLKS : XFS_QMOPT_RES_REGBLKS; > > if (XFS_IS_UQUOTA_ON(mp) && udqp && > - i_uid_read(VFS_I(ip)) != be32_to_cpu(udqp->q_core.d_id)) { > + i_uid_read(VFS_I(ip)) != udqp->q_id) { > udq_delblks = udqp; > /* > * If there are delayed allocation blocks, then we have to > @@ -1836,7 +1834,7 @@ xfs_qm_vop_chown_reserve( > } > } > if (XFS_IS_GQUOTA_ON(ip->i_mount) && gdqp && > - i_gid_read(VFS_I(ip)) != be32_to_cpu(gdqp->q_core.d_id)) { > + i_gid_read(VFS_I(ip)) != gdqp->q_id) { > gdq_delblks = gdqp; > if (delblks) { > ASSERT(ip->i_gdquot); > @@ -1845,7 +1843,7 @@ xfs_qm_vop_chown_reserve( > } > > if (XFS_IS_PQUOTA_ON(ip->i_mount) && pdqp && > - ip->i_d.di_projid != be32_to_cpu(pdqp->q_core.d_id)) { > + ip->i_d.di_projid != pdqp->q_id) { > pdq_delblks = pdqp; > if (delblks) { > ASSERT(ip->i_pdquot); > @@ -1929,21 +1927,21 @@ xfs_qm_vop_create_dqattach( > > if (udqp && XFS_IS_UQUOTA_ON(mp)) { > ASSERT(ip->i_udquot == NULL); > - ASSERT(i_uid_read(VFS_I(ip)) == be32_to_cpu(udqp->q_core.d_id)); > + ASSERT(i_uid_read(VFS_I(ip)) == udqp->q_id); > > ip->i_udquot = xfs_qm_dqhold(udqp); > xfs_trans_mod_dquot(tp, udqp, XFS_TRANS_DQ_ICOUNT, 1); > } > if (gdqp && XFS_IS_GQUOTA_ON(mp)) { > ASSERT(ip->i_gdquot == NULL); > - ASSERT(i_gid_read(VFS_I(ip)) == be32_to_cpu(gdqp->q_core.d_id)); > + ASSERT(i_gid_read(VFS_I(ip)) == gdqp->q_id); > > ip->i_gdquot = xfs_qm_dqhold(gdqp); > xfs_trans_mod_dquot(tp, gdqp, XFS_TRANS_DQ_ICOUNT, 1); > } > if (pdqp && XFS_IS_PQUOTA_ON(mp)) { > ASSERT(ip->i_pdquot == NULL); > - ASSERT(ip->i_d.di_projid == be32_to_cpu(pdqp->q_core.d_id)); > + ASSERT(ip->i_d.di_projid == pdqp->q_id); > > ip->i_pdquot = xfs_qm_dqhold(pdqp); > xfs_trans_mod_dquot(tp, pdqp, XFS_TRANS_DQ_ICOUNT, 1); > diff --git a/fs/xfs/xfs_qm_syscalls.c b/fs/xfs/xfs_qm_syscalls.c > index 8cbb65f01bf1..90a11e7daf92 100644 > --- a/fs/xfs/xfs_qm_syscalls.c > +++ b/fs/xfs/xfs_qm_syscalls.c > @@ -656,7 +656,7 @@ xfs_qm_scall_getquota_fill_qc( > if (((XFS_IS_UQUOTA_ENFORCED(mp) && type == XFS_DQ_USER) || > (XFS_IS_GQUOTA_ENFORCED(mp) && type == XFS_DQ_GROUP) || > (XFS_IS_PQUOTA_ENFORCED(mp) && type == XFS_DQ_PROJ)) && > - dqp->q_core.d_id != 0) { > + dqp->q_id != 0) { > if ((dst->d_space > dst->d_spc_softlimit) && > (dst->d_spc_softlimit > 0)) { > ASSERT(dst->d_spc_timer != 0); > @@ -723,7 +723,7 @@ xfs_qm_scall_getquota_next( > return error; > > /* Fill in the ID we actually read from disk */ > - *id = be32_to_cpu(dqp->q_core.d_id); > + *id = dqp->q_id; > > xfs_qm_scall_getquota_fill_qc(mp, type, dqp, dst); > > diff --git a/fs/xfs/xfs_trace.h b/fs/xfs/xfs_trace.h > index 2c5df8315351..78d9dbc7614d 100644 > --- a/fs/xfs/xfs_trace.h > +++ b/fs/xfs/xfs_trace.h > @@ -876,7 +876,7 @@ DECLARE_EVENT_CLASS(xfs_dquot_class, > ), \ > TP_fast_assign( > __entry->dev = dqp->q_mount->m_super->s_dev; > - __entry->id = be32_to_cpu(dqp->q_core.d_id); > + __entry->id = dqp->q_id; > __entry->flags = dqp->dq_flags; > __entry->nrefs = dqp->q_nrefs; > __entry->res_bcount = dqp->q_res_bcount; > diff --git a/fs/xfs/xfs_trans_dquot.c b/fs/xfs/xfs_trans_dquot.c > index ed0ce8b301b4..a2656ec6ea76 100644 > --- a/fs/xfs/xfs_trans_dquot.c > +++ b/fs/xfs/xfs_trans_dquot.c > @@ -386,7 +386,7 @@ xfs_trans_apply_dquot_deltas( > * Get any default limits in use. > * Start/reset the timer(s) if needed. > */ > - if (d->d_id) { > + if (dqp->q_id) { > xfs_qm_adjust_dqlimits(tp->t_mountp, dqp); > xfs_qm_adjust_dqtimers(tp->t_mountp, dqp); > } > @@ -558,8 +558,7 @@ xfs_quota_warn( > else > qtype = GRPQUOTA; > > - quota_send_warning(make_kqid(&init_user_ns, qtype, > - be32_to_cpu(dqp->q_core.d_id)), > + quota_send_warning(make_kqid(&init_user_ns, qtype, dqp->q_id), > mp->m_super->s_dev, type); > } > > @@ -618,8 +617,7 @@ xfs_trans_dqresv( > resbcountp = &dqp->q_res_rtbcount; > } > > - if ((flags & XFS_QMOPT_FORCE_RES) == 0 && > - dqp->q_core.d_id && > + if ((flags & XFS_QMOPT_FORCE_RES) == 0 && dqp->q_id && > ((XFS_IS_UQUOTA_ENFORCED(dqp->q_mount) && XFS_QM_ISUDQ(dqp)) || > (XFS_IS_GQUOTA_ENFORCED(dqp->q_mount) && XFS_QM_ISGDQ(dqp)) || > (XFS_IS_PQUOTA_ENFORCED(dqp->q_mount) && XFS_QM_ISPDQ(dqp)))) { >
diff --git a/fs/xfs/scrub/quota.c b/fs/xfs/scrub/quota.c index 710659d3fa28..9a271f115882 100644 --- a/fs/xfs/scrub/quota.c +++ b/fs/xfs/scrub/quota.c @@ -92,7 +92,6 @@ xchk_quota_item( unsigned long long icount; unsigned long long rcount; xfs_ino_t fs_icount; - xfs_dqid_t id = be32_to_cpu(d->d_id); int error = 0; if (xchk_should_terminate(sc, &error)) @@ -102,11 +101,11 @@ xchk_quota_item( * Except for the root dquot, the actual dquot we got must either have * the same or higher id as we saw before. */ - offset = id / qi->qi_dqperchunk; - if (id && id <= sqi->last_id) + offset = dq->q_id / qi->qi_dqperchunk; + if (dq->q_id && dq->q_id <= sqi->last_id) xchk_fblock_set_corrupt(sc, XFS_DATA_FORK, offset); - sqi->last_id = id; + sqi->last_id = dq->q_id; if (d->d_pad0 != cpu_to_be32(0) || d->d_pad != cpu_to_be16(0)) xchk_fblock_set_corrupt(sc, XFS_DATA_FORK, offset); @@ -171,13 +170,19 @@ xchk_quota_item( * lower limit than the actual usage. However, we flag it for * admin review. */ - if (id != 0 && bhard != 0 && bcount > bhard) + if (dq->q_id == 0) + goto out; + + if (bhard != 0 && bcount > bhard) xchk_fblock_set_warning(sc, XFS_DATA_FORK, offset); - if (id != 0 && ihard != 0 && icount > ihard) + + if (ihard != 0 && icount > ihard) xchk_fblock_set_warning(sc, XFS_DATA_FORK, offset); - if (id != 0 && rhard != 0 && rcount > rhard) + + if (rhard != 0 && rcount > rhard) xchk_fblock_set_warning(sc, XFS_DATA_FORK, offset); +out: if (sc->sm->sm_flags & XFS_SCRUB_OFLAG_CORRUPT) return -EFSCORRUPTED; diff --git a/fs/xfs/xfs_dquot.c b/fs/xfs/xfs_dquot.c index 59d1bce34a98..76b35888e726 100644 --- a/fs/xfs/xfs_dquot.c +++ b/fs/xfs/xfs_dquot.c @@ -74,7 +74,7 @@ xfs_qm_adjust_dqlimits( struct xfs_def_quota *defq; int prealloc = 0; - ASSERT(d->d_id); + ASSERT(dq->q_id); defq = xfs_get_defquota(q, xfs_dquot_type(dq)); if (defq->bsoftlimit && !d->d_blk_softlimit) { @@ -120,7 +120,7 @@ xfs_qm_adjust_dqtimers( struct xfs_disk_dquot *d = &dq->q_core; struct xfs_def_quota *defq; - ASSERT(d->d_id); + ASSERT(dq->q_id); defq = xfs_get_defquota(qi, xfs_dquot_type(dq)); #ifdef DEBUG @@ -365,7 +365,7 @@ xfs_dquot_disk_alloc( * Make a chunk of dquots out of this buffer and log * the entire thing. */ - xfs_qm_init_dquot_blk(tp, mp, be32_to_cpu(dqp->q_core.d_id), + xfs_qm_init_dquot_blk(tp, mp, dqp->q_id, dqp->dq_flags & XFS_DQ_ALLTYPES, bp); xfs_buf_set_ref(bp, XFS_DQUOT_REF); @@ -478,7 +478,7 @@ xfs_dquot_alloc( dqp = kmem_zone_zalloc(xfs_qm_dqzone, 0); dqp->dq_flags = type; - dqp->q_core.d_id = cpu_to_be32(id); + dqp->q_id = id; dqp->q_mount = mp; INIT_LIST_HEAD(&dqp->q_lru); mutex_init(&dqp->q_qlock); @@ -537,10 +537,10 @@ xfs_dquot_from_disk( */ if ((dqp->dq_flags & XFS_DQ_ALLTYPES) != (ddqp->d_flags & XFS_DQ_ALLTYPES) || - dqp->q_core.d_id != ddqp->d_id) { + dqp->q_id != be32_to_cpu(ddqp->d_id)) { xfs_alert(bp->b_mount, "Metadata corruption detected at %pS, quota %u", - __this_address, be32_to_cpu(dqp->q_core.d_id)); + __this_address, dqp->q_id); xfs_alert(bp->b_mount, "Unmount and run xfs_repair"); return -EFSCORRUPTED; } @@ -1177,11 +1177,10 @@ xfs_qm_dqflush( ddqp = &dqb->dd_diskdq; /* sanity check the in-core structure before we flush */ - fa = xfs_dquot_verify(mp, &dqp->q_core, be32_to_cpu(dqp->q_core.d_id), - 0); + fa = xfs_dquot_verify(mp, &dqp->q_core, dqp->q_id, 0); if (fa) { xfs_alert(mp, "corrupt dquot ID 0x%x in memory at %pS", - be32_to_cpu(dqp->q_core.d_id), fa); + dqp->q_id, fa); xfs_buf_relse(bp); error = -EFSCORRUPTED; goto out_abort; @@ -1190,7 +1189,7 @@ xfs_qm_dqflush( fa = xfs_qm_dqflush_check(dqp); if (fa) { xfs_alert(mp, "corrupt dquot ID 0x%x in memory at %pS", - be32_to_cpu(dqp->q_core.d_id), fa); + dqp->q_id, fa); xfs_buf_relse(bp); error = -EFSCORRUPTED; goto out_abort; @@ -1263,8 +1262,7 @@ xfs_dqlock2( { if (d1 && d2) { ASSERT(d1 != d2); - if (be32_to_cpu(d1->q_core.d_id) > - be32_to_cpu(d2->q_core.d_id)) { + if (d1->q_id > d2->q_id) { mutex_lock(&d2->q_qlock); mutex_lock_nested(&d1->q_qlock, XFS_QLOCK_NESTED); } else { @@ -1332,9 +1330,8 @@ xfs_qm_dqiterate( return error; error = iter_fn(dq, dqtype, priv); - id = be32_to_cpu(dq->q_core.d_id); + id = dq->q_id + 1; xfs_qm_dqput(dq); - id++; } while (error == 0 && id != 0); return error; diff --git a/fs/xfs/xfs_dquot.h b/fs/xfs/xfs_dquot.h index 1b1a4261a580..5ea1f1515979 100644 --- a/fs/xfs/xfs_dquot.h +++ b/fs/xfs/xfs_dquot.h @@ -31,12 +31,13 @@ enum { * The incore dquot structure */ struct xfs_dquot { - uint dq_flags; struct list_head q_lru; struct xfs_mount *q_mount; + xfs_dqid_t q_id; + uint dq_flags; uint q_nrefs; - xfs_daddr_t q_blkno; int q_bufoffset; + xfs_daddr_t q_blkno; xfs_fileoff_t q_fileoffset; struct xfs_disk_dquot q_core; diff --git a/fs/xfs/xfs_dquot_item.c b/fs/xfs/xfs_dquot_item.c index ff0ab65cf413..378d919997f1 100644 --- a/fs/xfs/xfs_dquot_item.c +++ b/fs/xfs/xfs_dquot_item.c @@ -53,7 +53,7 @@ xfs_qm_dquot_logitem_format( qlf = xlog_prepare_iovec(lv, &vecp, XLOG_REG_TYPE_QFORMAT); qlf->qlf_type = XFS_LI_DQUOT; qlf->qlf_size = 2; - qlf->qlf_id = be32_to_cpu(qlip->qli_dquot->q_core.d_id); + qlf->qlf_id = qlip->qli_dquot->q_id; qlf->qlf_blkno = qlip->qli_dquot->q_blkno; qlf->qlf_len = 1; qlf->qlf_boffset = qlip->qli_dquot->q_bufoffset; diff --git a/fs/xfs/xfs_qm.c b/fs/xfs/xfs_qm.c index 632025c2f00b..95e51186bd57 100644 --- a/fs/xfs/xfs_qm.c +++ b/fs/xfs/xfs_qm.c @@ -79,7 +79,7 @@ xfs_qm_dquot_walk( for (i = 0; i < nr_found; i++) { struct xfs_dquot *dqp = batch[i]; - next_index = be32_to_cpu(dqp->q_core.d_id) + 1; + next_index = dqp->q_id + 1; error = execute(batch[i], data); if (error == -EAGAIN) { @@ -161,8 +161,7 @@ xfs_qm_dqpurge( xfs_dqfunlock(dqp); xfs_dqunlock(dqp); - radix_tree_delete(xfs_dquot_tree(qi, dqp->dq_flags), - be32_to_cpu(dqp->q_core.d_id)); + radix_tree_delete(xfs_dquot_tree(qi, dqp->dq_flags), dqp->q_id); qi->qi_dquots--; /* @@ -1112,7 +1111,7 @@ xfs_qm_quotacheck_dqadjust( * * There are no timers for the default values set in the root dquot. */ - if (dqp->q_core.d_id) { + if (dqp->q_id) { xfs_qm_adjust_dqlimits(mp, dqp); xfs_qm_adjust_dqtimers(mp, dqp); } @@ -1598,8 +1597,7 @@ xfs_qm_dqfree_one( struct xfs_quotainfo *qi = mp->m_quotainfo; mutex_lock(&qi->qi_tree_lock); - radix_tree_delete(xfs_dquot_tree(qi, dqp->dq_flags), - be32_to_cpu(dqp->q_core.d_id)); + radix_tree_delete(xfs_dquot_tree(qi, dqp->dq_flags), dqp->q_id); qi->qi_dquots--; mutex_unlock(&qi->qi_tree_lock); @@ -1823,7 +1821,7 @@ xfs_qm_vop_chown_reserve( XFS_QMOPT_RES_RTBLKS : XFS_QMOPT_RES_REGBLKS; if (XFS_IS_UQUOTA_ON(mp) && udqp && - i_uid_read(VFS_I(ip)) != be32_to_cpu(udqp->q_core.d_id)) { + i_uid_read(VFS_I(ip)) != udqp->q_id) { udq_delblks = udqp; /* * If there are delayed allocation blocks, then we have to @@ -1836,7 +1834,7 @@ xfs_qm_vop_chown_reserve( } } if (XFS_IS_GQUOTA_ON(ip->i_mount) && gdqp && - i_gid_read(VFS_I(ip)) != be32_to_cpu(gdqp->q_core.d_id)) { + i_gid_read(VFS_I(ip)) != gdqp->q_id) { gdq_delblks = gdqp; if (delblks) { ASSERT(ip->i_gdquot); @@ -1845,7 +1843,7 @@ xfs_qm_vop_chown_reserve( } if (XFS_IS_PQUOTA_ON(ip->i_mount) && pdqp && - ip->i_d.di_projid != be32_to_cpu(pdqp->q_core.d_id)) { + ip->i_d.di_projid != pdqp->q_id) { pdq_delblks = pdqp; if (delblks) { ASSERT(ip->i_pdquot); @@ -1929,21 +1927,21 @@ xfs_qm_vop_create_dqattach( if (udqp && XFS_IS_UQUOTA_ON(mp)) { ASSERT(ip->i_udquot == NULL); - ASSERT(i_uid_read(VFS_I(ip)) == be32_to_cpu(udqp->q_core.d_id)); + ASSERT(i_uid_read(VFS_I(ip)) == udqp->q_id); ip->i_udquot = xfs_qm_dqhold(udqp); xfs_trans_mod_dquot(tp, udqp, XFS_TRANS_DQ_ICOUNT, 1); } if (gdqp && XFS_IS_GQUOTA_ON(mp)) { ASSERT(ip->i_gdquot == NULL); - ASSERT(i_gid_read(VFS_I(ip)) == be32_to_cpu(gdqp->q_core.d_id)); + ASSERT(i_gid_read(VFS_I(ip)) == gdqp->q_id); ip->i_gdquot = xfs_qm_dqhold(gdqp); xfs_trans_mod_dquot(tp, gdqp, XFS_TRANS_DQ_ICOUNT, 1); } if (pdqp && XFS_IS_PQUOTA_ON(mp)) { ASSERT(ip->i_pdquot == NULL); - ASSERT(ip->i_d.di_projid == be32_to_cpu(pdqp->q_core.d_id)); + ASSERT(ip->i_d.di_projid == pdqp->q_id); ip->i_pdquot = xfs_qm_dqhold(pdqp); xfs_trans_mod_dquot(tp, pdqp, XFS_TRANS_DQ_ICOUNT, 1); diff --git a/fs/xfs/xfs_qm_syscalls.c b/fs/xfs/xfs_qm_syscalls.c index 8cbb65f01bf1..90a11e7daf92 100644 --- a/fs/xfs/xfs_qm_syscalls.c +++ b/fs/xfs/xfs_qm_syscalls.c @@ -656,7 +656,7 @@ xfs_qm_scall_getquota_fill_qc( if (((XFS_IS_UQUOTA_ENFORCED(mp) && type == XFS_DQ_USER) || (XFS_IS_GQUOTA_ENFORCED(mp) && type == XFS_DQ_GROUP) || (XFS_IS_PQUOTA_ENFORCED(mp) && type == XFS_DQ_PROJ)) && - dqp->q_core.d_id != 0) { + dqp->q_id != 0) { if ((dst->d_space > dst->d_spc_softlimit) && (dst->d_spc_softlimit > 0)) { ASSERT(dst->d_spc_timer != 0); @@ -723,7 +723,7 @@ xfs_qm_scall_getquota_next( return error; /* Fill in the ID we actually read from disk */ - *id = be32_to_cpu(dqp->q_core.d_id); + *id = dqp->q_id; xfs_qm_scall_getquota_fill_qc(mp, type, dqp, dst); diff --git a/fs/xfs/xfs_trace.h b/fs/xfs/xfs_trace.h index 2c5df8315351..78d9dbc7614d 100644 --- a/fs/xfs/xfs_trace.h +++ b/fs/xfs/xfs_trace.h @@ -876,7 +876,7 @@ DECLARE_EVENT_CLASS(xfs_dquot_class, ), \ TP_fast_assign( __entry->dev = dqp->q_mount->m_super->s_dev; - __entry->id = be32_to_cpu(dqp->q_core.d_id); + __entry->id = dqp->q_id; __entry->flags = dqp->dq_flags; __entry->nrefs = dqp->q_nrefs; __entry->res_bcount = dqp->q_res_bcount; diff --git a/fs/xfs/xfs_trans_dquot.c b/fs/xfs/xfs_trans_dquot.c index ed0ce8b301b4..a2656ec6ea76 100644 --- a/fs/xfs/xfs_trans_dquot.c +++ b/fs/xfs/xfs_trans_dquot.c @@ -386,7 +386,7 @@ xfs_trans_apply_dquot_deltas( * Get any default limits in use. * Start/reset the timer(s) if needed. */ - if (d->d_id) { + if (dqp->q_id) { xfs_qm_adjust_dqlimits(tp->t_mountp, dqp); xfs_qm_adjust_dqtimers(tp->t_mountp, dqp); } @@ -558,8 +558,7 @@ xfs_quota_warn( else qtype = GRPQUOTA; - quota_send_warning(make_kqid(&init_user_ns, qtype, - be32_to_cpu(dqp->q_core.d_id)), + quota_send_warning(make_kqid(&init_user_ns, qtype, dqp->q_id), mp->m_super->s_dev, type); } @@ -618,8 +617,7 @@ xfs_trans_dqresv( resbcountp = &dqp->q_res_rtbcount; } - if ((flags & XFS_QMOPT_FORCE_RES) == 0 && - dqp->q_core.d_id && + if ((flags & XFS_QMOPT_FORCE_RES) == 0 && dqp->q_id && ((XFS_IS_UQUOTA_ENFORCED(dqp->q_mount) && XFS_QM_ISUDQ(dqp)) || (XFS_IS_GQUOTA_ENFORCED(dqp->q_mount) && XFS_QM_ISGDQ(dqp)) || (XFS_IS_PQUOTA_ENFORCED(dqp->q_mount) && XFS_QM_ISPDQ(dqp)))) {