xfs: pass xfs_dquot to xfs_qm_adjust_dqtimers

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>
Reviewed-by: Allison Collins <allison.henderson@oracle.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>

diff --git a/fs/xfs/xfs_dquot.c b/fs/xfs/xfs_dquot.c
index 55b95d45303b83a9e7d158b8c2ac8b60901e4510..714eceacbab2f5487d89e1b752c3f5e46870df6d 100644 (file)
--- 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 fe3e46df604b4c2ab92ddacfe093ff3f59a223cf..71e36c85e20b670aed7c0fa2f6c6686900d31460 100644 (file)
--- 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 27a9076456314f3a9a966695d5a6294959a8b737..6609b4bb1628a2593a9bc504d19d44941999c50d 100644 (file)
--- a/fs/xfs/xfs_qm.c
+++ b/fs/xfs/xfs_qm.c
@@ -1117,7 +1117,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 9edf761eec739102b0dbbb5bdea1e77b7392d50c..bd0f005570affb976a0971c32331c29b036407d8 100644 (file)
--- 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 2c07897a3c37498fd31b485e0a2e0c7c3422f405..20542076e32ad97834a552ad92fa97c3c10c442b 100644 (file)
--- 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;