All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jeff Liu <jeff.liu@oracle.com>
To: xfs@oss.sgi.com
Subject: [PATCH 1/2] xfsprogs: sync libxfs/xfs_trans.c to the kernel code changes
Date: Fri, 07 Dec 2012 20:19:53 +0800	[thread overview]
Message-ID: <50C1DEE9.8010302@oracle.com> (raw)

Sync libxfs/xfs_trans.c to the kernel code change of replacing
the hard-coding number "128" with xfs_buf_log_overhead().

Signed-off-by: Jie Liu <jeff.liu@oracle.com>
Cc: Dave Chinner <dchinner@redhat.com>
---
 include/xfs_trans.h |    1 +
 libxfs/xfs_trans.c  |  113 +++++++++++++++++++++++++++++++++------------------
 2 files changed, 75 insertions(+), 39 deletions(-)

diff --git a/include/xfs_trans.h b/include/xfs_trans.h
index c2042b7..ae6e47e 100644
--- a/include/xfs_trans.h
+++ b/include/xfs_trans.h
@@ -504,5 +504,6 @@ extern kmem_zone_t	*xfs_log_item_desc_zone;
 
 void		xfs_trans_init(struct xfs_mount *);
 int		xfs_trans_roll(struct xfs_trans **, struct xfs_inode *);
+uint		xfs_buf_log_overhead(void);
 
 #endif	/* __XFS_TRANS_H__ */
