[PATCH 040/111] xfs: remove the unnecessary daddr paramter to _init_block

Darrick J. Wong
2024-06-03T19:02:29Z

Source kernel commit: 11388f6581f40e7d5a69ce5f8b13264eca7c2c5c

Now that all of the callers pass XFS_BUF_DADDR_NULL as the daddr
parameter, we can elide that too.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Carlos Maiolino <cmaiolino@redhat.com>
---
libxfs/xfs_bmap_btree.c | 4 ++--
libxfs/xfs_btree.c | 19 ++++++++++++++++---
libxfs/xfs_btree.h | 2 +-
libxfs/xfs_btree_staging.c | 5 ++---
4 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/libxfs/xfs_bmap_btree.c b/libxfs/xfs_bmap_btree.c
index 65ba3ae8a..2d8411809 100644
--- a/libxfs/xfs_bmap_btree.c
+++ b/libxfs/xfs_bmap_btree.c
@@ -37,8 +37,8 @@ xfs_bmbt_init_block(
xfs_btree_init_buf(ip->i_mount, bp, &xfs_bmbt_ops, level,
numrecs, ip->i_ino);
else
- xfs_btree_init_block(ip->i_mount, buf, &xfs_bmbt_ops,
- XFS_BUF_DADDR_NULL, level, numrecs, ip->i_ino);
+ xfs_btree_init_block(ip->i_mount, buf, &xfs_bmbt_ops, level,
+ numrecs, ip->i_ino);
}

/*
diff --git a/libxfs/xfs_btree.c b/libxfs/xfs_btree.c
index 372a521c1..2386084a5 100644
--- a/libxfs/xfs_btree.c
+++ b/libxfs/xfs_btree.c
@@ -1150,8 +1150,8 @@ xfs_btree_set_sibling(
}
}

-void
-xfs_btree_init_block(
+static void
+__xfs_btree_init_block(
struct xfs_mount *mp,
struct xfs_btree_block *buf,
const struct xfs_btree_ops *ops,
@@ -1192,6 +1192,19 @@ xfs_btree_init_block(
}
}

+void
+xfs_btree_init_block(
+ struct xfs_mount *mp,
+ struct xfs_btree_block *block,
+ const struct xfs_btree_ops *ops,
+ __u16 level,
+ __u16 numrecs,
+ __u64 owner)
+{
+ __xfs_btree_init_block(mp, block, ops, XFS_BUF_DADDR_NULL, level,
+ numrecs, owner);
+}
+
void
xfs_btree_init_buf(
struct xfs_mount *mp,
@@ -1201,7 +1214,7 @@ xfs_btree_init_buf(
__u16 numrecs,
__u64 owner)
{
- xfs_btree_init_block(mp, XFS_BUF_TO_BLOCK(bp), ops,
+ __xfs_btree_init_block(mp, XFS_BUF_TO_BLOCK(bp), ops,
xfs_buf_daddr(bp), level, numrecs, owner);
}

diff --git a/libxfs/xfs_btree.h b/libxfs/xfs_btree.h
index 56901d259..80be40ca8 100644
--- a/libxfs/xfs_btree.h
+++ b/libxfs/xfs_btree.h
@@ -440,7 +440,7 @@ void xfs_btree_init_buf(struct xfs_mount *mp, struct xfs_buf *bp,
__u64 owner);
void xfs_btree_init_block(struct xfs_mount *mp,
struct xfs_btree_block *buf, const struct xfs_btree_ops *ops,
- xfs_daddr_t blkno, __u16 level, __u16 numrecs, __u64 owner);
+ __u16 level, __u16 numrecs, __u64 owner);

/*
* Common btree core entry points.
diff --git a/libxfs/xfs_btree_staging.c b/libxfs/xfs_btree_staging.c
index 47ef8e23a..39e95a771 100644
--- a/libxfs/xfs_btree_staging.c
+++ b/libxfs/xfs_btree_staging.c
@@ -410,9 +410,8 @@ xfs_btree_bload_prep_block(
ifp->if_broot_bytes = (int)new_size;

/* Initialize it and send it out. */
- xfs_btree_init_block(cur->bc_mp, ifp->if_broot,
- cur->bc_ops, XFS_BUF_DADDR_NULL, level,
- nr_this_block, cur->bc_ino.ip->i_ino);
+ xfs_btree_init_block(cur->bc_mp, ifp->if_broot, cur->bc_ops,
+ level, nr_this_block, cur->bc_ino.ip->i_ino);

*bpp = NULL;
*blockp = ifp->if_broot;