Skip to content

Commit 3dbb9aa

Browse files
Eric Sandeendjwong
authored andcommitted
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 <[email protected]> Reviewed-by: Allison Collins <[email protected]> Reviewed-by: Christoph Hellwig <[email protected]> Reviewed-by: Darrick J. Wong <[email protected]> Signed-off-by: Darrick J. Wong <[email protected]>
1 parent 8d077f5 commit 3dbb9aa

File tree

5 files changed

+6
-5
lines changed

5 files changed

+6
-5
lines changed

fs/xfs/xfs_dquot.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,9 @@ xfs_qm_adjust_dqlimits(
114114
void
115115
xfs_qm_adjust_dqtimers(
116116
struct xfs_mount *mp,
117-
struct xfs_disk_dquot *d)
117+
struct xfs_dquot *dq)
118118
{
119+
struct xfs_disk_dquot *d = &dq->q_core;
119120
ASSERT(d->d_id);
120121

121122
#ifdef DEBUG

fs/xfs/xfs_dquot.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ void xfs_qm_dqdestroy(struct xfs_dquot *dqp);
154154
int xfs_qm_dqflush(struct xfs_dquot *dqp, struct xfs_buf **bpp);
155155
void xfs_qm_dqunpin_wait(struct xfs_dquot *dqp);
156156
void xfs_qm_adjust_dqtimers(struct xfs_mount *mp,
157-
struct xfs_disk_dquot *d);
157+
struct xfs_dquot *d);
158158
void xfs_qm_adjust_dqlimits(struct xfs_mount *mp,
159159
struct xfs_dquot *d);
160160
xfs_dqid_t xfs_qm_id_for_quotatype(struct xfs_inode *ip, uint type);

fs/xfs/xfs_qm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1117,7 +1117,7 @@ xfs_qm_quotacheck_dqadjust(
11171117
*/
11181118
if (dqp->q_core.d_id) {
11191119
xfs_qm_adjust_dqlimits(mp, dqp);
1120-
xfs_qm_adjust_dqtimers(mp, &dqp->q_core);
1120+
xfs_qm_adjust_dqtimers(mp, dqp);
11211121
}
11221122

11231123
dqp->dq_flags |= XFS_DQ_DIRTY;

fs/xfs/xfs_qm_syscalls.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -588,7 +588,7 @@ xfs_qm_scall_setqlim(
588588
* is on or off. We don't really want to bother with iterating
589589
* over all ondisk dquots and turning the timers on/off.
590590
*/
591-
xfs_qm_adjust_dqtimers(mp, ddq);
591+
xfs_qm_adjust_dqtimers(mp, dqp);
592592
}
593593
dqp->dq_flags |= XFS_DQ_DIRTY;
594594
xfs_trans_log_dquot(tp, dqp);

fs/xfs/xfs_trans_dquot.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@ xfs_trans_apply_dquot_deltas(
388388
*/
389389
if (d->d_id) {
390390
xfs_qm_adjust_dqlimits(tp->t_mountp, dqp);
391-
xfs_qm_adjust_dqtimers(tp->t_mountp, d);
391+
xfs_qm_adjust_dqtimers(tp->t_mountp, dqp);
392392
}
393393

394394
dqp->dq_flags |= XFS_DQ_DIRTY;

0 commit comments

Comments
 (0)