On 5/20/20 3:31 PM, Darrick J. Wong wrote: > On Wed, May 20, 2020 at 01:43:15PM -0500, Eric Sandeen wrote: >> From: Eric Sandeen <sandeen@xxxxxxxxxx> >> >> Move timers and warnings out of xfs_quotainfo and into xfs_def_quota >> so that we can utilize them on a per-type basis, rather than enforcing >> them based on the values found in the first enabled quota type. >> >> Signed-off-by: Eric Sandeen <sandeen@xxxxxxxxxx> >> Reviewed-by: Allison Collins <allison.henderson@xxxxxxxxxx> > > There's been kind of a lot of changes to keep Allison's RVB, especially > since you didn't add mine... > > (...says the king of forgetting to apply RVBs :P) > >> [zlang: new way to get defquota in xfs_qm_init_timelimits] >> [zlang: remove redundant defq assign] >> Signed-off-by: Zorro Lang <zlang@xxxxxxxxxx> >> --- >> >> V2: Use the by-type defquota-getter >> >> diff --git a/fs/xfs/xfs_dquot.c b/fs/xfs/xfs_dquot.c >> index fdeaccc67d91..49c235c5d42c 100644 >> --- a/fs/xfs/xfs_dquot.c >> +++ b/fs/xfs/xfs_dquot.c >> @@ -116,8 +116,12 @@ xfs_qm_adjust_dqtimers( >> struct xfs_mount *mp, >> struct xfs_dquot *dq) >> { >> + struct xfs_quotainfo *qi = mp->m_quotainfo; >> struct xfs_disk_dquot *d = &dq->q_core; >> + struct xfs_def_quota *defq; >> + >> ASSERT(d->d_id); >> + *defq = xfs_get_defquota(qi, xfs_dquot_type(dq)); > > This isn't supposed to be a structure copy, right? Oh good grief (moved the original init-on-declare down and forgot to delete the *) :/