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 <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_mount.h b/fs/xfs/xfs_mount.h
index 4e9aa9524840d211dc86d0d7fc55af9de0a4a7a5..9baa7e0fbd45bccec5ef4c6c6051b92d7092522d 100644 (file)
--- a/fs/xfs/xfs_mount.h
+++ b/fs/xfs/xfs_mount.h
@@ -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__

diff --git a/fs/xfs/xfs_qm_syscalls.c b/fs/xfs/xfs_qm_syscalls.c
index 33d9c2b6f5555e83d2ae55742c3924dda814ec50..1476b6fd4ed59aa065889f4e71f9d7cb5336e8ee 100644 (file)
--- a/fs/xfs/xfs_qm_syscalls.c
+++ b/fs/xfs/xfs_qm_syscalls.c
@@ -490,8 +490,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);
        }

diff --git a/fs/xfs/xfs_trans.c b/fs/xfs/xfs_trans.c
index 6ba62c0e24d1f69f027f8295de3ca9dfa2a82dfb..1838850de14570f1ffb3149560d701389ffd2d70 100644 (file)
--- a/fs/xfs/xfs_trans.c
+++ b/fs/xfs/xfs_trans.c
@@ -556,6 +556,17 @@ xfs_calc_qm_sbchange_reservation(
        return xfs_calc_buf_res(1, mp->m_sb.sb_sectsize);
 }
 
+/*
+ * 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.
@@ -588,6 +599,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);
 }
 
 /*

diff --git a/fs/xfs/xfs_trans.h b/fs/xfs/xfs_trans.h
index a690f2803594f253bd5cd1c2df51b0818eee6a74..93a0ec73c6fe3bcddb10701993539a39adb5f1d8 100644 (file)
--- a/fs/xfs/xfs_trans.h
+++ b/fs/xfs/xfs_trans.h
@@ -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.