Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4b6eae2e authored by Brian Foster's avatar Brian Foster Committed by Ben Myers
Browse files

xfs: pass xfs_dquot to xfs_qm_adjust_dqlimits() instead of xfs_disk_dquot_t 



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: default avatarBrian Foster <bfoster@redhat.com>
Reviewed-by: default avatarMark Tinguely <tinguely@sgi.com>
Signed-off-by: default avatarBen Myers <bpm@sgi.com>
parent c9bdbdc0

fs/xfs/xfs_dquot.c

+4 −3
Original line number Diff line number Diff line
@@ -85,10 +85,11 @@ xfs_qm_dqdestroy( 
 */

void

xfs_qm_adjust_dqlimits(

	xfs_mount_t		*mp,

	xfs_disk_dquot_t	*d)

	struct xfs_mount	*mp,

	struct xfs_dquot	*dq)

{

	xfs_quotainfo_t		*q = mp->m_quotainfo;

	struct xfs_quotainfo	*q = mp->m_quotainfo;

	struct xfs_disk_dquot	*d = &dq->q_core;



	ASSERT(d->d_id);

fs/xfs/xfs_dquot.h

+2 −2
Original line number Diff line number Diff line
@@ -145,8 +145,8 @@ extern int xfs_qm_dqflush(struct xfs_dquot *, struct xfs_buf **); 
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 *);

extern void		xfs_qm_adjust_dqlimits(struct xfs_mount *,

					       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 *);

fs/xfs/xfs_qm.c

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

	}

fs/xfs/xfs_trans_dquot.c

+5 −5
Original line number Diff line number Diff line
@@ -326,12 +326,12 @@ xfs_trans_dqlockedjoin( 
 */

void

xfs_trans_apply_dquot_deltas(

	xfs_trans_t		*tp)

	struct xfs_trans	*tp)

{

	int			i, j;

	xfs_dquot_t		*dqp;

	xfs_dqtrx_t		*qtrx, *qa;

	xfs_disk_dquot_t	*d;

	struct xfs_dquot	*dqp;

	struct xfs_dqtrx	*qtrx, *qa;

	struct xfs_disk_dquot	*d;

	long			totalbdelta;

	long			totalrtbdelta;
@@ -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);

			}