xfs: simplify xfs_btree_check_lblock_siblings

Source kernel commit: 8b8ada973cacff338a0e817a97dd0afa301798c0

Stop using xfs_btree_check_lptr in xfs_btree_check_lblock_siblings,
as it only duplicates the xfs_verify_fsbno call in the other leg of
if / else besides adding a tautological level check.

With this the cur and level arguments can be removed as they are
now unused.

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_btree.c b/libxfs/xfs_btree.c
index 4ba36ecbbc36c81ba5973807fad5b9b3db0b3585..55775ddf0a22c06ead01900184a9b27c1a4b3525 100644 (file)
--- a/libxfs/xfs_btree.c
+++ b/libxfs/xfs_btree.c
@@ -56,8 +56,6 @@ xfs_btree_magic(
 static inline xfs_failaddr_t
 xfs_btree_check_lblock_siblings(
        struct xfs_mount        *mp,
-       struct xfs_btree_cur    *cur,
-       int                     level,
        xfs_fsblock_t           fsb,
        __be64                  dsibling)
 {
@@ -69,14 +67,8 @@ xfs_btree_check_lblock_siblings(
        sibling = be64_to_cpu(dsibling);
        if (sibling == fsb)
                return __this_address;
-       if (level >= 0) {
-               if (!xfs_btree_check_lptr(cur, sibling, level + 1))
-                       return __this_address;
-       } else {
-               if (!xfs_verify_fsbno(mp, sibling))
-                       return __this_address;
-       }
-
+       if (!xfs_verify_fsbno(mp, sibling))
+               return __this_address;
        return NULL;
 }
 
@@ -136,10 +128,9 @@ __xfs_btree_check_lblock(
        if (bp)
                fsb = XFS_DADDR_TO_FSB(mp, xfs_buf_daddr(bp));
 
-       fa = xfs_btree_check_lblock_siblings(mp, cur, level, fsb,
-                       block->bb_u.l.bb_leftsib);
+       fa = xfs_btree_check_lblock_siblings(mp, fsb, block->bb_u.l.bb_leftsib);
        if (!fa)
-               fa = xfs_btree_check_lblock_siblings(mp, cur, level, fsb,
+               fa = xfs_btree_check_lblock_siblings(mp, fsb,
                                block->bb_u.l.bb_rightsib);
        return fa;
 }
@@ -4648,10 +4639,9 @@ xfs_btree_lblock_verify(
 
        /* sibling pointer verification */
        fsb = XFS_DADDR_TO_FSB(mp, xfs_buf_daddr(bp));
-       fa = xfs_btree_check_lblock_siblings(mp, NULL, -1, fsb,
-                       block->bb_u.l.bb_leftsib);
+       fa = xfs_btree_check_lblock_siblings(mp, fsb, block->bb_u.l.bb_leftsib);
        if (!fa)
-               fa = xfs_btree_check_lblock_siblings(mp, NULL, -1, fsb,
+               fa = xfs_btree_check_lblock_siblings(mp, fsb,
                                block->bb_u.l.bb_rightsib);
        return fa;
 }