diff options
| author | Darrick J. Wong <darrick.wong@oracle.com> | 2018-02-26 22:43:16 -0600 |
|---|---|---|
| committer | Eric Sandeen <sandeen@redhat.com> | 2018-02-26 22:43:16 -0600 |
| commit | ecdc52ff8d8f927d130f711bcbd9bc388dc57057 (patch) | |
| tree | 6c17053b1e731e80e9281c5d98834fad55d4a585 | |
| parent | 0197075701aad6da240187b7e8dc5cfe0205eb87 (diff) | |
| download | xfsprogs-dev-ecdc52ff8d8f927d130f711bcbd9bc388dc57057.tar.gz | |
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>
| -rw-r--r-- | libxfs/xfs_bmap.c | 4 | ||||
| -rw-r--r-- | libxfs/xfs_bmap_btree.c | 4 | ||||
| -rw-r--r-- | libxfs/xfs_btree.c | 2 | ||||
| -rw-r--r-- | libxfs/xfs_btree.h | 4 |
4 files changed, 5 insertions, 9 deletions
diff --git a/libxfs/xfs_bmap.c b/libxfs/xfs_bmap.c index 44acff376d..9a11791062 100644 --- 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 7281f36a9a..b9437c1abe 100644 --- 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 cc1320f7c5..31b176fdce 100644 --- 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 c0252bdd92..c85038bcd3 100644 --- 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. |