Commit 11388f65 authored by Darrick J. Wong's avatar Darrick J. Wong

xfs: remove the unnecessary daddr paramter to _init_block

Now that all of the callers pass XFS_BUF_DADDR_NULL as the daddr
parameter, we can elide that too.
Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
parent 7771f703
...@@ -38,8 +38,8 @@ xfs_bmbt_init_block( ...@@ -38,8 +38,8 @@ xfs_bmbt_init_block(
xfs_btree_init_buf(ip->i_mount, bp, &xfs_bmbt_ops, level, xfs_btree_init_buf(ip->i_mount, bp, &xfs_bmbt_ops, level,
numrecs, ip->i_ino); numrecs, ip->i_ino);
else else
xfs_btree_init_block(ip->i_mount, buf, &xfs_bmbt_ops, xfs_btree_init_block(ip->i_mount, buf, &xfs_bmbt_ops, level,
XFS_BUF_DADDR_NULL, level, numrecs, ip->i_ino); numrecs, ip->i_ino);
} }
/* /*
......
...@@ -1153,8 +1153,8 @@ xfs_btree_set_sibling( ...@@ -1153,8 +1153,8 @@ xfs_btree_set_sibling(
} }
} }
void static void
xfs_btree_init_block( __xfs_btree_init_block(
struct xfs_mount *mp, struct xfs_mount *mp,
struct xfs_btree_block *buf, struct xfs_btree_block *buf,
const struct xfs_btree_ops *ops, const struct xfs_btree_ops *ops,
...@@ -1195,6 +1195,19 @@ xfs_btree_init_block( ...@@ -1195,6 +1195,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 void
xfs_btree_init_buf( xfs_btree_init_buf(
struct xfs_mount *mp, struct xfs_mount *mp,
...@@ -1204,7 +1217,7 @@ xfs_btree_init_buf( ...@@ -1204,7 +1217,7 @@ xfs_btree_init_buf(
__u16 numrecs, __u16 numrecs,
__u64 owner) __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); xfs_buf_daddr(bp), level, numrecs, owner);
} }
......
...@@ -440,7 +440,7 @@ void xfs_btree_init_buf(struct xfs_mount *mp, struct xfs_buf *bp, ...@@ -440,7 +440,7 @@ void xfs_btree_init_buf(struct xfs_mount *mp, struct xfs_buf *bp,
__u64 owner); __u64 owner);
void xfs_btree_init_block(struct xfs_mount *mp, void xfs_btree_init_block(struct xfs_mount *mp,
struct xfs_btree_block *buf, const struct xfs_btree_ops *ops, 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. * Common btree core entry points.
......
...@@ -410,9 +410,8 @@ xfs_btree_bload_prep_block( ...@@ -410,9 +410,8 @@ xfs_btree_bload_prep_block(
ifp->if_broot_bytes = (int)new_size; ifp->if_broot_bytes = (int)new_size;
/* Initialize it and send it out. */ /* Initialize it and send it out. */
xfs_btree_init_block(cur->bc_mp, ifp->if_broot, xfs_btree_init_block(cur->bc_mp, ifp->if_broot, cur->bc_ops,
cur->bc_ops, XFS_BUF_DADDR_NULL, level, level, nr_this_block, cur->bc_ino.ip->i_ino);
nr_this_block, cur->bc_ino.ip->i_ino);
*bpp = NULL; *bpp = NULL;
*blockp = ifp->if_broot; *blockp = ifp->if_broot;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment