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

Commit a1bd9557 authored by Jeff Liu's avatar Jeff Liu Committed by Ben Myers
Browse files

xfs: calculate XFS_TRANS_QM_QUOTAOFF space log reservation at mount time 



Convert the calculation of quota off transaction log space reservation
from runtime to mount time.

Signed-off-by: default avatarJie Liu <jeff.liu@oracle.com>
CC: Dave Chinner <david@fromorbit.com>
Reviewed-by: default avatarMark Tinguely <tinguely@sgi.com>
Signed-off-by: default avatarBen Myers <bpm@sgi.com>
parent 48001044

fs/xfs/xfs_mount.h

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ typedef struct xfs_trans_reservations { 
	uint	tr_qm_sbchange;	/* change quota flags */

	uint	tr_qm_setqlim;	/* adjust quota limits */

	uint	tr_qm_dqalloc;	/* allocate quota on disk */

	uint	tr_qm_quotaoff;	/* turn quota off */

} xfs_trans_reservations_t;



#ifndef __KERNEL__

fs/xfs/xfs_qm_syscalls.c

+3 −7
Original line number Diff line number Diff line
@@ -672,14 +672,10 @@ xfs_qm_log_quotaoff( 
	uint			oldsbqflag=0;



	tp = xfs_trans_alloc(mp, XFS_TRANS_QM_QUOTAOFF);

	if ((error = xfs_trans_reserve(tp, 0,

				      sizeof(xfs_qoff_logitem_t) * 2 +

				      mp->m_sb.sb_sectsize + 128,

				      0,

				      0,

				      XFS_DEFAULT_LOG_COUNT))) {

	error = xfs_trans_reserve(tp, 0, XFS_QM_QUOTAOFF_LOG_RES(mp),

				  0, 0, XFS_DEFAULT_LOG_COUNT);

	if (error)

		goto error0;

	}



	qoffi = xfs_trans_get_qoff_item(tp, NULL, flags & XFS_ALL_QUOTA_ACCT);

	xfs_trans_log_quotaoff_item(tp, qoffi);

fs/xfs/xfs_trans.c

+14 −0
Original line number Diff line number Diff line
@@ -581,6 +581,19 @@ xfs_calc_qm_dqalloc_reservation( 
			XFS_FSB_TO_B(mp, XFS_DQUOT_CLUSTER_SIZE_FSB) - 1);

}



/*

 * Turning off quotas.

 *    the xfs_qoff_logitem_t: sizeof(struct xfs_qoff_logitem) * 2

 *    the superblock for the quota flags: sector size

 */

STATIC uint

xfs_calc_qm_quotaoff_reservation(

	struct xfs_mount	*mp)

{

	return sizeof(struct xfs_qoff_logitem) * 2 +

		xfs_calc_buf_res(1, mp->m_sb.sb_sectsize);

}



/*

 * Initialize the precomputed transaction reservation values

 * in the mount structure.
@@ -615,6 +628,7 @@ xfs_trans_init( 
	resp->tr_qm_sbchange = xfs_calc_qm_sbchange_reservation(mp);

	resp->tr_qm_setqlim = xfs_calc_qm_setqlim_reservation(mp);

	resp->tr_qm_dqalloc = xfs_calc_qm_dqalloc_reservation(mp);

	resp->tr_qm_quotaoff = xfs_calc_qm_quotaoff_reservation(mp);

}



/*

fs/xfs/xfs_trans.h

+1 −0
Original line number Diff line number Diff line
@@ -265,6 +265,7 @@ struct xfs_log_item_desc { 
#define XFS_QM_SBCHANGE_LOG_RES(mp)	((mp)->m_reservations.tr_qm_sbchange)

#define XFS_QM_SETQLIM_LOG_RES(mp)	((mp)->m_reservations.tr_qm_setqlim)

#define XFS_QM_DQALLOC_LOG_RES(mp)	((mp)->m_reservations.tr_qm_dqalloc)

#define XFS_QM_QUOTAOFF_LOG_RES(mp)	((mp)->m_reservations.tr_qm_quotaoff)



/*

 * Various log count values.