xfs
[Top] [All Lists]

[PATCH v2 4/7] xfs: pass xfs_dquot to xfs_qm_adjust_dqlimits() instead o

To: xfs@xxxxxxxxxxx
Subject: [PATCH v2 4/7] xfs: pass xfs_dquot to xfs_qm_adjust_dqlimits() instead of xfs_disk_dquot_t
From: Brian Foster <bfoster@xxxxxxxxxx>
Date: Wed, 2 Jan 2013 13:08:08 -0500
In-reply-to: <1357150091-37530-1-git-send-email-bfoster@xxxxxxxxxx>
References: <1357150091-37530-1-git-send-email-bfoster@xxxxxxxxxx>
Modify xfs_qm_adjust_dqlimits() to take the xfs_dquot as a
parameter instead of just the xfs_disk_dquot_t so we can update
in-memory fields if necessary.

Signed-off-by: Brian Foster <bfoster@xxxxxxxxxx>
---
 fs/xfs/xfs_dquot.c       |    3 ++-
 fs/xfs/xfs_dquot.h       |    2 +-
 fs/xfs/xfs_qm.c          |    2 +-
 fs/xfs/xfs_trans_dquot.c |    2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/fs/xfs/xfs_dquot.c b/fs/xfs/xfs_dquot.c
index 9e1bf52..cc52462 100644
--- a/fs/xfs/xfs_dquot.c
+++ b/fs/xfs/xfs_dquot.c
@@ -86,9 +86,10 @@ xfs_qm_dqdestroy(
 void
 xfs_qm_adjust_dqlimits(
        xfs_mount_t             *mp,
-       xfs_disk_dquot_t        *d)
+       struct xfs_dquot        *dq)
 {
        xfs_quotainfo_t         *q = mp->m_quotainfo;
+       xfs_disk_dquot_t        *d = &dq->q_core;
 
        ASSERT(d->d_id);
 
diff --git a/fs/xfs/xfs_dquot.h b/fs/xfs/xfs_dquot.h
index c694a84..69491b6 100644
--- a/fs/xfs/xfs_dquot.h
+++ b/fs/xfs/xfs_dquot.h
@@ -146,7 +146,7 @@ extern void         xfs_qm_dqunpin_wait(xfs_dquot_t *);
 extern void            xfs_qm_adjust_dqtimers(xfs_mount_t *,
                                        xfs_disk_dquot_t *);
 extern void            xfs_qm_adjust_dqlimits(xfs_mount_t *,
-                                       xfs_disk_dquot_t *);
+                                              struct xfs_dquot *);
 extern int             xfs_qm_dqget(xfs_mount_t *, xfs_inode_t *,
                                        xfs_dqid_t, uint, uint, xfs_dquot_t **);
 extern void            xfs_qm_dqput(xfs_dquot_t *);
diff --git a/fs/xfs/xfs_qm.c b/fs/xfs/xfs_qm.c
index 60eff47..87c95fe 100644
--- a/fs/xfs/xfs_qm.c
+++ b/fs/xfs/xfs_qm.c
@@ -1057,7 +1057,7 @@ xfs_qm_quotacheck_dqadjust(
         * There are no timers for the default values set in the root dquot.
         */
        if (dqp->q_core.d_id) {
-               xfs_qm_adjust_dqlimits(mp, &dqp->q_core);
+               xfs_qm_adjust_dqlimits(mp, dqp);
                xfs_qm_adjust_dqtimers(mp, &dqp->q_core);
        }
 
diff --git a/fs/xfs/xfs_trans_dquot.c b/fs/xfs/xfs_trans_dquot.c
index 0c7fa54..5eaf6ce 100644
--- a/fs/xfs/xfs_trans_dquot.c
+++ b/fs/xfs/xfs_trans_dquot.c
@@ -412,7 +412,7 @@ xfs_trans_apply_dquot_deltas(
                         * Start/reset the timer(s) if needed.
                         */
                        if (d->d_id) {
-                               xfs_qm_adjust_dqlimits(tp->t_mountp, d);
+                               xfs_qm_adjust_dqlimits(tp->t_mountp, dqp);
                                xfs_qm_adjust_dqtimers(tp->t_mountp, d);
                        }
 
-- 
1.7.7.6

<Prev in Thread] Current Thread [Next in Thread>