xfs: rename btree block/buffer init functions

Source kernel commit: 3c68858b264fac292f74733eeaf558595978a5e5

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: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Carlos Maiolino <cmaiolino@redhat.com>

diff --git a/libxfs/xfs_ag.c b/libxfs/xfs_ag.c
index 932bdfb8de6ad64da93583b26c17ec997fae306b..cdca7f2470f2f0b173508d745e909d15e0a24cc7 100644 (file)
--- a/libxfs/xfs_ag.c
+++ b/libxfs/xfs_ag.c
@@ -490,7 +490,7 @@ xfs_btroot_init(
        struct xfs_buf          *bp,
        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. */
@@ -556,7 +556,7 @@ xfs_bnoroot_init(
        struct xfs_buf          *bp,
        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);
 }
 
@@ -572,7 +572,7 @@ xfs_rmaproot_init(
        struct xfs_btree_block  *block = XFS_BUF_TO_BLOCK(bp);
        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

diff --git a/libxfs/xfs_bmap_btree.c b/libxfs/xfs_bmap_btree.c
index a3732b4c4d72e305b5d1142f82719fcb4b08b576..65ba3ae8a5499c32da31e59aba4d96afae401876 100644 (file)
--- a/libxfs/xfs_bmap_btree.c
+++ b/libxfs/xfs_bmap_btree.c
@@ -34,10 +34,10 @@ xfs_bmbt_init_block(
        __u16                           numrecs)
 {
        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);
        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);
 }
 

diff --git a/libxfs/xfs_btree.c b/libxfs/xfs_btree.c
index 5675dd5aedcfd8f26ddf1f6565d1b9620aaad917..541f2336c4d5ba376d88fb8a8a73c2191dbe7bb9 100644 (file)
--- a/libxfs/xfs_btree.c
+++ b/libxfs/xfs_btree.c
@@ -1151,7 +1151,7 @@ xfs_btree_set_sibling(
 }
 
 void
-xfs_btree_init_block_int(
+xfs_btree_init_block(
        struct xfs_mount        *mp,
        struct xfs_btree_block  *buf,
        const struct xfs_btree_ops *ops,
@@ -1193,7 +1193,7 @@ xfs_btree_init_block_int(
 }
 
 void
-xfs_btree_init_block(
+xfs_btree_init_buf(
        struct xfs_mount                *mp,
        struct xfs_buf                  *bp,
        const struct xfs_btree_ops      *ops,
@@ -1201,7 +1201,7 @@ xfs_btree_init_block(
        __u16                           numrecs,
        __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);
 }
 
@@ -1225,7 +1225,7 @@ xfs_btree_init_block_cur(
        else
                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);
 }
 

diff --git a/libxfs/xfs_btree.h b/libxfs/xfs_btree.h
index 923f884fe5267f17e15185cea4c66bdebf62b281..56901d2591ed73b2ba8b3a05400ed3ceea092dfa 100644 (file)
--- a/libxfs/xfs_btree.h
+++ b/libxfs/xfs_btree.h
@@ -435,10 +435,10 @@ xfs_btree_reada_bufs(
 /*
  * 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,
                __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,
                xfs_daddr_t blkno, __u16 level, __u16 numrecs, __u64 owner);
 

diff --git a/libxfs/xfs_btree_staging.c b/libxfs/xfs_btree_staging.c
index ba3383cad43890f83269ba53be48f30c3ffd254b..47ef8e23a59e40bf9cfbcbf6d146301a9156269e 100644 (file)
--- a/libxfs/xfs_btree_staging.c
+++ b/libxfs/xfs_btree_staging.c
@@ -410,7 +410,7 @@ xfs_btree_bload_prep_block(
                ifp->if_broot_bytes = (int)new_size;
 
                /* 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,
                                nr_this_block, cur->bc_ino.ip->i_ino);