xfs: calculate XFS_TRANS_QM_DQALLOC space log reservation at mount time

The disk quota allocation log space reservation is calcuated at runtime,
this patch does it at mount time.

Signed-off-by: Jie Liu <jeff.liu@oracle.com>
CC: Dave Chinner <david@fromorbit.com>
Reviewed-by: Mark Tinguely <tinguely@sgi.com>
Signed-off-by: Ben Myers <bpm@sgi.com>

diff --git a/fs/xfs/xfs_dquot.c b/fs/xfs/xfs_dquot.c
index 9e1bf5294c914a92dc12e2b31d9ab54644ae9a59..8025eb23ad7274611a644b523b45f1322099fa5a 100644 (file)
--- a/fs/xfs/xfs_dquot.c
+++ b/fs/xfs/xfs_dquot.c
@@ -612,15 +612,9 @@ xfs_qm_dqread(
        if (flags & XFS_QMOPT_DQALLOC) {
                tp = xfs_trans_alloc(mp, XFS_TRANS_QM_DQALLOC);
                error = xfs_trans_reserve(tp, XFS_QM_DQALLOC_SPACE_RES(mp),
-                               XFS_WRITE_LOG_RES(mp) +
-                               /*
-                                * Round the chunklen up to the next multiple
-                                * of 128 (buf log item chunk size)).
-                                */
-                               BBTOB(mp->m_quotainfo->qi_dqchunklen) - 1 + 128,
-                               0,
-                               XFS_TRANS_PERM_LOG_RES,
-                               XFS_WRITE_LOG_COUNT);
+                                         XFS_QM_DQALLOC_LOG_RES(mp), 0,
+                                         XFS_TRANS_PERM_LOG_RES,
+                                         XFS_WRITE_LOG_COUNT);
                if (error)
                        goto error1;
                cancelflags = XFS_TRANS_RELEASE_LOG_RES;

diff --git a/fs/xfs/xfs_mount.h b/fs/xfs/xfs_mount.h
index 9baa7e0fbd45bccec5ef4c6c6051b92d7092522d..fc500c6c880053b4728373be21823e43f483dc1a 100644 (file)
--- a/fs/xfs/xfs_mount.h
+++ b/fs/xfs/xfs_mount.h
@@ -42,6 +42,7 @@ typedef struct xfs_trans_reservations {
        uint    tr_growrtfree;  /* grow realtime freeing */
        uint    tr_qm_sbchange; /* change quota flags */
        uint    tr_qm_setqlim;  /* adjust quota limits */
+       uint    tr_qm_dqalloc;  /* allocate quota on disk */
 } xfs_trans_reservations_t;
 
 #ifndef __KERNEL__

diff --git a/fs/xfs/xfs_trans.c b/fs/xfs/xfs_trans.c
index 1838850de14570f1ffb3149560d701389ffd2d70..6dd2c043efcd33a7177c315e891fcc561a3017af 100644 (file)
--- a/fs/xfs/xfs_trans.c
+++ b/fs/xfs/xfs_trans.c
@@ -567,6 +567,20 @@ xfs_calc_qm_setqlim_reservation(
        return xfs_calc_buf_res(1, sizeof(struct xfs_disk_dquot));
 }
 
+/*
+ * Allocating quota on disk if needed.
+ *     the write transaction log space: XFS_WRITE_LOG_RES(mp)
+ *     the unit of quota allocation: one system block size
+ */
+STATIC uint
+xfs_calc_qm_dqalloc_reservation(
+       struct xfs_mount        *mp)
+{
+       return XFS_WRITE_LOG_RES(mp) +
+               xfs_calc_buf_res(1,
+                       XFS_FSB_TO_B(mp, XFS_DQUOT_CLUSTER_SIZE_FSB) - 1);
+}
+
 /*
  * Initialize the precomputed transaction reservation values
  * in the mount structure.
@@ -600,6 +614,7 @@ xfs_trans_init(
        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);
+       resp->tr_qm_dqalloc = xfs_calc_qm_dqalloc_reservation(mp);
 }
 
 /*

diff --git a/fs/xfs/xfs_trans.h b/fs/xfs/xfs_trans.h
index 93a0ec73c6fe3bcddb10701993539a39adb5f1d8..04575db806d46ea83268f1a6d627a78d59eea0b7 100644 (file)
--- a/fs/xfs/xfs_trans.h
+++ b/fs/xfs/xfs_trans.h
@@ -264,6 +264,7 @@ struct xfs_log_item_desc {
 #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)
+#define XFS_QM_DQALLOC_LOG_RES(mp)     ((mp)->m_reservations.tr_qm_dqalloc)
 
 /*
  * Various log count values.