Commit 3c68858b authored by Darrick J. Wong's avatar Darrick J. Wong

xfs: rename btree block/buffer init functions

Rename xfs_btree_init_block_int to xfs_btree_init_block, and
xfs_btree_init_block to xfs_btree_init_buf so that the name suggests the
type that caller are supposed to pass in.
Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
parent c87e3bf7
...@@ -492,7 +492,7 @@ xfs_btroot_init( ...@@ -492,7 +492,7 @@ xfs_btroot_init(
struct xfs_buf *bp, struct xfs_buf *bp,
struct aghdr_init_data *id) struct aghdr_init_data *id)
{ {
xfs_btree_init_block(mp, bp, id->bc_ops, 0, 0, id->agno); xfs_btree_init_buf(mp, bp, id->bc_ops, 0, 0, id->agno);
} }
/* Finish initializing a free space btree. */ /* Finish initializing a free space btree. */
...@@ -558,7 +558,7 @@ xfs_bnoroot_init( ...@@ -558,7 +558,7 @@ xfs_bnoroot_init(
struct xfs_buf *bp, struct xfs_buf *bp,
struct aghdr_init_data *id) struct aghdr_init_data *id)
{ {
xfs_btree_init_block(mp, bp, id->bc_ops, 0, 0, id->agno); xfs_btree_init_buf(mp, bp, id->bc_ops, 0, 0, id->agno);
xfs_freesp_init_recs(mp, bp, id); xfs_freesp_init_recs(mp, bp, id);
} }
...@@ -574,7 +574,7 @@ xfs_rmaproot_init( ...@@ -574,7 +574,7 @@ xfs_rmaproot_init(
struct xfs_btree_block *block = XFS_BUF_TO_BLOCK(bp); struct xfs_btree_block *block = XFS_BUF_TO_BLOCK(bp);
struct xfs_rmap_rec *rrec; struct xfs_rmap_rec *rrec;
xfs_btree_init_block(mp, bp, id->bc_ops, 0, 4, id->agno); xfs_btree_init_buf(mp, bp, id->bc_ops, 0, 4, id->agno);
/* /*
* mark the AG header regions as static metadata The BNO * mark the AG header regions as static metadata The BNO
......
...@@ -35,10 +35,10 @@ xfs_bmbt_init_block( ...@@ -35,10 +35,10 @@ xfs_bmbt_init_block(
__u16 numrecs) __u16 numrecs)
{ {
if (bp) if (bp)
xfs_btree_init_block(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_int(ip->i_mount, buf, &xfs_bmbt_ops, xfs_btree_init_block(ip->i_mount, buf, &xfs_bmbt_ops,
XFS_BUF_DADDR_NULL, level, numrecs, ip->i_ino); XFS_BUF_DADDR_NULL, level, numrecs, ip->i_ino);
} }
......
...@@ -1154,7 +1154,7 @@ xfs_btree_set_sibling( ...@@ -1154,7 +1154,7 @@ xfs_btree_set_sibling(
} }
void void
xfs_btree_init_block_int( 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,
...@@ -1196,7 +1196,7 @@ xfs_btree_init_block_int( ...@@ -1196,7 +1196,7 @@ xfs_btree_init_block_int(
} }
void void
xfs_btree_init_block( xfs_btree_init_buf(
struct xfs_mount *mp, struct xfs_mount *mp,
struct xfs_buf *bp, struct xfs_buf *bp,
const struct xfs_btree_ops *ops, const struct xfs_btree_ops *ops,
...@@ -1204,7 +1204,7 @@ xfs_btree_init_block( ...@@ -1204,7 +1204,7 @@ xfs_btree_init_block(
__u16 numrecs, __u16 numrecs,
__u64 owner) __u64 owner)
{ {
xfs_btree_init_block_int(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);
} }
...@@ -1228,7 +1228,7 @@ xfs_btree_init_block_cur( ...@@ -1228,7 +1228,7 @@ xfs_btree_init_block_cur(
else else
owner = cur->bc_ag.pag->pag_agno; owner = cur->bc_ag.pag->pag_agno;
xfs_btree_init_block_int(cur->bc_mp, XFS_BUF_TO_BLOCK(bp), cur->bc_ops, xfs_btree_init_block(cur->bc_mp, XFS_BUF_TO_BLOCK(bp), cur->bc_ops,
xfs_buf_daddr(bp), level, numrecs, owner); xfs_buf_daddr(bp), level, numrecs, owner);
} }
......
...@@ -435,10 +435,10 @@ xfs_btree_reada_bufs( ...@@ -435,10 +435,10 @@ xfs_btree_reada_bufs(
/* /*
* Initialise a new btree block header * Initialise a new btree block header
*/ */
void xfs_btree_init_block(struct xfs_mount *mp, struct xfs_buf *bp, void xfs_btree_init_buf(struct xfs_mount *mp, struct xfs_buf *bp,
const struct xfs_btree_ops *ops, __u16 level, __u16 numrecs, const struct xfs_btree_ops *ops, __u16 level, __u16 numrecs,
__u64 owner); __u64 owner);
void xfs_btree_init_block_int(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); xfs_daddr_t blkno, __u16 level, __u16 numrecs, __u64 owner);
......
...@@ -410,7 +410,7 @@ xfs_btree_bload_prep_block( ...@@ -410,7 +410,7 @@ 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_int(cur->bc_mp, ifp->if_broot, xfs_btree_init_block(cur->bc_mp, ifp->if_broot,
cur->bc_ops, XFS_BUF_DADDR_NULL, level, cur->bc_ops, XFS_BUF_DADDR_NULL, level,
nr_this_block, cur->bc_ino.ip->i_ino); nr_this_block, cur->bc_ino.ip->i_ino);
......
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