diff --git a/libxfs/xfs_trans.c b/libxfs/xfs_trans.c
index 635de8f..39c1a8f 100644
--- a/libxfs/xfs_trans.c
+++ b/libxfs/xfs_trans.c
@@ -23,6 +23,20 @@ kmem_zone_t	*xfs_trans_zone;
 kmem_zone_t	*xfs_log_item_desc_zone;
 
 /*
+ * A buffer has a format structure overhead in the log in addition
+ * to the data, so we need to take this into account when reserving
+ * space in a transaction for a buffer.  Round the space required up
+ * to a multiple of 128 bytes so that we don't change the historical
+ * reservation that has been used for this overhead.
+ */
+uint
+xfs_buf_log_overhead(void)
+{
+	return round_up(sizeof(struct xlog_op_header) +
+			sizeof(struct xfs_buf_log_format), 128);
+}
+
+/*
  * Various log reservation values.
  *
  * These are based on the size of the file system block because that is what
@@ -66,13 +80,15 @@ xfs_calc_write_reservation(
 		     2 * mp->m_sb.sb_sectsize +
 		     mp->m_sb.sb_sectsize +
 		     XFS_ALLOCFREE_LOG_RES(mp, 2) +
-		     128 * (4 + XFS_BM_MAXLEVELS(mp, XFS_DATA_FORK) +
-			    XFS_ALLOCFREE_LOG_COUNT(mp, 2))),
+		     xfs_buf_log_overhead() *
+		     (4 + XFS_BM_MAXLEVELS(mp, XFS_DATA_FORK) +
+		      XFS_ALLOCFREE_LOG_COUNT(mp, 2))),
 		    (2 * mp->m_sb.sb_sectsize +
 		     2 * mp->m_sb.sb_sectsize +
 		     mp->m_sb.sb_sectsize +
 		     XFS_ALLOCFREE_LOG_RES(mp, 2) +
-		     128 * (5 + XFS_ALLOCFREE_LOG_COUNT(mp, 2))));
+		     xfs_buf_log_overhead() *
+		     (5 + XFS_ALLOCFREE_LOG_COUNT(mp, 2))));
 }
 
 /*
@@ -95,16 +111,19 @@ xfs_calc_itruncate_reservation(
 	return XFS_DQUOT_LOGRES(mp) +
 		MAX((mp->m_sb.sb_inodesize +
 		     XFS_FSB_TO_B(mp, XFS_BM_MAXLEVELS(mp, XFS_DATA_FORK) + 1) +
-		     128 * (2 + XFS_BM_MAXLEVELS(mp, XFS_DATA_FORK))),
+		     xfs_buf_log_overhead() *
+		     (2 + XFS_BM_MAXLEVELS(mp, XFS_DATA_FORK))),
 		    (4 * mp->m_sb.sb_sectsize +
 		     4 * mp->m_sb.sb_sectsize +
 		     mp->m_sb.sb_sectsize +
 		     XFS_ALLOCFREE_LOG_RES(mp, 4) +
-		     128 * (9 + XFS_ALLOCFREE_LOG_COUNT(mp, 4)) +
-		     128 * 5 +
+		     xfs_buf_log_overhead() *
+		     (9 + XFS_ALLOCFREE_LOG_COUNT(mp, 4)) +
+		     xfs_buf_log_overhead() * 5 +
 		     XFS_ALLOCFREE_LOG_RES(mp, 1) +
-		     128 * (2 + XFS_IALLOC_BLOCKS(mp) + mp->m_in_maxlevels +
-			    XFS_ALLOCFREE_LOG_COUNT(mp, 1))));
+		     xfs_buf_log_overhead() *
+		     (2 + XFS_IALLOC_BLOCKS(mp) + mp->m_in_maxlevels +
+		      XFS_ALLOCFREE_LOG_COUNT(mp, 1))));
 }
 
 /*
@@ -126,12 +145,14 @@ xfs_calc_rename_reservation(
 	return XFS_DQUOT_LOGRES(mp) +
 		MAX((4 * mp->m_sb.sb_inodesize +
 		     2 * XFS_DIROP_LOG_RES(mp) +
-		     128 * (4 + 2 * XFS_DIROP_LOG_COUNT(mp))),
+		     xfs_buf_log_overhead() *
+		     (4 + 2 * XFS_DIROP_LOG_COUNT(mp))),
 		    (3 * mp->m_sb.sb_sectsize +
 		     3 * mp->m_sb.sb_sectsize +
 		     mp->m_sb.sb_sectsize +
 		     XFS_ALLOCFREE_LOG_RES(mp, 3) +
-		     128 * (7 + XFS_ALLOCFREE_LOG_COUNT(mp, 3))));
+		     xfs_buf_log_overhead() *
+		     (7 + XFS_ALLOCFREE_LOG_COUNT(mp, 3))));
 }
 
 /*
@@ -154,12 +175,14 @@ xfs_calc_link_reservation(
 		MAX((mp->m_sb.sb_inodesize +
 		     mp->m_sb.sb_inodesize +
 		     XFS_DIROP_LOG_RES(mp) +
-		     128 * (2 + XFS_DIROP_LOG_COUNT(mp))),
+		     xfs_buf_log_overhead() *
+		     (2 + XFS_DIROP_LOG_COUNT(mp))),
 		    (mp->m_sb.sb_sectsize +
 		     mp->m_sb.sb_sectsize +
 		     mp->m_sb.sb_sectsize +
 		     XFS_ALLOCFREE_LOG_RES(mp, 1) +
-		     128 * (3 + XFS_ALLOCFREE_LOG_COUNT(mp, 1))));
+		     xfs_buf_log_overhead() *
+		     (3 + XFS_ALLOCFREE_LOG_COUNT(mp, 1))));
 }
 
 /*
@@ -182,12 +205,14 @@ xfs_calc_remove_reservation(
 		MAX((mp->m_sb.sb_inodesize +
 		     mp->m_sb.sb_inodesize +
 		     XFS_DIROP_LOG_RES(mp) +
-		     128 * (2 + XFS_DIROP_LOG_COUNT(mp))),
+		     xfs_buf_log_overhead() *
+		     (2 + XFS_DIROP_LOG_COUNT(mp))),
 		    (2 * mp->m_sb.sb_sectsize +
 		     2 * mp->m_sb.sb_sectsize +
 		     mp->m_sb.sb_sectsize +
 		     XFS_ALLOCFREE_LOG_RES(mp, 2) +
-		     128 * (5 + XFS_ALLOCFREE_LOG_COUNT(mp, 2))));
+		     xfs_buf_log_overhead() *
+		     (5 + XFS_ALLOCFREE_LOG_COUNT(mp, 2))));
 }
 
 /*
@@ -214,13 +239,14 @@ xfs_calc_symlink_reservation(
 		     XFS_FSB_TO_B(mp, 1) +
 		     XFS_DIROP_LOG_RES(mp) +
 		     1024 +
-		     128 * (4 + XFS_DIROP_LOG_COUNT(mp))),
+		     xfs_buf_log_overhead() * (4 + XFS_DIROP_LOG_COUNT(mp))),
 		    (2 * mp->m_sb.sb_sectsize +
 		     XFS_FSB_TO_B(mp, XFS_IALLOC_BLOCKS(mp)) +
 		     XFS_FSB_TO_B(mp, mp->m_in_maxlevels) +
 		     XFS_ALLOCFREE_LOG_RES(mp, 1) +
-		     128 * (2 + XFS_IALLOC_BLOCKS(mp) + mp->m_in_maxlevels +
-			    XFS_ALLOCFREE_LOG_COUNT(mp, 1))));
+		     xfs_buf_log_overhead() *
+		     (2 + XFS_IALLOC_BLOCKS(mp) + mp->m_in_maxlevels +
+		      XFS_ALLOCFREE_LOG_COUNT(mp, 1))));
 }
 
 /*
@@ -248,13 +274,14 @@ xfs_calc_create_reservation(
 		     mp->m_sb.sb_sectsize +
 		     XFS_FSB_TO_B(mp, 1) +
 		     XFS_DIROP_LOG_RES(mp) +
-		     128 * (3 + XFS_DIROP_LOG_COUNT(mp))),
+		     xfs_buf_log_overhead() * (3 + XFS_DIROP_LOG_COUNT(mp))),
 		    (3 * mp->m_sb.sb_sectsize +
 		     XFS_FSB_TO_B(mp, XFS_IALLOC_BLOCKS(mp)) +
 		     XFS_FSB_TO_B(mp, mp->m_in_maxlevels) +
 		     XFS_ALLOCFREE_LOG_RES(mp, 1) +
-		     128 * (2 + XFS_IALLOC_BLOCKS(mp) + mp->m_in_maxlevels +
-			    XFS_ALLOCFREE_LOG_COUNT(mp, 1))));
+		     xfs_buf_log_overhead() *
+		     (2 + XFS_IALLOC_BLOCKS(mp) + mp->m_in_maxlevels +
+		      XFS_ALLOCFREE_LOG_COUNT(mp, 1))));
 }
 
 /*
@@ -288,10 +315,11 @@ xfs_calc_ifree_reservation(
 		XFS_FSB_TO_B(mp, 1) +
 		MAX((__uint16_t)XFS_FSB_TO_B(mp, 1),
 		    XFS_INODE_CLUSTER_SIZE(mp)) +
-		128 * 5 +
+		xfs_buf_log_overhead() * 5 +
 		XFS_ALLOCFREE_LOG_RES(mp, 1) +
-		128 * (2 + XFS_IALLOC_BLOCKS(mp) + mp->m_in_maxlevels +
-		       XFS_ALLOCFREE_LOG_COUNT(mp, 1));
+		xfs_buf_log_overhead() *
+		(2 + XFS_IALLOC_BLOCKS(mp) + mp->m_in_maxlevels +
+		 XFS_ALLOCFREE_LOG_COUNT(mp, 1));
 }
 
 /*
@@ -321,7 +349,8 @@ xfs_calc_growdata_reservation(
 {
 	return mp->m_sb.sb_sectsize * 3 +
 		XFS_ALLOCFREE_LOG_RES(mp, 1) +
-		128 * (3 + XFS_ALLOCFREE_LOG_COUNT(mp, 1));
+		xfs_buf_log_overhead() *
+		(3 + XFS_ALLOCFREE_LOG_COUNT(mp, 1));
 }
 
 /*
@@ -342,8 +371,9 @@ xfs_calc_growrtalloc_reservation(
 		XFS_FSB_TO_B(mp, XFS_BM_MAXLEVELS(mp, XFS_DATA_FORK)) +
 		mp->m_sb.sb_inodesize +
 		XFS_ALLOCFREE_LOG_RES(mp, 1) +
-		128 * (3 + XFS_BM_MAXLEVELS(mp, XFS_DATA_FORK) +
-		       XFS_ALLOCFREE_LOG_COUNT(mp, 1));
+		xfs_buf_log_overhead() *
+		(3 + XFS_BM_MAXLEVELS(mp, XFS_DATA_FORK) +
+		 XFS_ALLOCFREE_LOG_COUNT(mp, 1));
 }
 
 /*
@@ -355,7 +385,7 @@ STATIC uint
 xfs_calc_growrtzero_reservation(
 	struct xfs_mount	*mp)
 {
-	return mp->m_sb.sb_blocksize + 128;
+	return mp->m_sb.sb_blocksize + xfs_buf_log_overhead();
 }
 
 /*
@@ -376,7 +406,7 @@ xfs_calc_growrtfree_reservation(
 		2 * mp->m_sb.sb_inodesize +
 		mp->m_sb.sb_blocksize +
 		mp->m_rsumsize +
-		128 * 5;
+		xfs_buf_log_overhead() * 5;
 }
 
 /*
@@ -387,7 +417,7 @@ STATIC uint
 xfs_calc_swrite_reservation(
 	struct xfs_mount	*mp)
 {
-	return mp->m_sb.sb_inodesize + 128;
+	return mp->m_sb.sb_inodesize + xfs_buf_log_overhead();
 }
 
 /*
@@ -397,7 +427,7 @@ xfs_calc_swrite_reservation(
 STATIC uint
 xfs_calc_writeid_reservation(xfs_mount_t *mp)
 {
-	return mp->m_sb.sb_inodesize + 128;
+	return mp->m_sb.sb_inodesize + xfs_buf_log_overhead();
 }
 
 /*
@@ -418,8 +448,9 @@ xfs_calc_addafork_reservation(
 		mp->m_dirblksize +
 		XFS_FSB_TO_B(mp, XFS_DAENTER_BMAP1B(mp, XFS_DATA_FORK) + 1) +
 		XFS_ALLOCFREE_LOG_RES(mp, 1) +
-		128 * (4 + XFS_DAENTER_BMAP1B(mp, XFS_DATA_FORK) + 1 +
-		       XFS_ALLOCFREE_LOG_COUNT(mp, 1));
+		xfs_buf_log_overhead() *
+		(4 + XFS_DAENTER_BMAP1B(mp, XFS_DATA_FORK) + 1 +
+		 XFS_ALLOCFREE_LOG_COUNT(mp, 1));
 }
 
 /*
@@ -439,12 +470,14 @@ xfs_calc_attrinval_reservation(
 {
 	return MAX((mp->m_sb.sb_inodesize +
 		    XFS_FSB_TO_B(mp, XFS_BM_MAXLEVELS(mp, XFS_ATTR_FORK)) +
-		    128 * (1 + XFS_BM_MAXLEVELS(mp, XFS_ATTR_FORK))),
+		    xfs_buf_log_overhead() *
+		    (1 + XFS_BM_MAXLEVELS(mp, XFS_ATTR_FORK))),
 		   (4 * mp->m_sb.sb_sectsize +
 		    4 * mp->m_sb.sb_sectsize +
 		    mp->m_sb.sb_sectsize +
 		    XFS_ALLOCFREE_LOG_RES(mp, 4) +
-		    128 * (9 + XFS_ALLOCFREE_LOG_COUNT(mp, 4))));
+		    xfs_buf_log_overhead() *
+		    (9 + XFS_ALLOCFREE_LOG_COUNT(mp, 4))));
 }
 
 /*
@@ -465,7 +498,7 @@ xfs_calc_attrset_reservation(
 		mp->m_sb.sb_inodesize +
 		mp->m_sb.sb_sectsize +
 		XFS_FSB_TO_B(mp, XFS_DA_NODE_MAXDEPTH) +
-		128 * (2 + XFS_DA_NODE_MAXDEPTH);
+		xfs_buf_log_overhead() * (2 + XFS_DA_NODE_MAXDEPTH);
 }
 
 /*
@@ -487,13 +520,15 @@ xfs_calc_attrrm_reservation(
 		MAX((mp->m_sb.sb_inodesize +
 		     XFS_FSB_TO_B(mp, XFS_DA_NODE_MAXDEPTH) +
 		     XFS_FSB_TO_B(mp, XFS_BM_MAXLEVELS(mp, XFS_ATTR_FORK)) +
-		     128 * (1 + XFS_DA_NODE_MAXDEPTH +
-			    XFS_BM_MAXLEVELS(mp, XFS_DATA_FORK))),
+		     xfs_buf_log_overhead() *
+		     (1 + XFS_DA_NODE_MAXDEPTH +
+		      XFS_BM_MAXLEVELS(mp, XFS_DATA_FORK))),
 		    (2 * mp->m_sb.sb_sectsize +
 		     2 * mp->m_sb.sb_sectsize +
 		     mp->m_sb.sb_sectsize +
 		     XFS_ALLOCFREE_LOG_RES(mp, 2) +
-		     128 * (5 + XFS_ALLOCFREE_LOG_COUNT(mp, 2))));
+		     xfs_buf_log_overhead() *
+		     (5 + XFS_ALLOCFREE_LOG_COUNT(mp, 2))));
 }
 
 /*
@@ -503,7 +538,7 @@ STATIC uint
 xfs_calc_clear_agi_bucket_reservation(
 	struct xfs_mount	*mp)
 {
-	return mp->m_sb.sb_sectsize + 128;
+	return mp->m_sb.sb_sectsize + xfs_buf_log_overhead();
 }
 
 /*
-- 
1.7.9.5

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

                 reply	other threads:[~2012-12-07 12:17 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=50C1DEE9.8010302@oracle.com \
    --to=jeff.liu@oracle.com \
    --cc=xfs@oss.sgi.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.