xfs: rename btree helpers that depends on the block number representation

Source kernel commit: 5ef819c34f954fccfc42f79b9b0bea9b40cef9a1

All these helpers hardcode fsblocks or agblocks and not just the pointer
size.  Rename them so that the names are still fitting when we add the
long format in-memory blocks and adjust the checks when calling them to
check the btree types and not just pointer length.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Carlos Maiolino <cmaiolino@redhat.com>

diff --git a/libxfs/xfs_alloc_btree.c b/libxfs/xfs_alloc_btree.c
index 35d3dde426b1ae2bd2f8bc225555d7c77bc7c1bc..949eb02cd073bcde67d46159052d18b23aa3ada4 100644 (file)
--- a/libxfs/xfs_alloc_btree.c
+++ b/libxfs/xfs_alloc_btree.c
@@ -320,7 +320,7 @@ xfs_allocbt_verify(
                return __this_address;
 
        if (xfs_has_crc(mp)) {
-               fa = xfs_btree_sblock_v5hdr_verify(bp);
+               fa = xfs_btree_agblock_v5hdr_verify(bp);
                if (fa)
                        return fa;
        }
@@ -360,7 +360,7 @@ xfs_allocbt_verify(
        } else if (level >= mp->m_alloc_maxlevels)
                return __this_address;
 
-       return xfs_btree_sblock_verify(bp, mp->m_alloc_mxr[level != 0]);
+       return xfs_btree_agblock_verify(bp, mp->m_alloc_mxr[level != 0]);
 }
 
 static void
