xfs: remove unnecessary arguments from quota adjust functions

struct xfs_dquot already has a pointer to the xfs mount, so remove the
redundant parameter from xfs_qm_adjust_dq*.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Chandan Babu R <chandanrlinux@gmail.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>

diff --git a/fs/xfs/xfs_dquot.c b/fs/xfs/xfs_dquot.c
index 1827a1043faa1a348cc1b72c0cbe4b73be980b5c..c09d9257fad92d1b8dd78475c1730ae22e5f1047 100644 (file)
--- a/fs/xfs/xfs_dquot.c
+++ b/fs/xfs/xfs_dquot.c
@@ -67,9 +67,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;
@@ -113,9 +113,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 48fb0f263981b95bfe30aec03f2fb369a8c5ad1c..9e44da522684e7ff1d349e37e20832268c18a52e 100644 (file)
--- a/fs/xfs/xfs_dquot.h
+++ b/fs/xfs/xfs_dquot.h
@@ -182,11 +182,10 @@ 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);
-xfs_dqid_t     xfs_qm_id_for_quotatype(struct xfs_inode *ip, uint type);
+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,
                                        struct xfs_dquot **dqpp);

diff --git a/fs/xfs/xfs_qm.c b/fs/xfs/xfs_qm.c
index 8ab4dd4f842d00e9c398e4118cc631638740e0e1..7d83c1623cb2fb3be828490f26004c491eca7df1 100644 (file)
--- a/fs/xfs/xfs_qm.c
+++ b/fs/xfs/xfs_qm.c
@@ -1103,8 +1103,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->q_flags |= XFS_DQFLAG_DIRTY;

diff --git a/fs/xfs/xfs_qm_syscalls.c b/fs/xfs/xfs_qm_syscalls.c
index 51941c1b04927d1c155357df7f0059f15667f060..aeea59d6cf23658d41d4ae1a555c63130a8768c6 100644 (file)
--- 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->q_flags |= XFS_DQFLAG_DIRTY;
        xfs_trans_log_dquot(tp, dqp);

diff --git a/fs/xfs/xfs_trans_dquot.c b/fs/xfs/xfs_trans_dquot.c
index 9adea8f6ba8762b7d72539024e66b479d6ddd6bb..6f0bfd5221161e08b2051b874755a7a92b396bb6 100644 (file)
--- 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->q_flags |= XFS_DQFLAG_DIRTY;