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

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

xfs: calculate XFS_TRANS_QM_QUOTAOFF_END space log reservation at mount time 



Convert the calculation for end of quotaoff 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 a1bd9557

fs/xfs/xfs_mount.h

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ typedef struct xfs_trans_reservations { 
	uint	tr_qm_setqlim;	/* adjust quota limits */

	uint	tr_qm_dqalloc;	/* allocate quota on disk */

	uint	tr_qm_quotaoff;	/* turn quota off */

	uint	tr_qm_equotaoff;/* end of turn quota off */

} xfs_trans_reservations_t;



#ifndef __KERNEL__

fs/xfs/xfs_qm_syscalls.c

+3 −2
Original line number Diff line number Diff line
@@ -639,8 +639,9 @@ xfs_qm_log_quotaoff_end( 


	tp = xfs_trans_alloc(mp, XFS_TRANS_QM_QUOTAOFF_END);



	if ((error = xfs_trans_reserve(tp, 0, sizeof(xfs_qoff_logitem_t) * 2,

				      0, 0, XFS_DEFAULT_LOG_COUNT))) {

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

				  0, 0, XFS_DEFAULT_LOG_COUNT);

	if (error) {

		xfs_trans_cancel(tp, 0);

		return (error);

	}

fs/xfs/xfs_trans.c

+12 −0
Original line number Diff line number Diff line
@@ -594,6 +594,17 @@ xfs_calc_qm_quotaoff_reservation( 
		xfs_calc_buf_res(1, mp->m_sb.sb_sectsize);

}



/*

 * End of turning off quotas.

 *    the xfs_qoff_logitem_t: sizeof(struct xfs_qoff_logitem) * 2

 */

STATIC uint

xfs_calc_qm_quotaoff_end_reservation(

	struct xfs_mount	*mp)

{

	return sizeof(struct xfs_qoff_logitem) * 2;

}



/*

 * Initialize the precomputed transaction reservation values

 * in the mount structure.
@@ -629,6 +640,7 @@ xfs_trans_init( 
	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);

	resp->tr_qm_equotaoff = xfs_calc_qm_quotaoff_end_reservation(mp);

}



/*

fs/xfs/xfs_trans.h

+1 −0
Original line number Diff line number Diff line
@@ -266,6 +266,7 @@ struct xfs_log_item_desc { 
#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)

#define XFS_QM_QUOTAOFF_END_LOG_RES(mp)	((mp)->m_reservations.tr_qm_equotaoff)



/*

 * Various log count values.