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

Darrick J. Wong
2023-12-31T20:18:31Z

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

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
---
fs/xfs/libxfs/xfs_bmap.c | 3 +--
fs/xfs/libxfs/xfs_btree.c | 3 +--
fs/xfs/scrub/xfbtree.c | 3 +--
3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
index 59cad8b79fb6d..75ab7d203c6de 100644
--- a/fs/xfs/libxfs/xfs_bmap.c
+++ b/fs/xfs/libxfs/xfs_bmap.c
@@ -690,8 +690,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/fs/xfs/libxfs/xfs_btree.c b/fs/xfs/libxfs/xfs_btree.c
index 742e24b24ba26..0fdaacefe45e2 100644
--- a/fs/xfs/libxfs/xfs_btree.c
+++ b/fs/xfs/libxfs/xfs_btree.c
@@ -1289,8 +1289,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);
}

/*
diff --git a/fs/xfs/scrub/xfbtree.c b/fs/xfs/scrub/xfbtree.c
index e9445da09845f..f37f35c206354 100644
--- a/fs/xfs/scrub/xfbtree.c
+++ b/fs/xfs/scrub/xfbtree.c
@@ -446,8 +446,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)