Commit 6ed7e509 authored by Darrick J. Wong's avatar Darrick J. Wong
Browse files

xfs: rename xfs_*alloc*_log_count to _block_count 



These functions return the maximum number of blocks that could be logged
in a particular transaction.  "log count" is confusing since there's a
separate concept of a log (operation) count in the reservation code, so
let's change it to "block count" to be less confusing.

Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
parent df2fd88f

fs/xfs/libxfs/xfs_refcount.c

+1 −1
Original line number Diff line number Diff line
@@ -890,7 +890,7 @@ xfs_refcount_still_have_space( 
	 * Worst case estimate: full splits of the free space and rmap btrees

	 * to handle each of the shape changes to the refcount btree.

	 */

	overhead = xfs_allocfree_log_count(cur->bc_mp,

	overhead = xfs_allocfree_block_count(cur->bc_mp,

				cur->bc_ag.refc.shape_changes);

	overhead += cur->bc_mp->m_refc_maxlevels;

	overhead *= cur->bc_mp->m_sb.sb_blocksize;

fs/xfs/libxfs/xfs_trans_resv.c

+19 −19
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ xfs_calc_buf_res( 
 * Keep in mind that max depth is calculated separately for each type of tree.

 */

uint

xfs_allocfree_log_count(

xfs_allocfree_block_count(

	struct xfs_mount *mp,

	uint		num_ops)

{
@@ -146,7 +146,7 @@ xfs_calc_inobt_res( 
{

	return xfs_calc_buf_res(M_IGEO(mp)->inobt_maxlevels,

			XFS_FSB_TO_B(mp, 1)) +

				xfs_calc_buf_res(xfs_allocfree_log_count(mp, 1),

				xfs_calc_buf_res(xfs_allocfree_block_count(mp, 1),

			XFS_FSB_TO_B(mp, 1));

}
@@ -193,7 +193,7 @@ xfs_calc_inode_chunk_res( 
{

	uint			res, size = 0;



	res = xfs_calc_buf_res(xfs_allocfree_log_count(mp, 1),

	res = xfs_calc_buf_res(xfs_allocfree_block_count(mp, 1),

			       XFS_FSB_TO_B(mp, 1));

	if (alloc) {

		/* icreate tx uses ordered buffers */
@@ -213,7 +213,7 @@ xfs_calc_inode_chunk_res( 
 * extents, as well as the realtime summary block.

 */

static unsigned int

xfs_rtalloc_log_count(

xfs_rtalloc_block_count(

	struct xfs_mount	*mp,

	unsigned int		num_ops)

{
@@ -300,21 +300,21 @@ xfs_calc_write_reservation( 
	t1 = xfs_calc_inode_res(mp, 1) +

	     xfs_calc_buf_res(XFS_BM_MAXLEVELS(mp, XFS_DATA_FORK), blksz) +

	     xfs_calc_buf_res(3, mp->m_sb.sb_sectsize) +

	     xfs_calc_buf_res(xfs_allocfree_log_count(mp, 2), blksz);

	     xfs_calc_buf_res(xfs_allocfree_block_count(mp, 2), blksz);



	if (xfs_has_realtime(mp)) {

		t2 = xfs_calc_inode_res(mp, 1) +

		     xfs_calc_buf_res(XFS_BM_MAXLEVELS(mp, XFS_DATA_FORK),

				     blksz) +

		     xfs_calc_buf_res(3, mp->m_sb.sb_sectsize) +

		     xfs_calc_buf_res(xfs_rtalloc_log_count(mp, 1), blksz) +

		     xfs_calc_buf_res(xfs_allocfree_log_count(mp, 1), blksz);

		     xfs_calc_buf_res(xfs_rtalloc_block_count(mp, 1), blksz) +

		     xfs_calc_buf_res(xfs_allocfree_block_count(mp, 1), blksz);

	} else {

		t2 = 0;

	}



	t3 = xfs_calc_buf_res(5, mp->m_sb.sb_sectsize) +

	     xfs_calc_buf_res(xfs_allocfree_log_count(mp, 2), blksz);

	     xfs_calc_buf_res(xfs_allocfree_block_count(mp, 2), blksz);



	/*

	 * In the early days of reflink, we included enough reservation to log
@@ -381,12 +381,12 @@ xfs_calc_itruncate_reservation( 
	     xfs_calc_buf_res(XFS_BM_MAXLEVELS(mp, XFS_DATA_FORK) + 1, blksz);



	t2 = xfs_calc_buf_res(9, mp->m_sb.sb_sectsize) +

	     xfs_calc_buf_res(xfs_allocfree_log_count(mp, 4), blksz);

	     xfs_calc_buf_res(xfs_allocfree_block_count(mp, 4), blksz);



	if (xfs_has_realtime(mp)) {

		t3 = xfs_calc_buf_res(5, mp->m_sb.sb_sectsize) +

		     xfs_calc_buf_res(xfs_rtalloc_log_count(mp, 2), blksz) +

		     xfs_calc_buf_res(xfs_allocfree_log_count(mp, 2), blksz);

		     xfs_calc_buf_res(xfs_rtalloc_block_count(mp, 2), blksz) +

		     xfs_calc_buf_res(xfs_allocfree_block_count(mp, 2), blksz);

	} else {

		t3 = 0;

	}
@@ -441,7 +441,7 @@ xfs_calc_rename_reservation( 
		     xfs_calc_buf_res(2 * XFS_DIROP_LOG_COUNT(mp),

				      XFS_FSB_TO_B(mp, 1))),

		    (xfs_calc_buf_res(7, mp->m_sb.sb_sectsize) +

		     xfs_calc_buf_res(xfs_allocfree_log_count(mp, 3),

		     xfs_calc_buf_res(xfs_allocfree_block_count(mp, 3),

				      XFS_FSB_TO_B(mp, 1))));

}
@@ -481,7 +481,7 @@ xfs_calc_link_reservation( 
		     xfs_calc_buf_res(XFS_DIROP_LOG_COUNT(mp),

				      XFS_FSB_TO_B(mp, 1))),

		    (xfs_calc_buf_res(3, mp->m_sb.sb_sectsize) +

		     xfs_calc_buf_res(xfs_allocfree_log_count(mp, 1),

		     xfs_calc_buf_res(xfs_allocfree_block_count(mp, 1),

				      XFS_FSB_TO_B(mp, 1))));

}
@@ -519,7 +519,7 @@ xfs_calc_remove_reservation( 
		     xfs_calc_buf_res(XFS_DIROP_LOG_COUNT(mp),

				      XFS_FSB_TO_B(mp, 1))),

		    (xfs_calc_buf_res(4, mp->m_sb.sb_sectsize) +

		     xfs_calc_buf_res(xfs_allocfree_log_count(mp, 2),

		     xfs_calc_buf_res(xfs_allocfree_block_count(mp, 2),

				      XFS_FSB_TO_B(mp, 1))));

}
@@ -664,7 +664,7 @@ xfs_calc_growdata_reservation( 
	struct xfs_mount	*mp)

{

	return xfs_calc_buf_res(3, mp->m_sb.sb_sectsize) +

		xfs_calc_buf_res(xfs_allocfree_log_count(mp, 1),

		xfs_calc_buf_res(xfs_allocfree_block_count(mp, 1),

				 XFS_FSB_TO_B(mp, 1));

}
@@ -686,7 +686,7 @@ xfs_calc_growrtalloc_reservation( 
		xfs_calc_buf_res(XFS_BM_MAXLEVELS(mp, XFS_DATA_FORK),

				 XFS_FSB_TO_B(mp, 1)) +

		xfs_calc_inode_res(mp, 1) +

		xfs_calc_buf_res(xfs_allocfree_log_count(mp, 1),

		xfs_calc_buf_res(xfs_allocfree_block_count(mp, 1),

				 XFS_FSB_TO_B(mp, 1));

}
@@ -762,7 +762,7 @@ xfs_calc_addafork_reservation( 
		xfs_calc_buf_res(1, mp->m_dir_geo->blksize) +

		xfs_calc_buf_res(XFS_DAENTER_BMAP1B(mp, XFS_DATA_FORK) + 1,

				 XFS_FSB_TO_B(mp, 1)) +

		xfs_calc_buf_res(xfs_allocfree_log_count(mp, 1),

		xfs_calc_buf_res(xfs_allocfree_block_count(mp, 1),

				 XFS_FSB_TO_B(mp, 1));

}
@@ -785,7 +785,7 @@ xfs_calc_attrinval_reservation( 
		    xfs_calc_buf_res(XFS_BM_MAXLEVELS(mp, XFS_ATTR_FORK),

				     XFS_FSB_TO_B(mp, 1))),

		   (xfs_calc_buf_res(9, mp->m_sb.sb_sectsize) +

		    xfs_calc_buf_res(xfs_allocfree_log_count(mp, 4),

		    xfs_calc_buf_res(xfs_allocfree_block_count(mp, 4),

				     XFS_FSB_TO_B(mp, 1))));

}
@@ -852,7 +852,7 @@ xfs_calc_attrrm_reservation( 
					XFS_BM_MAXLEVELS(mp, XFS_ATTR_FORK)) +

		     xfs_calc_buf_res(XFS_BM_MAXLEVELS(mp, XFS_DATA_FORK), 0)),

		    (xfs_calc_buf_res(5, mp->m_sb.sb_sectsize) +

		     xfs_calc_buf_res(xfs_allocfree_log_count(mp, 2),

		     xfs_calc_buf_res(xfs_allocfree_block_count(mp, 2),

				      XFS_FSB_TO_B(mp, 1))));

}

fs/xfs/libxfs/xfs_trans_resv.h

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ struct xfs_trans_resv { 
#define	XFS_WRITE_LOG_COUNT_REFLINK	8



void xfs_trans_resv_calc(struct xfs_mount *mp, struct xfs_trans_resv *resp);

uint xfs_allocfree_log_count(struct xfs_mount *mp, uint num_ops);

uint xfs_allocfree_block_count(struct xfs_mount *mp, uint num_ops);



unsigned int xfs_calc_itruncate_reservation_minlogsize(struct xfs_mount *mp);

unsigned int xfs_calc_write_reservation_minlogsize(struct xfs_mount *mp);