From 69188e005d21726b38b036fdf4ff49aa76517dd6 Mon Sep 17 00:00:00 2001
From: Jeff Liu <jeff.liu@oracle.com>
Date: Mon, 28 Jan 2013 21:27:25 +0800
Subject: [PATCH] --- yaml --- r: 352935 b: refs/heads/master c:
 a7bd794a0f489a66ad595f2bcab0eac8f232e409 h: refs/heads/master i:   352933:
 50421b6b7a2e539f732bd536c7e08c5c257f414c   352931:
 794cc4f43114deb6388bf02d9d74c900b1c4d3a7   352927:
 950259488e06455d17f29a02d47b2f1ac56f039d v: v3

---
 [refs]                   |  2 +-
 trunk/fs/xfs/xfs_mount.h |  1 +
 trunk/fs/xfs/xfs_trans.c | 12 ++++++++++++
 trunk/fs/xfs/xfs_trans.h |  1 +
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 3714facea23e..120df6dc47e5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 762d7ba657ed4a0934b4da7dcef058012f252e0f
+refs/heads/master: a7bd794a0f489a66ad595f2bcab0eac8f232e409
diff --git a/trunk/fs/xfs/xfs_mount.h b/trunk/fs/xfs/xfs_mount.h
index b46009dc7b13..2e30a9a84f9f 100644
--- a/trunk/fs/xfs/xfs_mount.h
+++ b/trunk/fs/xfs/xfs_mount.h
@@ -45,6 +45,7 @@ typedef struct xfs_trans_reservations {
 	uint	tr_qm_dqalloc;	/* allocate quota on disk */
 	uint	tr_qm_quotaoff;	/* turn quota off */
 	uint	tr_qm_equotaoff;/* end of turn quota off */
+	uint	tr_sb;		/* modify superblock */
 } xfs_trans_reservations_t;
 
 #ifndef __KERNEL__
diff --git a/trunk/fs/xfs/xfs_trans.c b/trunk/fs/xfs/xfs_trans.c
index 84643fa5e465..72da2aa08421 100644
--- a/trunk/fs/xfs/xfs_trans.c
+++ b/trunk/fs/xfs/xfs_trans.c
@@ -605,6 +605,17 @@ xfs_calc_qm_quotaoff_end_reservation(
 	return sizeof(struct xfs_qoff_logitem) * 2;
 }
 
+/*
+ * Syncing the incore super block changes to disk.
+ *     the super block to reflect the changes: sector size
+ */
+STATIC uint
+xfs_calc_sb_reservation(
+	struct xfs_mount	*mp)
+{
+	return xfs_calc_buf_res(1, mp->m_sb.sb_sectsize);
+}
+
 /*
  * Initialize the precomputed transaction reservation values
  * in the mount structure.
@@ -641,6 +652,7 @@ xfs_trans_init(
 	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);
+	resp->tr_sb = xfs_calc_sb_reservation(mp);
 }
 
 /*
diff --git a/trunk/fs/xfs/xfs_trans.h b/trunk/fs/xfs/xfs_trans.h
index 57339e404cf6..d06919e28904 100644
--- a/trunk/fs/xfs/xfs_trans.h
+++ b/trunk/fs/xfs/xfs_trans.h
@@ -267,6 +267,7 @@ struct xfs_log_item_desc {
 #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)
+#define XFS_SB_LOG_RES(mp)		((mp)->m_reservations.tr_sb)
 
 /*
  * Various log count values.