Commit 3dbb9aa3 authored by Eric Sandeen's avatar Eric Sandeen Committed by Darrick J. Wong
Browse files

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: default avatarEric Sandeen <sandeen@redhat.com>
Reviewed-by: default avatarAllison Collins <allison.henderson@oracle.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent 8d077f5b

fs/xfs/xfs_dquot.c

+2 −1
Original line number Diff line number Diff line
@@ -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

fs/xfs/xfs_dquot.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

fs/xfs/xfs_qm.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

fs/xfs/xfs_qm_syscalls.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

fs/xfs/xfs_trans_dquot.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE