| Message ID | 159353176856.2864738.18281608729457160086.stgit@magnolia (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers | show |
| Series | xfs: remove xfs_disk_quot from incore dquot | expand |
On Tuesday 30 June 2020 9:12:48 PM IST Darrick J. Wong wrote: > From: Darrick J. Wong <darrick.wong@oracle.com> > > Add warning counter fields to the incore dquot, and use that instead of > the ones in qcore. This eliminates a bunch of endian conversions and > will eventually allow us to remove qcore entirely. > The changes are logically correct. Reviewed-by: Chandan Babu R <chandanrlinux@gmail.com> > Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> > --- > fs/xfs/xfs_dquot.c | 14 +++++++++++--- > fs/xfs/xfs_dquot.h | 8 ++++++++ > fs/xfs/xfs_qm.c | 12 ++++++------ > fs/xfs/xfs_qm_syscalls.c | 12 ++++++------ > fs/xfs/xfs_trans_dquot.c | 6 +++--- > 5 files changed, 34 insertions(+), 18 deletions(-) > > > diff --git a/fs/xfs/xfs_dquot.c b/fs/xfs/xfs_dquot.c > index 02eae8c2ba1b..a1edb49ceda5 100644 > --- a/fs/xfs/xfs_dquot.c > +++ b/fs/xfs/xfs_dquot.c > @@ -139,7 +139,7 @@ xfs_qm_adjust_dqtimers( > d->d_btimer = cpu_to_be32(ktime_get_real_seconds() + > defq->btimelimit); > } else { > - d->d_bwarns = 0; > + dq->q_blk.warnings = 0; > } > } else { > if ((!dq->q_blk.softlimit || > @@ -158,7 +158,7 @@ xfs_qm_adjust_dqtimers( > d->d_itimer = cpu_to_be32(ktime_get_real_seconds() + > defq->itimelimit); > } else { > - d->d_iwarns = 0; > + dq->q_ino.warnings = 0; > } > } else { > if ((!dq->q_ino.softlimit || > @@ -177,7 +177,7 @@ xfs_qm_adjust_dqtimers( > d->d_rtbtimer = cpu_to_be32(ktime_get_real_seconds() + > defq->rtbtimelimit); > } else { > - d->d_rtbwarns = 0; > + dq->q_rtb.warnings = 0; > } > } else { > if ((!dq->q_rtb.softlimit || > @@ -542,6 +542,10 @@ xfs_dquot_from_disk( > dqp->q_ino.count = be64_to_cpu(ddqp->d_icount); > dqp->q_rtb.count = be64_to_cpu(ddqp->d_rtbcount); > > + dqp->q_blk.warnings = be16_to_cpu(ddqp->d_bwarns); > + dqp->q_ino.warnings = be16_to_cpu(ddqp->d_iwarns); > + dqp->q_rtb.warnings = be16_to_cpu(ddqp->d_rtbwarns); > + > /* > * Reservation counters are defined as reservation plus current usage > * to avoid having to add every time. > @@ -573,6 +577,10 @@ xfs_dquot_to_disk( > ddqp->d_bcount = cpu_to_be64(dqp->q_blk.count); > ddqp->d_icount = cpu_to_be64(dqp->q_ino.count); > ddqp->d_rtbcount = cpu_to_be64(dqp->q_rtb.count); > + > + ddqp->d_bwarns = cpu_to_be16(dqp->q_blk.warnings); > + ddqp->d_iwarns = cpu_to_be16(dqp->q_ino.warnings); > + ddqp->d_rtbwarns = cpu_to_be16(dqp->q_rtb.warnings); > } > > /* Allocate and initialize the dquot buffer for this in-core dquot. */ > diff --git a/fs/xfs/xfs_dquot.h b/fs/xfs/xfs_dquot.h > index 23e05b0d7567..5840bc54b772 100644 > --- a/fs/xfs/xfs_dquot.h > +++ b/fs/xfs/xfs_dquot.h > @@ -37,6 +37,14 @@ struct xfs_dquot_res { > /* Absolute and preferred limits. */ > xfs_qcnt_t hardlimit; > xfs_qcnt_t softlimit; > + > + /* > + * For root dquots, this is the maximum number of warnings that will > + * be issued for this quota type. Otherwise, this is the number of > + * warnings issued against this quota. Note that none of this is > + * implemented. > + */ > + xfs_qwarncnt_t warnings; > }; > > /* > diff --git a/fs/xfs/xfs_qm.c b/fs/xfs/xfs_qm.c > index b47bba204240..4e233cfef46d 100644 > --- a/fs/xfs/xfs_qm.c > +++ b/fs/xfs/xfs_qm.c > @@ -616,12 +616,12 @@ xfs_qm_init_timelimits( > defq->itimelimit = be32_to_cpu(ddqp->d_itimer); > if (ddqp->d_rtbtimer) > defq->rtbtimelimit = be32_to_cpu(ddqp->d_rtbtimer); > - if (ddqp->d_bwarns) > - defq->bwarnlimit = be16_to_cpu(ddqp->d_bwarns); > - if (ddqp->d_iwarns) > - defq->iwarnlimit = be16_to_cpu(ddqp->d_iwarns); > - if (ddqp->d_rtbwarns) > - defq->rtbwarnlimit = be16_to_cpu(ddqp->d_rtbwarns); > + if (dqp->q_blk.warnings) > + defq->bwarnlimit = dqp->q_blk.warnings; > + if (dqp->q_ino.warnings) > + defq->iwarnlimit = dqp->q_ino.warnings; > + if (dqp->q_rtb.warnings) > + defq->rtbwarnlimit = dqp->q_rtb.warnings; > > xfs_qm_dqdestroy(dqp); > } > diff --git a/fs/xfs/xfs_qm_syscalls.c b/fs/xfs/xfs_qm_syscalls.c > index ab596d389e3e..5d3bccdbd3bf 100644 > --- a/fs/xfs/xfs_qm_syscalls.c > +++ b/fs/xfs/xfs_qm_syscalls.c > @@ -548,11 +548,11 @@ xfs_qm_scall_setqlim( > * Update warnings counter(s) if requested > */ > if (newlim->d_fieldmask & QC_SPC_WARNS) > - ddq->d_bwarns = cpu_to_be16(newlim->d_spc_warns); > + dqp->q_blk.warnings = newlim->d_spc_warns; > if (newlim->d_fieldmask & QC_INO_WARNS) > - ddq->d_iwarns = cpu_to_be16(newlim->d_ino_warns); > + dqp->q_ino.warnings = newlim->d_ino_warns; > if (newlim->d_fieldmask & QC_RT_SPC_WARNS) > - ddq->d_rtbwarns = cpu_to_be16(newlim->d_rt_spc_warns); > + dqp->q_rtb.warnings = newlim->d_rt_spc_warns; > > if (id == 0) { > if (newlim->d_fieldmask & QC_SPC_WARNS) > @@ -627,13 +627,13 @@ xfs_qm_scall_getquota_fill_qc( > dst->d_ino_count = dqp->q_ino.reserved; > dst->d_spc_timer = be32_to_cpu(dqp->q_core.d_btimer); > dst->d_ino_timer = be32_to_cpu(dqp->q_core.d_itimer); > - dst->d_ino_warns = be16_to_cpu(dqp->q_core.d_iwarns); > - dst->d_spc_warns = be16_to_cpu(dqp->q_core.d_bwarns); > + dst->d_ino_warns = dqp->q_ino.warnings; > + dst->d_spc_warns = dqp->q_blk.warnings; > dst->d_rt_spc_hardlimit = XFS_FSB_TO_B(mp, dqp->q_rtb.hardlimit); > dst->d_rt_spc_softlimit = XFS_FSB_TO_B(mp, dqp->q_rtb.softlimit); > dst->d_rt_space = XFS_FSB_TO_B(mp, dqp->q_rtb.reserved); > dst->d_rt_spc_timer = be32_to_cpu(dqp->q_core.d_rtbtimer); > - dst->d_rt_spc_warns = be16_to_cpu(dqp->q_core.d_rtbwarns); > + dst->d_rt_spc_warns = dqp->q_rtb.warnings; > > /* > * Internally, we don't reset all the timers when quota enforcement > diff --git a/fs/xfs/xfs_trans_dquot.c b/fs/xfs/xfs_trans_dquot.c > index b36d747989a7..21ed8eda3c80 100644 > --- a/fs/xfs/xfs_trans_dquot.c > +++ b/fs/xfs/xfs_trans_dquot.c > @@ -592,7 +592,7 @@ xfs_trans_dqresv( > if (!softlimit) > softlimit = defq->bsoftlimit; > timer = be32_to_cpu(dqp->q_core.d_btimer); > - warns = be16_to_cpu(dqp->q_core.d_bwarns); > + warns = dqp->q_blk.warnings; > warnlimit = defq->bwarnlimit; > resbcountp = &dqp->q_blk.reserved; > } else { > @@ -604,7 +604,7 @@ xfs_trans_dqresv( > if (!softlimit) > softlimit = defq->rtbsoftlimit; > timer = be32_to_cpu(dqp->q_core.d_rtbtimer); > - warns = be16_to_cpu(dqp->q_core.d_rtbwarns); > + warns = dqp->q_rtb.warnings; > warnlimit = defq->rtbwarnlimit; > resbcountp = &dqp->q_rtb.reserved; > } > @@ -639,7 +639,7 @@ xfs_trans_dqresv( > if (ninos > 0) { > total_count = dqp->q_ino.reserved + ninos; > timer = be32_to_cpu(dqp->q_core.d_itimer); > - warns = be16_to_cpu(dqp->q_core.d_iwarns); > + warns = dqp->q_ino.warnings; > warnlimit = defq->iwarnlimit; > hardlimit = dqp->q_ino.hardlimit; > if (!hardlimit) > >
On Tue, Jun 30, 2020 at 08:42:48AM -0700, Darrick J. Wong wrote: > From: Darrick J. Wong <darrick.wong@oracle.com> > > Add warning counter fields to the incore dquot, and use that instead of > the ones in qcore. This eliminates a bunch of endian conversions and > will eventually allow us to remove qcore entirely. > > 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 warning counter fields to the incore dquot, and use that instead of > the ones in qcore. This eliminates a bunch of endian conversions and > will eventually allow us to remove qcore entirely. > > Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Looks ok Reviewed-by: Allison Collins <allison.henderson@oracle.com> > --- > fs/xfs/xfs_dquot.c | 14 +++++++++++--- > fs/xfs/xfs_dquot.h | 8 ++++++++ > fs/xfs/xfs_qm.c | 12 ++++++------ > fs/xfs/xfs_qm_syscalls.c | 12 ++++++------ > fs/xfs/xfs_trans_dquot.c | 6 +++--- > 5 files changed, 34 insertions(+), 18 deletions(-) > > > diff --git a/fs/xfs/xfs_dquot.c b/fs/xfs/xfs_dquot.c > index 02eae8c2ba1b..a1edb49ceda5 100644 > --- a/fs/xfs/xfs_dquot.c > +++ b/fs/xfs/xfs_dquot.c > @@ -139,7 +139,7 @@ xfs_qm_adjust_dqtimers( > d->d_btimer = cpu_to_be32(ktime_get_real_seconds() + > defq->btimelimit); > } else { > - d->d_bwarns = 0; > + dq->q_blk.warnings = 0; > } > } else { > if ((!dq->q_blk.softlimit || > @@ -158,7 +158,7 @@ xfs_qm_adjust_dqtimers( > d->d_itimer = cpu_to_be32(ktime_get_real_seconds() + > defq->itimelimit); > } else { > - d->d_iwarns = 0; > + dq->q_ino.warnings = 0; > } > } else { > if ((!dq->q_ino.softlimit || > @@ -177,7 +177,7 @@ xfs_qm_adjust_dqtimers( > d->d_rtbtimer = cpu_to_be32(ktime_get_real_seconds() + > defq->rtbtimelimit); > } else { > - d->d_rtbwarns = 0; > + dq->q_rtb.warnings = 0; > } > } else { > if ((!dq->q_rtb.softlimit || > @@ -542,6 +542,10 @@ xfs_dquot_from_disk( > dqp->q_ino.count = be64_to_cpu(ddqp->d_icount); > dqp->q_rtb.count = be64_to_cpu(ddqp->d_rtbcount); > > + dqp->q_blk.warnings = be16_to_cpu(ddqp->d_bwarns); > + dqp->q_ino.warnings = be16_to_cpu(ddqp->d_iwarns); > + dqp->q_rtb.warnings = be16_to_cpu(ddqp->d_rtbwarns); > + > /* > * Reservation counters are defined as reservation plus current usage > * to avoid having to add every time. > @@ -573,6 +577,10 @@ xfs_dquot_to_disk( > ddqp->d_bcount = cpu_to_be64(dqp->q_blk.count); > ddqp->d_icount = cpu_to_be64(dqp->q_ino.count); > ddqp->d_rtbcount = cpu_to_be64(dqp->q_rtb.count); > + > + ddqp->d_bwarns = cpu_to_be16(dqp->q_blk.warnings); > + ddqp->d_iwarns = cpu_to_be16(dqp->q_ino.warnings); > + ddqp->d_rtbwarns = cpu_to_be16(dqp->q_rtb.warnings); > } > > /* Allocate and initialize the dquot buffer for this in-core dquot. */ > diff --git a/fs/xfs/xfs_dquot.h b/fs/xfs/xfs_dquot.h > index 23e05b0d7567..5840bc54b772 100644 > --- a/fs/xfs/xfs_dquot.h > +++ b/fs/xfs/xfs_dquot.h > @@ -37,6 +37,14 @@ struct xfs_dquot_res { > /* Absolute and preferred limits. */ > xfs_qcnt_t hardlimit; > xfs_qcnt_t softlimit; > + > + /* > + * For root dquots, this is the maximum number of warnings that will > + * be issued for this quota type. Otherwise, this is the number of > + * warnings issued against this quota. Note that none of this is > + * implemented. > + */ > + xfs_qwarncnt_t warnings; > }; > > /* > diff --git a/fs/xfs/xfs_qm.c b/fs/xfs/xfs_qm.c > index b47bba204240..4e233cfef46d 100644 > --- a/fs/xfs/xfs_qm.c > +++ b/fs/xfs/xfs_qm.c > @@ -616,12 +616,12 @@ xfs_qm_init_timelimits( > defq->itimelimit = be32_to_cpu(ddqp->d_itimer); > if (ddqp->d_rtbtimer) > defq->rtbtimelimit = be32_to_cpu(ddqp->d_rtbtimer); > - if (ddqp->d_bwarns) > - defq->bwarnlimit = be16_to_cpu(ddqp->d_bwarns); > - if (ddqp->d_iwarns) > - defq->iwarnlimit = be16_to_cpu(ddqp->d_iwarns); > - if (ddqp->d_rtbwarns) > - defq->rtbwarnlimit = be16_to_cpu(ddqp->d_rtbwarns); > + if (dqp->q_blk.warnings) > + defq->bwarnlimit = dqp->q_blk.warnings; > + if (dqp->q_ino.warnings) > + defq->iwarnlimit = dqp->q_ino.warnings; > + if (dqp->q_rtb.warnings) > + defq->rtbwarnlimit = dqp->q_rtb.warnings; > > xfs_qm_dqdestroy(dqp); > } > diff --git a/fs/xfs/xfs_qm_syscalls.c b/fs/xfs/xfs_qm_syscalls.c > index ab596d389e3e..5d3bccdbd3bf 100644 > --- a/fs/xfs/xfs_qm_syscalls.c > +++ b/fs/xfs/xfs_qm_syscalls.c > @@ -548,11 +548,11 @@ xfs_qm_scall_setqlim( > * Update warnings counter(s) if requested > */ > if (newlim->d_fieldmask & QC_SPC_WARNS) > - ddq->d_bwarns = cpu_to_be16(newlim->d_spc_warns); > + dqp->q_blk.warnings = newlim->d_spc_warns; > if (newlim->d_fieldmask & QC_INO_WARNS) > - ddq->d_iwarns = cpu_to_be16(newlim->d_ino_warns); > + dqp->q_ino.warnings = newlim->d_ino_warns; > if (newlim->d_fieldmask & QC_RT_SPC_WARNS) > - ddq->d_rtbwarns = cpu_to_be16(newlim->d_rt_spc_warns); > + dqp->q_rtb.warnings = newlim->d_rt_spc_warns; > > if (id == 0) { > if (newlim->d_fieldmask & QC_SPC_WARNS) > @@ -627,13 +627,13 @@ xfs_qm_scall_getquota_fill_qc( > dst->d_ino_count = dqp->q_ino.reserved; > dst->d_spc_timer = be32_to_cpu(dqp->q_core.d_btimer); > dst->d_ino_timer = be32_to_cpu(dqp->q_core.d_itimer); > - dst->d_ino_warns = be16_to_cpu(dqp->q_core.d_iwarns); > - dst->d_spc_warns = be16_to_cpu(dqp->q_core.d_bwarns); > + dst->d_ino_warns = dqp->q_ino.warnings; > + dst->d_spc_warns = dqp->q_blk.warnings; > dst->d_rt_spc_hardlimit = XFS_FSB_TO_B(mp, dqp->q_rtb.hardlimit); > dst->d_rt_spc_softlimit = XFS_FSB_TO_B(mp, dqp->q_rtb.softlimit); > dst->d_rt_space = XFS_FSB_TO_B(mp, dqp->q_rtb.reserved); > dst->d_rt_spc_timer = be32_to_cpu(dqp->q_core.d_rtbtimer); > - dst->d_rt_spc_warns = be16_to_cpu(dqp->q_core.d_rtbwarns); > + dst->d_rt_spc_warns = dqp->q_rtb.warnings; > > /* > * Internally, we don't reset all the timers when quota enforcement > diff --git a/fs/xfs/xfs_trans_dquot.c b/fs/xfs/xfs_trans_dquot.c > index b36d747989a7..21ed8eda3c80 100644 > --- a/fs/xfs/xfs_trans_dquot.c > +++ b/fs/xfs/xfs_trans_dquot.c > @@ -592,7 +592,7 @@ xfs_trans_dqresv( > if (!softlimit) > softlimit = defq->bsoftlimit; > timer = be32_to_cpu(dqp->q_core.d_btimer); > - warns = be16_to_cpu(dqp->q_core.d_bwarns); > + warns = dqp->q_blk.warnings; > warnlimit = defq->bwarnlimit; > resbcountp = &dqp->q_blk.reserved; > } else { > @@ -604,7 +604,7 @@ xfs_trans_dqresv( > if (!softlimit) > softlimit = defq->rtbsoftlimit; > timer = be32_to_cpu(dqp->q_core.d_rtbtimer); > - warns = be16_to_cpu(dqp->q_core.d_rtbwarns); > + warns = dqp->q_rtb.warnings; > warnlimit = defq->rtbwarnlimit; > resbcountp = &dqp->q_rtb.reserved; > } > @@ -639,7 +639,7 @@ xfs_trans_dqresv( > if (ninos > 0) { > total_count = dqp->q_ino.reserved + ninos; > timer = be32_to_cpu(dqp->q_core.d_itimer); > - warns = be16_to_cpu(dqp->q_core.d_iwarns); > + warns = dqp->q_ino.warnings; > warnlimit = defq->iwarnlimit; > hardlimit = dqp->q_ino.hardlimit; > if (!hardlimit) >
diff --git a/fs/xfs/xfs_dquot.c b/fs/xfs/xfs_dquot.c index 02eae8c2ba1b..a1edb49ceda5 100644 --- a/fs/xfs/xfs_dquot.c +++ b/fs/xfs/xfs_dquot.c @@ -139,7 +139,7 @@ xfs_qm_adjust_dqtimers( d->d_btimer = cpu_to_be32(ktime_get_real_seconds() + defq->btimelimit); } else { - d->d_bwarns = 0; + dq->q_blk.warnings = 0; } } else { if ((!dq->q_blk.softlimit || @@ -158,7 +158,7 @@ xfs_qm_adjust_dqtimers( d->d_itimer = cpu_to_be32(ktime_get_real_seconds() + defq->itimelimit); } else { - d->d_iwarns = 0; + dq->q_ino.warnings = 0; } } else { if ((!dq->q_ino.softlimit || @@ -177,7 +177,7 @@ xfs_qm_adjust_dqtimers( d->d_rtbtimer = cpu_to_be32(ktime_get_real_seconds() + defq->rtbtimelimit); } else { - d->d_rtbwarns = 0; + dq->q_rtb.warnings = 0; } } else { if ((!dq->q_rtb.softlimit || @@ -542,6 +542,10 @@ xfs_dquot_from_disk( dqp->q_ino.count = be64_to_cpu(ddqp->d_icount); dqp->q_rtb.count = be64_to_cpu(ddqp->d_rtbcount); + dqp->q_blk.warnings = be16_to_cpu(ddqp->d_bwarns); + dqp->q_ino.warnings = be16_to_cpu(ddqp->d_iwarns); + dqp->q_rtb.warnings = be16_to_cpu(ddqp->d_rtbwarns); + /* * Reservation counters are defined as reservation plus current usage * to avoid having to add every time. @@ -573,6 +577,10 @@ xfs_dquot_to_disk( ddqp->d_bcount = cpu_to_be64(dqp->q_blk.count); ddqp->d_icount = cpu_to_be64(dqp->q_ino.count); ddqp->d_rtbcount = cpu_to_be64(dqp->q_rtb.count); + + ddqp->d_bwarns = cpu_to_be16(dqp->q_blk.warnings); + ddqp->d_iwarns = cpu_to_be16(dqp->q_ino.warnings); + ddqp->d_rtbwarns = cpu_to_be16(dqp->q_rtb.warnings); } /* Allocate and initialize the dquot buffer for this in-core dquot. */ diff --git a/fs/xfs/xfs_dquot.h b/fs/xfs/xfs_dquot.h index 23e05b0d7567..5840bc54b772 100644 --- a/fs/xfs/xfs_dquot.h +++ b/fs/xfs/xfs_dquot.h @@ -37,6 +37,14 @@ struct xfs_dquot_res { /* Absolute and preferred limits. */ xfs_qcnt_t hardlimit; xfs_qcnt_t softlimit; + + /* + * For root dquots, this is the maximum number of warnings that will + * be issued for this quota type. Otherwise, this is the number of + * warnings issued against this quota. Note that none of this is + * implemented. + */ + xfs_qwarncnt_t warnings; }; /* diff --git a/fs/xfs/xfs_qm.c b/fs/xfs/xfs_qm.c index b47bba204240..4e233cfef46d 100644 --- a/fs/xfs/xfs_qm.c +++ b/fs/xfs/xfs_qm.c @@ -616,12 +616,12 @@ xfs_qm_init_timelimits( defq->itimelimit = be32_to_cpu(ddqp->d_itimer); if (ddqp->d_rtbtimer) defq->rtbtimelimit = be32_to_cpu(ddqp->d_rtbtimer); - if (ddqp->d_bwarns) - defq->bwarnlimit = be16_to_cpu(ddqp->d_bwarns); - if (ddqp->d_iwarns) - defq->iwarnlimit = be16_to_cpu(ddqp->d_iwarns); - if (ddqp->d_rtbwarns) - defq->rtbwarnlimit = be16_to_cpu(ddqp->d_rtbwarns); + if (dqp->q_blk.warnings) + defq->bwarnlimit = dqp->q_blk.warnings; + if (dqp->q_ino.warnings) + defq->iwarnlimit = dqp->q_ino.warnings; + if (dqp->q_rtb.warnings) + defq->rtbwarnlimit = dqp->q_rtb.warnings; xfs_qm_dqdestroy(dqp); } diff --git a/fs/xfs/xfs_qm_syscalls.c b/fs/xfs/xfs_qm_syscalls.c index ab596d389e3e..5d3bccdbd3bf 100644 --- a/fs/xfs/xfs_qm_syscalls.c +++ b/fs/xfs/xfs_qm_syscalls.c @@ -548,11 +548,11 @@ xfs_qm_scall_setqlim( * Update warnings counter(s) if requested */ if (newlim->d_fieldmask & QC_SPC_WARNS) - ddq->d_bwarns = cpu_to_be16(newlim->d_spc_warns); + dqp->q_blk.warnings = newlim->d_spc_warns; if (newlim->d_fieldmask & QC_INO_WARNS) - ddq->d_iwarns = cpu_to_be16(newlim->d_ino_warns); + dqp->q_ino.warnings = newlim->d_ino_warns; if (newlim->d_fieldmask & QC_RT_SPC_WARNS) - ddq->d_rtbwarns = cpu_to_be16(newlim->d_rt_spc_warns); + dqp->q_rtb.warnings = newlim->d_rt_spc_warns; if (id == 0) { if (newlim->d_fieldmask & QC_SPC_WARNS) @@ -627,13 +627,13 @@ xfs_qm_scall_getquota_fill_qc( dst->d_ino_count = dqp->q_ino.reserved; dst->d_spc_timer = be32_to_cpu(dqp->q_core.d_btimer); dst->d_ino_timer = be32_to_cpu(dqp->q_core.d_itimer); - dst->d_ino_warns = be16_to_cpu(dqp->q_core.d_iwarns); - dst->d_spc_warns = be16_to_cpu(dqp->q_core.d_bwarns); + dst->d_ino_warns = dqp->q_ino.warnings; + dst->d_spc_warns = dqp->q_blk.warnings; dst->d_rt_spc_hardlimit = XFS_FSB_TO_B(mp, dqp->q_rtb.hardlimit); dst->d_rt_spc_softlimit = XFS_FSB_TO_B(mp, dqp->q_rtb.softlimit); dst->d_rt_space = XFS_FSB_TO_B(mp, dqp->q_rtb.reserved); dst->d_rt_spc_timer = be32_to_cpu(dqp->q_core.d_rtbtimer); - dst->d_rt_spc_warns = be16_to_cpu(dqp->q_core.d_rtbwarns); + dst->d_rt_spc_warns = dqp->q_rtb.warnings; /* * Internally, we don't reset all the timers when quota enforcement diff --git a/fs/xfs/xfs_trans_dquot.c b/fs/xfs/xfs_trans_dquot.c index b36d747989a7..21ed8eda3c80 100644 --- a/fs/xfs/xfs_trans_dquot.c +++ b/fs/xfs/xfs_trans_dquot.c @@ -592,7 +592,7 @@ xfs_trans_dqresv( if (!softlimit) softlimit = defq->bsoftlimit; timer = be32_to_cpu(dqp->q_core.d_btimer); - warns = be16_to_cpu(dqp->q_core.d_bwarns); + warns = dqp->q_blk.warnings; warnlimit = defq->bwarnlimit; resbcountp = &dqp->q_blk.reserved; } else { @@ -604,7 +604,7 @@ xfs_trans_dqresv( if (!softlimit) softlimit = defq->rtbsoftlimit; timer = be32_to_cpu(dqp->q_core.d_rtbtimer); - warns = be16_to_cpu(dqp->q_core.d_rtbwarns); + warns = dqp->q_rtb.warnings; warnlimit = defq->rtbwarnlimit; resbcountp = &dqp->q_rtb.reserved; } @@ -639,7 +639,7 @@ xfs_trans_dqresv( if (ninos > 0) { total_count = dqp->q_ino.reserved + ninos; timer = be32_to_cpu(dqp->q_core.d_itimer); - warns = be16_to_cpu(dqp->q_core.d_iwarns); + warns = dqp->q_ino.warnings; warnlimit = defq->iwarnlimit; hardlimit = dqp->q_ino.hardlimit; if (!hardlimit)