xfs: misc cleanups for __xfs_btree_check_sblock

Remove the local crc variable that is only used once and remove the bp
NULL checking as it can't ever be NULL for short form blocks.

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>

diff --git a/fs/xfs/libxfs/xfs_btree.c b/fs/xfs/libxfs/xfs_btree.c
index 1a0816aa5009109a8d0ac68d9c4e9ceeed0a2d53..255d5437b6e2a5275ca864a3b4a585d0c67deae5 100644 (file)
--- a/fs/xfs/libxfs/xfs_btree.c
+++ b/fs/xfs/libxfs/xfs_btree.c
@@ -173,15 +173,13 @@ __xfs_btree_check_sblock(
 {
        struct xfs_mount        *mp = cur->bc_mp;
        struct xfs_perag        *pag = cur->bc_ag.pag;
-       bool                    crc = xfs_has_crc(mp);
        xfs_failaddr_t          fa;
-       xfs_agblock_t           agbno = NULLAGBLOCK;
+       xfs_agblock_t           agbno;
 
-       if (crc) {
+       if (xfs_has_crc(mp)) {
                if (!uuid_equal(&block->bb_u.s.bb_uuid, &mp->m_sb.sb_meta_uuid))
                        return __this_address;
-               if (block->bb_u.s.bb_blkno !=
-                   cpu_to_be64(bp ? xfs_buf_daddr(bp) : XFS_BUF_DADDR_NULL))
+               if (block->bb_u.s.bb_blkno != cpu_to_be64(xfs_buf_daddr(bp)))
                        return __this_address;
        }
 
@@ -193,9 +191,7 @@ __xfs_btree_check_sblock(
            cur->bc_ops->get_maxrecs(cur, level))
                return __this_address;
 
-       if (bp)
-               agbno = xfs_daddr_to_agbno(mp, xfs_buf_daddr(bp));
-
+       agbno = xfs_daddr_to_agbno(mp, xfs_buf_daddr(bp));
        fa = xfs_btree_check_sblock_siblings(pag, agbno,
                        block->bb_u.s.bb_leftsib);
        if (!fa)