xfs: remove XFS_FSB_SANITY_CHECK

Source kernel commit: 59f6fec3bdb2aafc84d39f34000819d232182d71

We already have a function to verify fsb pointers, so get rid of the
last users of the (less robust) macro.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>

diff --git a/libxfs/xfs_bmap.c b/libxfs/xfs_bmap.c
index 44acff376dc5270627f8651abc604897555c627b..9a11791062d59d0fcd2dcc638b27748390c9fda7 100644 (file)
--- a/libxfs/xfs_bmap.c
+++ b/libxfs/xfs_bmap.c
@@ -391,7 +391,7 @@ xfs_bmap_check_leaf_extents(
                pp = XFS_BMBT_PTR_ADDR(mp, block, 1, mp->m_bmap_dmxr[1]);
                bno = be64_to_cpu(*pp);
                XFS_WANT_CORRUPTED_GOTO(mp,
-                                       XFS_FSB_SANITY_CHECK(mp, bno), error0);
+                                       xfs_verify_fsbno(mp, bno), error0);
                if (bp_release) {
                        bp_release = 0;
                        xfs_trans_brelse(NULL, bp);
@@ -1211,7 +1211,7 @@ xfs_iread_extents(
                pp = XFS_BMBT_PTR_ADDR(mp, block, 1, mp->m_bmap_dmxr[1]);
                bno = be64_to_cpu(*pp);
                XFS_WANT_CORRUPTED_GOTO(mp,
-                       XFS_FSB_SANITY_CHECK(mp, bno), out_brelse);
+                       xfs_verify_fsbno(mp, bno), out_brelse);
                xfs_trans_brelse(tp, bp);
        }
 

diff --git a/libxfs/xfs_bmap_btree.c b/libxfs/xfs_bmap_btree.c
index 7281f36a9a401fe3eeabafa151132b6b24102d52..b9437c1abe30902d68445aacec8c863b0f12a086 100644 (file)
--- a/libxfs/xfs_bmap_btree.c
+++ b/libxfs/xfs_bmap_btree.c
@@ -467,11 +467,11 @@ xfs_bmbt_verify(
        /* sibling pointer verification */
        if (!block->bb_u.l.bb_leftsib ||
            (block->bb_u.l.bb_leftsib != cpu_to_be64(NULLFSBLOCK) &&
-            !XFS_FSB_SANITY_CHECK(mp, be64_to_cpu(block->bb_u.l.bb_leftsib))))
+            !xfs_verify_fsbno(mp, be64_to_cpu(block->bb_u.l.bb_leftsib))))
                return false;
        if (!block->bb_u.l.bb_rightsib ||
            (block->bb_u.l.bb_rightsib != cpu_to_be64(NULLFSBLOCK) &&
-            !XFS_FSB_SANITY_CHECK(mp, be64_to_cpu(block->bb_u.l.bb_rightsib))))
+            !xfs_verify_fsbno(mp, be64_to_cpu(block->bb_u.l.bb_rightsib))))
                return false;
 
        return true;

diff --git a/libxfs/xfs_btree.c b/libxfs/xfs_btree.c
index cc1320f7c50e66c6779d5df411f50209e5e812b9..31b176fdce68967938413a32836947780c113449 100644 (file)
--- a/libxfs/xfs_btree.c
+++ b/libxfs/xfs_btree.c
@@ -849,7 +849,7 @@ xfs_btree_read_bufl(
        xfs_daddr_t             d;              /* real disk block address */
        int                     error;
 
-       if (!XFS_FSB_SANITY_CHECK(mp, fsbno))
+       if (!xfs_verify_fsbno(mp, fsbno))
                return -EFSCORRUPTED;
        d = XFS_FSB_TO_DADDR(mp, fsbno);
        error = xfs_trans_read_buf(mp, tp, mp->m_ddev_targp, d,

diff --git a/libxfs/xfs_btree.h b/libxfs/xfs_btree.h
index c0252bdd92f45a21d94fbf9361f80739d145ea4a..c85038bcd3205e197f2b5809096f578ea2273ebb 100644 (file)
--- a/libxfs/xfs_btree.h
+++ b/libxfs/xfs_btree.h
@@ -473,10 +473,6 @@ static inline int xfs_btree_get_level(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))
 
-#define        XFS_FSB_SANITY_CHECK(mp,fsb)    \
-       (fsb && XFS_FSB_TO_AGNO(mp, fsb) < mp->m_sb.sb_agcount && \
-               XFS_FSB_TO_AGBNO(mp, fsb) < mp->m_sb.sb_agblocks)
-
 /*
  * Trace hooks.  Currently not implemented as they need to be ported
  * over to the generic tracing functionality, which is some effort.