On Tuesday 30 June 2020 9:13:13 PM IST Darrick J. Wong wrote:
> From: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
>
> struct xfs_dquot already has a pointer to the xfs mount, so remove the
> redundant parameter from xfs_qm_adjust_dq*.
>
The changes look good to me.
Reviewed-by: Chandan Babu R <chandanrlinux@xxxxxxxxx>
> Signed-off-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
> ---
> fs/xfs/xfs_dquot.c | 4 ++--
> fs/xfs/xfs_dquot.h | 6 ++----
> fs/xfs/xfs_qm.c | 4 ++--
> fs/xfs/xfs_qm_syscalls.c | 2 +-
> fs/xfs/xfs_trans_dquot.c | 4 ++--
> 5 files changed, 9 insertions(+), 11 deletions(-)
>
>
> diff --git a/fs/xfs/xfs_dquot.c b/fs/xfs/xfs_dquot.c
> index 6975c27145fc..35a113d1b42b 100644
> --- a/fs/xfs/xfs_dquot.c
> +++ b/fs/xfs/xfs_dquot.c
> @@ -66,9 +66,9 @@ xfs_qm_dqdestroy(
> */
> void
> xfs_qm_adjust_dqlimits(
> - struct xfs_mount *mp,
> struct xfs_dquot *dq)
> {
> + struct xfs_mount *mp = dq->q_mount;
> struct xfs_quotainfo *q = mp->m_quotainfo;
> struct xfs_def_quota *defq;
> int prealloc = 0;
> @@ -112,9 +112,9 @@ xfs_qm_adjust_dqlimits(
> */
> void
> xfs_qm_adjust_dqtimers(
> - struct xfs_mount *mp,
> struct xfs_dquot *dq)
> {
> + struct xfs_mount *mp = dq->q_mount;
> struct xfs_quotainfo *qi = mp->m_quotainfo;
> struct xfs_def_quota *defq;
>
> diff --git a/fs/xfs/xfs_dquot.h b/fs/xfs/xfs_dquot.h
> index 62b0fc6e0133..e37b4bebc1ea 100644
> --- a/fs/xfs/xfs_dquot.h
> +++ b/fs/xfs/xfs_dquot.h
> @@ -181,10 +181,8 @@ void xfs_dquot_to_disk(struct xfs_disk_dquot *ddqp, struct xfs_dquot *dqp);
> 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_dquot *d);
> -void xfs_qm_adjust_dqlimits(struct xfs_mount *mp,
> - struct xfs_dquot *d);
> +void xfs_qm_adjust_dqtimers(struct xfs_dquot *d);
> +void xfs_qm_adjust_dqlimits(struct xfs_dquot *d);
> xfs_dqid_t xfs_qm_id_for_quotatype(struct xfs_inode *ip, uint type);
> int xfs_qm_dqget(struct xfs_mount *mp, xfs_dqid_t id,
> uint type, bool can_alloc,
> diff --git a/fs/xfs/xfs_qm.c b/fs/xfs/xfs_qm.c
> index 28326a6264a8..30deb6cf6a7a 100644
> --- a/fs/xfs/xfs_qm.c
> +++ b/fs/xfs/xfs_qm.c
> @@ -1107,8 +1107,8 @@ xfs_qm_quotacheck_dqadjust(
> * There are no timers for the default values set in the root dquot.
> */
> if (dqp->q_id) {
> - xfs_qm_adjust_dqlimits(mp, dqp);
> - xfs_qm_adjust_dqtimers(mp, dqp);
> + xfs_qm_adjust_dqlimits(dqp);
> + xfs_qm_adjust_dqtimers(dqp);
> }
>
> dqp->dq_flags |= XFS_DQ_DIRTY;
> diff --git a/fs/xfs/xfs_qm_syscalls.c b/fs/xfs/xfs_qm_syscalls.c
> index 393b88612cc8..5423e02f9837 100644
> --- a/fs/xfs/xfs_qm_syscalls.c
> +++ b/fs/xfs/xfs_qm_syscalls.c
> @@ -594,7 +594,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, dqp);
> + xfs_qm_adjust_dqtimers(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 392e51baad6f..2712814d696d 100644
> --- a/fs/xfs/xfs_trans_dquot.c
> +++ b/fs/xfs/xfs_trans_dquot.c
> @@ -382,8 +382,8 @@ xfs_trans_apply_dquot_deltas(
> * Start/reset the timer(s) if needed.
> */
> if (dqp->q_id) {
> - xfs_qm_adjust_dqlimits(tp->t_mountp, dqp);
> - xfs_qm_adjust_dqtimers(tp->t_mountp, dqp);
> + xfs_qm_adjust_dqlimits(dqp);
> + xfs_qm_adjust_dqtimers(dqp);
> }
>
> dqp->dq_flags |= XFS_DQ_DIRTY;
>
>
--
chandan
