Skip to contentSkip to conversation

xfs: calcuate XFS_TRANS_QM_SETQLIM space log reservation at mount time

PATCH In review Jeff Liu 1 participant 1 message Jan 28, 2013 XFS filesystem

lore
Share & tools
lore

Jeff Liu

author
#0 lore raw

PATCH v4 5/13 xfs: calcuate XFS_TRANS_QM_SETQLIM space log reservation at mount time

For adjusting quota limits transactions, we calculate out the log space reservation at runtime, this patch does it at mount time.

Signed-off-by Jie Liu <[email protected]>
CC Dave Chinner <[email protected]>
Reviewed-by Mark Tinguely <[email protected]>
---
 fs/xfs/xfs_mount.h       |    1 +
 fs/xfs/xfs_qm_syscalls.c |    5 +++--
 fs/xfs/xfs_trans.c       |   12 ++++++++++++
 fs/xfs/xfs_trans.h       |    1 +
 4 files changed, 17 insertions(+), 2 deletions(-)
fs/xfs/xfs_mount.h +1 -0
index 9e3a03b..cebcb7f 100644
@@ -41,6 +41,7 @@ typedef struct xfs_trans_reservations {
 	uint	tr_growrtzero;	/* grow realtime zeroing */
 	uint	tr_growrtfree;	/* grow realtime freeing */
 	uint	tr_qm_sbchange;	/* change quota flags */
+	uint	tr_qm_setqlim;	/* adjust quota limits */
 } xfs_trans_reservations_t;
 
 #ifndef __KERNEL__
fs/xfs/xfs_qm_syscalls.c +3 -2
index 858a3b1..9b25992 100644
@@ -489,8 +489,9 @@ xfs_qm_scall_setqlim(
 		return 0;
 
 	tp = xfs_trans_alloc(mp, XFS_TRANS_QM_SETQLIM);
-	if ((error = xfs_trans_reserve(tp, 0, sizeof(xfs_disk_dquot_t) + 128,
-				      0, 0, XFS_DEFAULT_LOG_COUNT))) {
+	error = xfs_trans_reserve(tp, 0, XFS_QM_SETQLIM_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
index 236e53e..3f7fa4b 100644
@@ -556,6 +556,17 @@ xfs_calc_qm_sbchange_reservation(
 }
 
 /*
+ * Adjusting quota limits.
+ *    the xfs_disk_dquot_t: sizeof(struct xfs_disk_dquot)
+ */
+STATIC uint
+xfs_calc_qm_setqlim_reservation(
+	struct xfs_mount	*mp)
+{
+	return xfs_calc_buf_res(1, sizeof(struct xfs_disk_dquot));
+}
+
+/*
  * Initialize the precomputed transaction reservation values
  * in the mount structure.
  */

@@ -587,6 +598,7 @@ xfs_trans_init(
 	resp->tr_growrtzero = xfs_calc_growrtzero_reservation(mp);
 	resp->tr_growrtfree = xfs_calc_growrtfree_reservation(mp);
 	resp->tr_qm_sbchange = xfs_calc_qm_sbchange_reservation(mp);
+	resp->tr_qm_setqlim = xfs_calc_qm_setqlim_reservation(mp);
 }
 
 /*
fs/xfs/xfs_trans.h +1 -0
index 4eb1140..8f0645a 100644
@@ -263,6 +263,7 @@ struct xfs_log_item_desc {
 #define	XFS_ATTRRM_LOG_RES(mp)	((mp)->m_reservations.tr_attrrm)
 #define	XFS_CLEAR_AGI_BUCKET_LOG_RES(mp)  ((mp)->m_reservations.tr_clearagi)
 #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)
 
 /*
  * Various log count values.
Signature · 6 lines
1.7.9.5

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs