| Message ID | f4fcefdf-3560-1b1d-fb67-cd289967b6e3@redhat.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | xfs: enable per-type quota timers and warn limits | expand |
On 2/8/20 2:11 PM, Eric Sandeen wrote: > Pass xfs_dquot rather than xfs_disk_dquot to xfs_qm_adjust_dqtimers; > this makes it symmetric with xfs_qm_adjust_dqlimits and will help > the next patch. > > Signed-off-by: Eric Sandeen <sandeen@redhat.com> Looks fine Reviewed-by: Allison Collins <allison.henderson@oracle.com> > --- > fs/xfs/xfs_dquot.c | 3 ++- > fs/xfs/xfs_dquot.h | 2 +- > fs/xfs/xfs_qm.c | 2 +- > fs/xfs/xfs_qm_syscalls.c | 2 +- > fs/xfs/xfs_trans_dquot.c | 2 +- > 5 files changed, 6 insertions(+), 5 deletions(-) > > diff --git a/fs/xfs/xfs_dquot.c b/fs/xfs/xfs_dquot.c > index ddf41c24efcd..5c5fdb62f69c 100644 > --- a/fs/xfs/xfs_dquot.c > +++ b/fs/xfs/xfs_dquot.c > @@ -113,8 +113,9 @@ xfs_qm_adjust_dqlimits( > void > xfs_qm_adjust_dqtimers( > struct xfs_mount *mp, > - struct xfs_disk_dquot *d) > + struct xfs_dquot *dq) > { > + struct xfs_disk_dquot *d = &dq->q_core; > ASSERT(d->d_id); > > #ifdef DEBUG > diff --git a/fs/xfs/xfs_dquot.h b/fs/xfs/xfs_dquot.h > index fe3e46df604b..71e36c85e20b 100644 > --- a/fs/xfs/xfs_dquot.h > +++ b/fs/xfs/xfs_dquot.h > @@ -154,7 +154,7 @@ void xfs_qm_dqdestroy(struct xfs_dquot *dqp); > int xfs_qm_dqflush(struct xfs_dquot *dqp, struct xfs_buf **bpp); > void xfs_qm_dqunpin_wait(struct xfs_dquot *dqp); > void xfs_qm_adjust_dqtimers(struct xfs_mount *mp, > - struct xfs_disk_dquot *d); > + struct xfs_dquot *d); > void xfs_qm_adjust_dqlimits(struct xfs_mount *mp, > struct xfs_dquot *d); > xfs_dqid_t xfs_qm_id_for_quotatype(struct xfs_inode *ip, uint type); > diff --git a/fs/xfs/xfs_qm.c b/fs/xfs/xfs_qm.c > index b3cd87d0bccb..4e543e2bc290 100644 > --- a/fs/xfs/xfs_qm.c > +++ b/fs/xfs/xfs_qm.c > @@ -1103,7 +1103,7 @@ xfs_qm_quotacheck_dqadjust( > */ > if (dqp->q_core.d_id) { > xfs_qm_adjust_dqlimits(mp, dqp); > - xfs_qm_adjust_dqtimers(mp, &dqp->q_core); > + xfs_qm_adjust_dqtimers(mp, dqp); > } > > dqp->dq_flags |= XFS_DQ_DIRTY; > diff --git a/fs/xfs/xfs_qm_syscalls.c b/fs/xfs/xfs_qm_syscalls.c > index e08c2f04f3ab..ba79f355a14e 100644 > --- a/fs/xfs/xfs_qm_syscalls.c > +++ b/fs/xfs/xfs_qm_syscalls.c > @@ -587,7 +587,7 @@ xfs_qm_scall_setqlim( > * is on or off. We don't really want to bother with iterating > * over all ondisk dquots and turning the timers on/off. > */ > - xfs_qm_adjust_dqtimers(mp, ddq); > + xfs_qm_adjust_dqtimers(mp, dqp); > } > dqp->dq_flags |= XFS_DQ_DIRTY; > xfs_trans_log_dquot(tp, dqp); > diff --git a/fs/xfs/xfs_trans_dquot.c b/fs/xfs/xfs_trans_dquot.c > index 7470b02c5198..7ae907ec7d47 100644 > --- a/fs/xfs/xfs_trans_dquot.c > +++ b/fs/xfs/xfs_trans_dquot.c > @@ -388,7 +388,7 @@ xfs_trans_apply_dquot_deltas( > */ > if (d->d_id) { > xfs_qm_adjust_dqlimits(tp->t_mountp, dqp); > - xfs_qm_adjust_dqtimers(tp->t_mountp, d); > + xfs_qm_adjust_dqtimers(tp->t_mountp, dqp); > } > > dqp->dq_flags |= XFS_DQ_DIRTY; >
On Sat, Feb 08, 2020 at 03:11:38PM -0600, Eric Sandeen wrote: > Pass xfs_dquot rather than xfs_disk_dquot to xfs_qm_adjust_dqtimers; > this makes it symmetric with xfs_qm_adjust_dqlimits and will help > the next patch. > > Signed-off-by: Eric Sandeen <sandeen@redhat.com> Looks good, Reviewed-by: Christoph Hellwig <hch@lst.de>
diff --git a/fs/xfs/xfs_dquot.c b/fs/xfs/xfs_dquot.c index ddf41c24efcd..5c5fdb62f69c 100644 --- a/fs/xfs/xfs_dquot.c +++ b/fs/xfs/xfs_dquot.c @@ -113,8 +113,9 @@ xfs_qm_adjust_dqlimits( void xfs_qm_adjust_dqtimers( struct xfs_mount *mp, - struct xfs_disk_dquot *d) + struct xfs_dquot *dq) { + struct xfs_disk_dquot *d = &dq->q_core; ASSERT(d->d_id); #ifdef DEBUG diff --git a/fs/xfs/xfs_dquot.h b/fs/xfs/xfs_dquot.h index fe3e46df604b..71e36c85e20b 100644 --- a/fs/xfs/xfs_dquot.h +++ b/fs/xfs/xfs_dquot.h @@ -154,7 +154,7 @@ void xfs_qm_dqdestroy(struct xfs_dquot *dqp); int xfs_qm_dqflush(struct xfs_dquot *dqp, struct xfs_buf **bpp); void xfs_qm_dqunpin_wait(struct xfs_dquot *dqp); void xfs_qm_adjust_dqtimers(struct xfs_mount *mp, - struct xfs_disk_dquot *d); + struct xfs_dquot *d); void xfs_qm_adjust_dqlimits(struct xfs_mount *mp, struct xfs_dquot *d); xfs_dqid_t xfs_qm_id_for_quotatype(struct xfs_inode *ip, uint type); diff --git a/fs/xfs/xfs_qm.c b/fs/xfs/xfs_qm.c index b3cd87d0bccb..4e543e2bc290 100644 --- a/fs/xfs/xfs_qm.c +++ b/fs/xfs/xfs_qm.c @@ -1103,7 +1103,7 @@ xfs_qm_quotacheck_dqadjust( */ if (dqp->q_core.d_id) { xfs_qm_adjust_dqlimits(mp, dqp); - xfs_qm_adjust_dqtimers(mp, &dqp->q_core); + xfs_qm_adjust_dqtimers(mp, dqp); } dqp->dq_flags |= XFS_DQ_DIRTY; diff --git a/fs/xfs/xfs_qm_syscalls.c b/fs/xfs/xfs_qm_syscalls.c index e08c2f04f3ab..ba79f355a14e 100644 --- a/fs/xfs/xfs_qm_syscalls.c +++ b/fs/xfs/xfs_qm_syscalls.c @@ -587,7 +587,7 @@ xfs_qm_scall_setqlim( * is on or off. We don't really want to bother with iterating * over all ondisk dquots and turning the timers on/off. */ - xfs_qm_adjust_dqtimers(mp, ddq); + xfs_qm_adjust_dqtimers(mp, dqp); } dqp->dq_flags |= XFS_DQ_DIRTY; xfs_trans_log_dquot(tp, dqp); diff --git a/fs/xfs/xfs_trans_dquot.c b/fs/xfs/xfs_trans_dquot.c index 7470b02c5198..7ae907ec7d47 100644 --- a/fs/xfs/xfs_trans_dquot.c +++ b/fs/xfs/xfs_trans_dquot.c @@ -388,7 +388,7 @@ xfs_trans_apply_dquot_deltas( */ if (d->d_id) { xfs_qm_adjust_dqlimits(tp->t_mountp, dqp); - xfs_qm_adjust_dqtimers(tp->t_mountp, d); + xfs_qm_adjust_dqtimers(tp->t_mountp, dqp); } dqp->dq_flags |= XFS_DQ_DIRTY;
Pass xfs_dquot rather than xfs_disk_dquot to xfs_qm_adjust_dqtimers; this makes it symmetric with xfs_qm_adjust_dqlimits and will help the next patch. Signed-off-by: Eric Sandeen <sandeen@redhat.com> --- fs/xfs/xfs_dquot.c | 3 ++- fs/xfs/xfs_dquot.h | 2 +- fs/xfs/xfs_qm.c | 2 +- fs/xfs/xfs_qm_syscalls.c | 2 +- fs/xfs/xfs_trans_dquot.c | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-)