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 | bb2a125a59d637454de455956fd5ac57f61baea4 (patch) | |
| tree | 40154eb620baa8dc4b3d83ad32ce7db4e6579748 | |
| parent | fb75464f4051e2589b23c44abd69fd095f58d8cb (diff) | |
| download | xfsprogs-dev-bb2a125a59d637454de455956fd5ac57f61baea4.tar.gz | |
xfs: refactor short form btree pointer verification
Source kernel commit: e1e55aaf1cc646b736439cbd5af229759029ae34
Now that we have xfs_verify_agbno, use it to verify short form btree
pointers instead of open-coding them.
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_btree.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libxfs/xfs_btree.c b/libxfs/xfs_btree.c index 63dd790584..ddb70cc054 100644 --- a/libxfs/xfs_btree.c +++ b/libxfs/xfs_btree.c @@ -4614,19 +4614,19 @@ xfs_btree_sblock_verify( { struct xfs_mount *mp = bp->b_target->bt_mount; struct xfs_btree_block *block = XFS_BUF_TO_BLOCK(bp); + xfs_agblock_t agno; /* numrecs verification */ if (be16_to_cpu(block->bb_numrecs) > max_recs) return false; /* sibling pointer verification */ - if (!block->bb_u.s.bb_leftsib || - (be32_to_cpu(block->bb_u.s.bb_leftsib) >= mp->m_sb.sb_agblocks && - block->bb_u.s.bb_leftsib != cpu_to_be32(NULLAGBLOCK))) + agno = xfs_daddr_to_agno(mp, XFS_BUF_ADDR(bp)); + if (block->bb_u.s.bb_leftsib != cpu_to_be32(NULLAGBLOCK) && + !xfs_verify_agbno(mp, agno, be32_to_cpu(block->bb_u.s.bb_leftsib))) return false; - if (!block->bb_u.s.bb_rightsib || - (be32_to_cpu(block->bb_u.s.bb_rightsib) >= mp->m_sb.sb_agblocks && - block->bb_u.s.bb_rightsib != cpu_to_be32(NULLAGBLOCK))) + if (block->bb_u.s.bb_rightsib != cpu_to_be32(NULLAGBLOCK) && + !xfs_verify_agbno(mp, agno, be32_to_cpu(block->bb_u.s.bb_rightsib))) return false; return true; |