@@ -369,7 +369,7 @@ xfs_allocbt_read_verify(
 {
        xfs_failaddr_t  fa;
 
-       if (!xfs_btree_sblock_verify_crc(bp))
+       if (!xfs_btree_agblock_verify_crc(bp))
                xfs_verifier_error(bp, -EFSBADCRC, __this_address);
        else {
                fa = xfs_allocbt_verify(bp);
@@ -393,7 +393,7 @@ xfs_allocbt_write_verify(
                xfs_verifier_error(bp, -EFSCORRUPTED, fa);
                return;
        }
-       xfs_btree_sblock_calc_crc(bp);
+       xfs_btree_agblock_calc_crc(bp);
 
 }
 

diff --git a/libxfs/xfs_bmap_btree.c b/libxfs/xfs_bmap_btree.c
index eede6ffd62ea9917fd67a7422d27962b11a45ea7..2a603b4d19bee0a227c5fdcef10ddf33aa74c5e7 100644 (file)
--- a/libxfs/xfs_bmap_btree.c
+++ b/libxfs/xfs_bmap_btree.c
@@ -419,7 +419,7 @@ xfs_bmbt_verify(
                 * XXX: need a better way of verifying the owner here. Right now
                 * just make sure there has been one set.
                 */
-               fa = xfs_btree_lblock_v5hdr_verify(bp, XFS_RMAP_OWN_UNKNOWN);
+               fa = xfs_btree_fsblock_v5hdr_verify(bp, XFS_RMAP_OWN_UNKNOWN);
                if (fa)
                        return fa;
        }
@@ -435,7 +435,7 @@ xfs_bmbt_verify(
        if (level > max(mp->m_bm_maxlevels[0], mp->m_bm_maxlevels[1]))
                return __this_address;
 
-       return xfs_btree_lblock_verify(bp, mp->m_bmap_dmxr[level != 0]);
+       return xfs_btree_fsblock_verify(bp, mp->m_bmap_dmxr[level != 0]);
 }
 
 static void
@@ -444,7 +444,7 @@ xfs_bmbt_read_verify(
 {
        xfs_failaddr_t  fa;
 
-       if (!xfs_btree_lblock_verify_crc(bp))
+       if (!xfs_btree_fsblock_verify_crc(bp))
                xfs_verifier_error(bp, -EFSBADCRC, __this_address);
        else {
                fa = xfs_bmbt_verify(bp);
@@ -468,7 +468,7 @@ xfs_bmbt_write_verify(
                xfs_verifier_error(bp, -EFSCORRUPTED, fa);
                return;
        }
-       xfs_btree_lblock_calc_crc(bp);
+       xfs_btree_fsblock_calc_crc(bp);
 }
 
 const struct xfs_buf_ops xfs_bmbt_buf_ops = {

diff --git a/libxfs/xfs_btree.c b/libxfs/xfs_btree.c
index fae121acecb401a4d6cdcdd086209760a22c242a..e69b88b9061c9c1d7b001c602a561470c6970e95 100644 (file)
--- a/libxfs/xfs_btree.c
+++ b/libxfs/xfs_btree.c
@@ -54,7 +54,7 @@ xfs_btree_magic(
  * bytes.
  */
 static inline xfs_failaddr_t
-xfs_btree_check_lblock_siblings(
+xfs_btree_check_fsblock_siblings(
        struct xfs_mount        *mp,
        xfs_fsblock_t           fsb,
        __be64                  dsibling)
@@ -73,7 +73,7 @@ xfs_btree_check_lblock_siblings(
 }
 
 static inline xfs_failaddr_t
-xfs_btree_check_sblock_siblings(
+xfs_btree_check_agblock_siblings(
        struct xfs_perag        *pag,
        xfs_agblock_t           agbno,
        __be32                  dsibling)
@@ -96,7 +96,7 @@ xfs_btree_check_sblock_siblings(
  * or NULL if everything is ok.
  */
 static xfs_failaddr_t
-__xfs_btree_check_lblock(
+__xfs_btree_check_fsblock(
        struct xfs_btree_cur    *cur,
        struct xfs_btree_block  *block,
        int                     level,
@@ -137,9 +137,10 @@ __xfs_btree_check_lblock(
        }
 
        fsb = XFS_DADDR_TO_FSB(mp, xfs_buf_daddr(bp));
-       fa = xfs_btree_check_lblock_siblings(mp, fsb, block->bb_u.l.bb_leftsib);
+       fa = xfs_btree_check_fsblock_siblings(mp, fsb,
+                       block->bb_u.l.bb_leftsib);
        if (!fa)
-               fa = xfs_btree_check_lblock_siblings(mp, fsb,
+               fa = xfs_btree_check_fsblock_siblings(mp, fsb,
                                block->bb_u.l.bb_rightsib);
        return fa;
 }
@@ -149,7 +150,7 @@ __xfs_btree_check_lblock(
  * or NULL if everything is ok.
  */
 static xfs_failaddr_t
-__xfs_btree_check_sblock(
+__xfs_btree_check_agblock(
        struct xfs_btree_cur    *cur,
        struct xfs_btree_block  *block,
        int                     level,
@@ -176,10 +177,10 @@ __xfs_btree_check_sblock(
                return __this_address;
 
        agbno = xfs_daddr_to_agbno(mp, xfs_buf_daddr(bp));
-       fa = xfs_btree_check_sblock_siblings(pag, agbno,
+       fa = xfs_btree_check_agblock_siblings(pag, agbno,
                        block->bb_u.s.bb_leftsib);
        if (!fa)
-               fa = xfs_btree_check_sblock_siblings(pag, agbno,
+               fa = xfs_btree_check_agblock_siblings(pag, agbno,
                                block->bb_u.s.bb_rightsib);
        return fa;
 }
@@ -196,9 +197,9 @@ __xfs_btree_check_block(
        int                     level,
        struct xfs_buf          *bp)
 {
-       if (cur->bc_ops->ptr_len == XFS_BTREE_SHORT_PTR_LEN)
-               return __xfs_btree_check_sblock(cur, block, level, bp);
-       return __xfs_btree_check_lblock(cur, block, level, bp);
+       if (cur->bc_ops->type == XFS_BTREE_TYPE_AG)
+               return __xfs_btree_check_agblock(cur, block, level, bp);
+       return __xfs_btree_check_fsblock(cur, block, level, bp);
 }
 
 static inline unsigned int xfs_btree_block_errtag(struct xfs_btree_cur *cur)
@@ -242,7 +243,7 @@ __xfs_btree_check_ptr(
        if (level <= 0)
                return -EFSCORRUPTED;
 
-       if (cur->bc_ops->ptr_len == XFS_BTREE_LONG_PTR_LEN) {
+       if (cur->bc_ops->type == XFS_BTREE_TYPE_INODE) {
                if (!xfs_verify_fsbno(cur->bc_mp,
                                be64_to_cpu((&ptr->l)[index])))
                        return -EFSCORRUPTED;
@@ -270,7 +271,7 @@ xfs_btree_check_ptr(
 
        error = __xfs_btree_check_ptr(cur, ptr, index, level);
        if (error) {
-               if (cur->bc_ops->ptr_len == XFS_BTREE_LONG_PTR_LEN) {
+               if (cur->bc_ops->type == XFS_BTREE_TYPE_INODE) {
                        xfs_err(cur->bc_mp,
 "Inode %llu fork %d: Corrupt %sbt pointer at level %d index %d.",
                                cur->bc_ino.ip->i_ino,
@@ -303,7 +304,7 @@ xfs_btree_check_ptr(
  * it to disk.
  */
 void
-xfs_btree_lblock_calc_crc(
+xfs_btree_fsblock_calc_crc(
        struct xfs_buf          *bp)
 {
        struct xfs_btree_block  *block = XFS_BUF_TO_BLOCK(bp);
@@ -317,7 +318,7 @@ xfs_btree_lblock_calc_crc(
 }
 
 bool
-xfs_btree_lblock_verify_crc(
+xfs_btree_fsblock_verify_crc(
        struct xfs_buf          *bp)
 {
        struct xfs_btree_block  *block = XFS_BUF_TO_BLOCK(bp);
@@ -341,7 +342,7 @@ xfs_btree_lblock_verify_crc(
  * it to disk.
  */
 void
-xfs_btree_sblock_calc_crc(
+xfs_btree_agblock_calc_crc(
        struct xfs_buf          *bp)
 {
        struct xfs_btree_block  *block = XFS_BUF_TO_BLOCK(bp);
@@ -355,7 +356,7 @@ xfs_btree_sblock_calc_crc(
 }
 
 bool
-xfs_btree_sblock_verify_crc(
+xfs_btree_agblock_verify_crc(
        struct xfs_buf          *bp)
 {
        struct xfs_btree_block  *block = XFS_BUF_TO_BLOCK(bp);
@@ -910,7 +911,7 @@ xfs_btree_reada_bufs(
 }
 
 STATIC int
-xfs_btree_readahead_lblock(
+xfs_btree_readahead_fsblock(
        struct xfs_btree_cur    *cur,
        int                     lr,
        struct xfs_btree_block  *block)
@@ -935,7 +936,7 @@ xfs_btree_readahead_lblock(
 }
 
 STATIC int
-xfs_btree_readahead_sblock(
+xfs_btree_readahead_agblock(
        struct xfs_btree_cur    *cur,
        int                     lr,
        struct xfs_btree_block *block)
@@ -986,8 +987,8 @@ xfs_btree_readahead(
        block = XFS_BUF_TO_BLOCK(cur->bc_levels[lev].bp);
 
        if (cur->bc_ops->ptr_len == XFS_BTREE_LONG_PTR_LEN)
-               return xfs_btree_readahead_lblock(cur, lr, block);
-       return xfs_btree_readahead_sblock(cur, lr, block);
+               return xfs_btree_readahead_fsblock(cur, lr, block);
+       return xfs_btree_readahead_agblock(cur, lr, block);
 }
 
 STATIC int
@@ -4594,7 +4595,7 @@ xfs_btree_change_owner(
 
 /* Verify the v5 fields of a long-format btree block. */
 xfs_failaddr_t
-xfs_btree_lblock_v5hdr_verify(
+xfs_btree_fsblock_v5hdr_verify(
        struct xfs_buf          *bp,
        uint64_t                owner)
 {
@@ -4615,7 +4616,7 @@ xfs_btree_lblock_v5hdr_verify(
 
 /* Verify a long-format btree block. */
 xfs_failaddr_t
-xfs_btree_lblock_verify(
+xfs_btree_fsblock_verify(
        struct xfs_buf          *bp,
        unsigned int            max_recs)
 {
@@ -4630,21 +4631,22 @@ xfs_btree_lblock_verify(
 
        /* sibling pointer verification */
        fsb = XFS_DADDR_TO_FSB(mp, xfs_buf_daddr(bp));
-       fa = xfs_btree_check_lblock_siblings(mp, fsb, block->bb_u.l.bb_leftsib);
+       fa = xfs_btree_check_fsblock_siblings(mp, fsb,
+                       block->bb_u.l.bb_leftsib);
        if (!fa)
-               fa = xfs_btree_check_lblock_siblings(mp, fsb,
+               fa = xfs_btree_check_fsblock_siblings(mp, fsb,
                                block->bb_u.l.bb_rightsib);
        return fa;
 }
 
 /**
- * xfs_btree_sblock_v5hdr_verify() -- verify the v5 fields of a short-format
+ * xfs_btree_agblock_v5hdr_verify() -- verify the v5 fields of a short-format
  *                                   btree block
  *
  * @bp: buffer containing the btree block
  */
 xfs_failaddr_t
-xfs_btree_sblock_v5hdr_verify(
+xfs_btree_agblock_v5hdr_verify(
        struct xfs_buf          *bp)
 {
        struct xfs_mount        *mp = bp->b_mount;
@@ -4663,13 +4665,13 @@ xfs_btree_sblock_v5hdr_verify(
 }
 
 /**
- * xfs_btree_sblock_verify() -- verify a short-format btree block
+ * xfs_btree_agblock_verify() -- verify a short-format btree block
  *
  * @bp: buffer containing the btree block
  * @max_recs: maximum records allowed in this btree node
  */
 xfs_failaddr_t
-xfs_btree_sblock_verify(
+xfs_btree_agblock_verify(
        struct xfs_buf          *bp,
        unsigned int            max_recs)
 {
@@ -4684,10 +4686,10 @@ xfs_btree_sblock_verify(
 
        /* sibling pointer verification */
        agbno = xfs_daddr_to_agbno(mp, xfs_buf_daddr(bp));
-       fa = xfs_btree_check_sblock_siblings(bp->b_pag, agbno,
+       fa = xfs_btree_check_agblock_siblings(bp->b_pag, agbno,
                        block->bb_u.s.bb_leftsib);
        if (!fa)
-               fa = xfs_btree_check_sblock_siblings(bp->b_pag, agbno,
+               fa = xfs_btree_check_agblock_siblings(bp->b_pag, agbno,
                                block->bb_u.s.bb_rightsib);
        return fa;
 }

diff --git a/libxfs/xfs_btree.h b/libxfs/xfs_btree.h
index d3afa6209ff80e51d0b71d84d90d5b0a3d9cae75..b9b46a573e64a0a66cc2c559144ebb85c49fcb52 100644 (file)
--- a/libxfs/xfs_btree.h
+++ b/libxfs/xfs_btree.h
@@ -441,10 +441,10 @@ int xfs_btree_change_owner(struct xfs_btree_cur *cur, uint64_t new_owner,
 /*
  * btree block CRC helpers
  */
-void xfs_btree_lblock_calc_crc(struct xfs_buf *);
-bool xfs_btree_lblock_verify_crc(struct xfs_buf *);
-void xfs_btree_sblock_calc_crc(struct xfs_buf *);
-bool xfs_btree_sblock_verify_crc(struct xfs_buf *);
+void xfs_btree_fsblock_calc_crc(struct xfs_buf *);
+bool xfs_btree_fsblock_verify_crc(struct xfs_buf *);
+void xfs_btree_agblock_calc_crc(struct xfs_buf *);
+bool xfs_btree_agblock_verify_crc(struct xfs_buf *);
 
 /*
  * Internal btree helpers also used by xfs_bmap.c.
@@ -484,12 +484,12 @@ static inline int xfs_btree_get_level(const struct xfs_btree_block *block)
 #define        XFS_FILBLKS_MIN(a,b)    min_t(xfs_filblks_t, (a), (b))
 #define        XFS_FILBLKS_MAX(a,b)    max_t(xfs_filblks_t, (a), (b))
 
-xfs_failaddr_t xfs_btree_sblock_v5hdr_verify(struct xfs_buf *bp);
-xfs_failaddr_t xfs_btree_sblock_verify(struct xfs_buf *bp,
+xfs_failaddr_t xfs_btree_agblock_v5hdr_verify(struct xfs_buf *bp);
+xfs_failaddr_t xfs_btree_agblock_verify(struct xfs_buf *bp,
                unsigned int max_recs);
-xfs_failaddr_t xfs_btree_lblock_v5hdr_verify(struct xfs_buf *bp,
+xfs_failaddr_t xfs_btree_fsblock_v5hdr_verify(struct xfs_buf *bp,
                uint64_t owner);
-xfs_failaddr_t xfs_btree_lblock_verify(struct xfs_buf *bp,
+xfs_failaddr_t xfs_btree_fsblock_verify(struct xfs_buf *bp,
                unsigned int max_recs);
 
 unsigned int xfs_btree_compute_maxlevels(const unsigned int *limits,

diff --git a/libxfs/xfs_ialloc_btree.c b/libxfs/xfs_ialloc_btree.c
index cb0a7c7792a1cba146c79c9f8ea54f158bb7955d..58c520ecba5a57e690c8c8d19aa166a74b952d25 100644 (file)
--- a/libxfs/xfs_ialloc_btree.c
+++ b/libxfs/xfs_ialloc_btree.c
@@ -308,7 +308,7 @@ xfs_inobt_verify(
         * xfs_perag_initialised_agi(pag)) if we ever do.
         */
        if (xfs_has_crc(mp)) {
-               fa = xfs_btree_sblock_v5hdr_verify(bp);
+               fa = xfs_btree_agblock_v5hdr_verify(bp);
                if (fa)
                        return fa;
        }
@@ -318,7 +318,7 @@ xfs_inobt_verify(
        if (level >= M_IGEO(mp)->inobt_maxlevels)
                return __this_address;
 
-       return xfs_btree_sblock_verify(bp,
+       return xfs_btree_agblock_verify(bp,
                        M_IGEO(mp)->inobt_mxr[level != 0]);
 }
 
@@ -328,7 +328,7 @@ xfs_inobt_read_verify(
 {
        xfs_failaddr_t  fa;
 
-       if (!xfs_btree_sblock_verify_crc(bp))
+       if (!xfs_btree_agblock_verify_crc(bp))
                xfs_verifier_error(bp, -EFSBADCRC, __this_address);
        else {
                fa = xfs_inobt_verify(bp);
@@ -352,7 +352,7 @@ xfs_inobt_write_verify(
                xfs_verifier_error(bp, -EFSCORRUPTED, fa);
                return;
        }
-       xfs_btree_sblock_calc_crc(bp);
+       xfs_btree_agblock_calc_crc(bp);
 
 }
 

diff --git a/libxfs/xfs_refcount_btree.c b/libxfs/xfs_refcount_btree.c
index 6ec0e36e58198b24bb5e5025b0bff1cb32235712..362b2a2d733a3de055406a87faebcf0eaf53421a 100644 (file)
--- a/libxfs/xfs_refcount_btree.c
+++ b/libxfs/xfs_refcount_btree.c
@@ -216,7 +216,7 @@ xfs_refcountbt_verify(
 
        if (!xfs_has_reflink(mp))
                return __this_address;
-       fa = xfs_btree_sblock_v5hdr_verify(bp);
+       fa = xfs_btree_agblock_v5hdr_verify(bp);
        if (fa)
                return fa;
 
@@ -238,7 +238,7 @@ xfs_refcountbt_verify(
        } else if (level >= mp->m_refc_maxlevels)
                return __this_address;
 
-       return xfs_btree_sblock_verify(bp, mp->m_refc_mxr[level != 0]);
+       return xfs_btree_agblock_verify(bp, mp->m_refc_mxr[level != 0]);
 }
 
 STATIC void
@@ -247,7 +247,7 @@ xfs_refcountbt_read_verify(
 {
        xfs_failaddr_t  fa;
 
-       if (!xfs_btree_sblock_verify_crc(bp))
+       if (!xfs_btree_agblock_verify_crc(bp))
                xfs_verifier_error(bp, -EFSBADCRC, __this_address);
        else {
                fa = xfs_refcountbt_verify(bp);
@@ -271,7 +271,7 @@ xfs_refcountbt_write_verify(
                xfs_verifier_error(bp, -EFSCORRUPTED, fa);
                return;
        }
-       xfs_btree_sblock_calc_crc(bp);
+       xfs_btree_agblock_calc_crc(bp);
 
 }
 

diff --git a/libxfs/xfs_rmap_btree.c b/libxfs/xfs_rmap_btree.c
index 18168db6ed0ee9174475b472b086a6cf68f197a8..2b7504f7a083b468f7e5dcfd13aadda2f2226bdd 100644 (file)
--- a/libxfs/xfs_rmap_btree.c
+++ b/libxfs/xfs_rmap_btree.c
@@ -334,7 +334,7 @@ xfs_rmapbt_verify(
 
        if (!xfs_has_rmapbt(mp))
                return __this_address;
-       fa = xfs_btree_sblock_v5hdr_verify(bp);
+       fa = xfs_btree_agblock_v5hdr_verify(bp);
        if (fa)
                return fa;
 
@@ -345,7 +345,7 @@ xfs_rmapbt_verify(
        } else if (level >= mp->m_rmap_maxlevels)
                return __this_address;
 
-       return xfs_btree_sblock_verify(bp, mp->m_rmap_mxr[level != 0]);
+       return xfs_btree_agblock_verify(bp, mp->m_rmap_mxr[level != 0]);
 }
 
 static void
@@ -354,7 +354,7 @@ xfs_rmapbt_read_verify(
 {
        xfs_failaddr_t  fa;
 
-       if (!xfs_btree_sblock_verify_crc(bp))
+       if (!xfs_btree_agblock_verify_crc(bp))
                xfs_verifier_error(bp, -EFSBADCRC, __this_address);
        else {
                fa = xfs_rmapbt_verify(bp);
@@ -378,7 +378,7 @@ xfs_rmapbt_write_verify(
                xfs_verifier_error(bp, -EFSCORRUPTED, fa);
                return;
        }
-       xfs_btree_sblock_calc_crc(bp);
+       xfs_btree_agblock_calc_crc(bp);
 
 }