[6/9] xfs: btree convert xfs_btree_init_block to xfs_btree_init_buf calls

Commit Message

Darrick J. Wong Dec. 31, 2023, 10:21 p.m. UTC

From: Darrick J. Wong <[e-mail]>

Convert any place we call xfs_btree_init_block with a buffer to use the
_init_buf function.

Signed-off-by: Darrick J. Wong <[e-mail]>
---
 libxfs/xfbtree.c   |    3 +--
 libxfs/xfs_bmap.c  |    3 +--
 libxfs/xfs_btree.c |    3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

Patch

diff --git a/libxfs/xfbtree.c b/libxfs/xfbtree.c
index ad4e42d6b2a..7310f29a8c2 100644
--- a/libxfs/xfbtree.c
+++ b/libxfs/xfbtree.c
@@ -402,8 +402,7 @@  xfbtree_init_leaf_block(
 	trace_xfbtree_create_root_buf(xfbt, bp);
 
 	bp->b_ops = cfg->btree_ops->buf_ops;
-	xfs_btree_init_block(mp, bp->b_addr, cfg->btree_ops, daddr, 0, 0,
-			cfg->owner);
+	xfs_btree_init_buf(mp, bp, cfg->btree_ops, 0, 0, cfg->owner);
 	error = xfs_bwrite(bp);
 	xfs_buf_relse(bp);
 	if (error)
diff --git a/libxfs/xfs_bmap.c b/libxfs/xfs_bmap.c
index 5e3a973e490..1c53204e1d5 100644
--- a/libxfs/xfs_bmap.c
+++ b/libxfs/xfs_bmap.c
@@ -684,8 +684,7 @@  xfs_bmap_extents_to_btree(
 	 */
 	abp->b_ops = &xfs_bmbt_buf_ops;
 	ablock = XFS_BUF_TO_BLOCK(abp);
-	xfs_btree_init_block(mp, ablock, &xfs_bmbt_ops, xfs_buf_daddr(abp),
-			0, 0, ip->i_ino);
+	xfs_btree_init_buf(mp, abp, &xfs_bmbt_ops, 0, 0, ip->i_ino);
 
 	for_each_xfs_iext(ifp, &icur, &rec) {
 		if (isnullstartblock(rec.br_startblock))
diff --git a/libxfs/xfs_btree.c b/libxfs/xfs_btree.c
index 452ebd7095d..c8bbda80b40 100644
--- a/libxfs/xfs_btree.c
+++ b/libxfs/xfs_btree.c
@@ -1286,8 +1286,7 @@  xfs_btree_init_block_cur(
 	else
 		owner = cur->bc_ag.pag->pag_agno;
 
-	xfs_btree_init_block(cur->bc_mp, XFS_BUF_TO_BLOCK(bp), cur->bc_ops,
-			xfs_buf_daddr(bp), level, numrecs, owner);
+	xfs_btree_init_buf(cur->bc_mp, bp, cur->bc_ops, level, numrecs, owner);
 }
 
 /*