leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xfs: remove XFS_FSB_SANITY_CHECK

Browse Source 
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>
This commit is contained in:
Darrick J. Wong
2018-01-08 10:51:00 -08:00
parent d658e72b4a
commit 59f6fec3bd
4 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fs/xfs/libxfs/xfs_bmap.c
View File

@@ -400,7 +400,7 @@ xfs_bmap_check_leaf_extents(
pp = XFS_BMBT_PTR_ADDR(mp, block, 1, mp->m_bmap_dmxr[1]); pp = XFS_BMBT_PTR_ADDR(mp, block, 1, mp->m_bmap_dmxr[1]);
bno = be64_to_cpu(*pp); bno = be64_to_cpu(*pp);
XFS_WANT_CORRUPTED_GOTO(mp, XFS_WANT_CORRUPTED_GOTO(mp,
XFS_FSB_SANITY_CHECK(mp, bno), error0); xfs_verify_fsbno(mp, bno), error0);
if (bp_release) { if (bp_release) {
bp_release = 0; bp_release = 0;
xfs_trans_brelse(NULL, bp); xfs_trans_brelse(NULL, bp);
@@ -1220,7 +1220,7 @@ xfs_iread_extents(
pp = XFS_BMBT_PTR_ADDR(mp, block, 1, mp->m_bmap_dmxr[1]); pp = XFS_BMBT_PTR_ADDR(mp, block, 1, mp->m_bmap_dmxr[1]);
bno = be64_to_cpu(*pp); bno = be64_to_cpu(*pp);
XFS_WANT_CORRUPTED_GOTO(mp, 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); xfs_trans_brelse(tp, bp);
} }

4
fs/xfs/libxfs/xfs_bmap_btree.c
View File

@@ -470,11 +470,11 @@ xfs_bmbt_verify(
/* sibling pointer verification */ /* sibling pointer verification */
if (!block->bb_u.l.bb_leftsib || if (!block->bb_u.l.bb_leftsib ||
(block->bb_u.l.bb_leftsib != cpu_to_be64(NULLFSBLOCK) && (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; return false;
if (!block->bb_u.l.bb_rightsib || if (!block->bb_u.l.bb_rightsib ||
(block->bb_u.l.bb_rightsib != cpu_to_be64(NULLFSBLOCK) && (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 false;
return true; return true;

2
fs/xfs/libxfs/xfs_btree.c
View File

@@ -853,7 +853,7 @@ xfs_btree_read_bufl(
xfs_daddr_t d; /* real disk block address */ xfs_daddr_t d; /* real disk block address */
int error; int error;
if (!XFS_FSB_SANITY_CHECK(mp, fsbno)) if (!xfs_verify_fsbno(mp, fsbno))
return -EFSCORRUPTED; return -EFSCORRUPTED;
d = XFS_FSB_TO_DADDR(mp, fsbno); d = XFS_FSB_TO_DADDR(mp, fsbno);
error = xfs_trans_read_buf(mp, tp, mp->m_ddev_targp, d, error = xfs_trans_read_buf(mp, tp, mp->m_ddev_targp, d,

4
fs/xfs/libxfs/xfs_btree.h
View File

@@ -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_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_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 * Trace hooks. Currently not implemented as they need to be ported
* over to the generic tracing functionality, which is some effort. * over to the generic tracing functionality, which is some effort.