On Mon, May 18, 2020 at 01:50:18PM -0500, 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@xxxxxxxxxx>
> Reviewed-by: Allison Collins <allison.henderson@xxxxxxxxxx>
> Reviewed-by: Christoph Hellwig <hch@xxxxxx>
Seems reasonable,
Reviewed-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
--D
> ---
> 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 96e33390c6a0..6d6afc0297b3 100644
> --- a/fs/xfs/xfs_dquot.c
> +++ b/fs/xfs/xfs_dquot.c
> @@ -114,8 +114,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 591779aa2fd0..e97a3802939c 100644
> --- a/fs/xfs/xfs_qm.c
> +++ b/fs/xfs/xfs_qm.c
> @@ -1116,7 +1116,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 5d5ac65aa1cc..301a284ee4f9 100644
> --- a/fs/xfs/xfs_qm_syscalls.c
> +++ b/fs/xfs/xfs_qm_syscalls.c
> @@ -588,7 +588,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 2c07897a3c37..20542076e32a 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;
> --
> 2.17.0
>
>
