diff options
Diffstat (limited to 'fs/xfs/libxfs/xfs_btree.c')
| -rw-r--r-- | fs/xfs/libxfs/xfs_btree.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/fs/xfs/libxfs/xfs_btree.c b/fs/xfs/libxfs/xfs_btree.c index 81cad433df85..c72283dd8d44 100644 --- a/fs/xfs/libxfs/xfs_btree.c +++ b/fs/xfs/libxfs/xfs_btree.c | |||
| @@ -168,7 +168,7 @@ xfs_btree_check_lptr( | |||
| 168 | xfs_fsblock_t bno, /* btree block disk address */ | 168 | xfs_fsblock_t bno, /* btree block disk address */ |
| 169 | int level) /* btree block level */ | 169 | int level) /* btree block level */ |
| 170 | { | 170 | { |
| 171 | XFS_WANT_CORRUPTED_RETURN( | 171 | XFS_WANT_CORRUPTED_RETURN(cur->bc_mp, |
| 172 | level > 0 && | 172 | level > 0 && |
| 173 | bno != NULLFSBLOCK && | 173 | bno != NULLFSBLOCK && |
| 174 | XFS_FSB_SANITY_CHECK(cur->bc_mp, bno)); | 174 | XFS_FSB_SANITY_CHECK(cur->bc_mp, bno)); |
| @@ -187,7 +187,7 @@ xfs_btree_check_sptr( | |||
| 187 | { | 187 | { |
| 188 | xfs_agblock_t agblocks = cur->bc_mp->m_sb.sb_agblocks; | 188 | xfs_agblock_t agblocks = cur->bc_mp->m_sb.sb_agblocks; |
| 189 | 189 | ||
| 190 | XFS_WANT_CORRUPTED_RETURN( | 190 | XFS_WANT_CORRUPTED_RETURN(cur->bc_mp, |
| 191 | level > 0 && | 191 | level > 0 && |
| 192 | bno != NULLAGBLOCK && | 192 | bno != NULLAGBLOCK && |
| 193 | bno != 0 && | 193 | bno != 0 && |
| @@ -1825,7 +1825,7 @@ xfs_btree_lookup( | |||
| 1825 | error = xfs_btree_increment(cur, 0, &i); | 1825 | error = xfs_btree_increment(cur, 0, &i); |
| 1826 | if (error) | 1826 | if (error) |
| 1827 | goto error0; | 1827 | goto error0; |
| 1828 | XFS_WANT_CORRUPTED_RETURN(i == 1); | 1828 | XFS_WANT_CORRUPTED_RETURN(cur->bc_mp, i == 1); |
| 1829 | XFS_BTREE_TRACE_CURSOR(cur, XBT_EXIT); | 1829 | XFS_BTREE_TRACE_CURSOR(cur, XBT_EXIT); |
| 1830 | *stat = 1; | 1830 | *stat = 1; |
| 1831 | return 0; | 1831 | return 0; |
| @@ -2285,7 +2285,7 @@ xfs_btree_rshift( | |||
| 2285 | if (error) | 2285 | if (error) |
| 2286 | goto error0; | 2286 | goto error0; |
| 2287 | i = xfs_btree_lastrec(tcur, level); | 2287 | i = xfs_btree_lastrec(tcur, level); |
| 2288 | XFS_WANT_CORRUPTED_GOTO(i == 1, error0); | 2288 | XFS_WANT_CORRUPTED_GOTO(cur->bc_mp, i == 1, error0); |
| 2289 | 2289 | ||
| 2290 | error = xfs_btree_increment(tcur, level, &i); | 2290 | error = xfs_btree_increment(tcur, level, &i); |
| 2291 | if (error) | 2291 | if (error) |
| @@ -3138,7 +3138,7 @@ xfs_btree_insert( | |||
| 3138 | goto error0; | 3138 | goto error0; |
| 3139 | } | 3139 | } |
| 3140 | 3140 | ||
| 3141 | XFS_WANT_CORRUPTED_GOTO(i == 1, error0); | 3141 | XFS_WANT_CORRUPTED_GOTO(cur->bc_mp, i == 1, error0); |
| 3142 | level++; | 3142 | level++; |
| 3143 | 3143 | ||
| 3144 | /* | 3144 | /* |
| @@ -3582,15 +3582,15 @@ xfs_btree_delrec( | |||
| 3582 | * Actually any entry but the first would suffice. | 3582 | * Actually any entry but the first would suffice. |
| 3583 | */ | 3583 | */ |
| 3584 | i = xfs_btree_lastrec(tcur, level); | 3584 | i = xfs_btree_lastrec(tcur, level); |
| 3585 | XFS_WANT_CORRUPTED_GOTO(i == 1, error0); | 3585 | XFS_WANT_CORRUPTED_GOTO(cur->bc_mp, i == 1, error0); |
| 3586 | 3586 | ||
| 3587 | error = xfs_btree_increment(tcur, level, &i); | 3587 | error = xfs_btree_increment(tcur, level, &i); |
| 3588 | if (error) | 3588 | if (error) |
| 3589 | goto error0; | 3589 | goto error0; |
| 3590 | XFS_WANT_CORRUPTED_GOTO(i == 1, error0); | 3590 | XFS_WANT_CORRUPTED_GOTO(cur->bc_mp, i == 1, error0); |
| 3591 | 3591 | ||
| 3592 | i = xfs_btree_lastrec(tcur, level); | 3592 | i = xfs_btree_lastrec(tcur, level); |
| 3593 | XFS_WANT_CORRUPTED_GOTO(i == 1, error0); | 3593 | XFS_WANT_CORRUPTED_GOTO(cur->bc_mp, i == 1, error0); |
| 3594 | 3594 | ||
| 3595 | /* Grab a pointer to the block. */ | 3595 | /* Grab a pointer to the block. */ |
| 3596 | right = xfs_btree_get_block(tcur, level, &rbp); | 3596 | right = xfs_btree_get_block(tcur, level, &rbp); |
| @@ -3634,12 +3634,12 @@ xfs_btree_delrec( | |||
| 3634 | rrecs = xfs_btree_get_numrecs(right); | 3634 | rrecs = xfs_btree_get_numrecs(right); |
| 3635 | if (!xfs_btree_ptr_is_null(cur, &lptr)) { | 3635 | if (!xfs_btree_ptr_is_null(cur, &lptr)) { |
| 3636 | i = xfs_btree_firstrec(tcur, level); | 3636 | i = xfs_btree_firstrec(tcur, level); |
| 3637 | XFS_WANT_CORRUPTED_GOTO(i == 1, error0); | 3637 | XFS_WANT_CORRUPTED_GOTO(cur->bc_mp, i == 1, error0); |
| 3638 | 3638 | ||
| 3639 | error = xfs_btree_decrement(tcur, level, &i); | 3639 | error = xfs_btree_decrement(tcur, level, &i); |
| 3640 | if (error) | 3640 | if (error) |
| 3641 | goto error0; | 3641 | goto error0; |
| 3642 | XFS_WANT_CORRUPTED_GOTO(i == 1, error0); | 3642 | XFS_WANT_CORRUPTED_GOTO(cur->bc_mp, i == 1, error0); |
| 3643 | } | 3643 | } |
| 3644 | } | 3644 | } |
| 3645 | 3645 | ||
| @@ -3653,13 +3653,13 @@ xfs_btree_delrec( | |||
| 3653 | * previous block. | 3653 | * previous block. |
| 3654 | */ | 3654 | */ |
| 3655 | i = xfs_btree_firstrec(tcur, level); | 3655 | i = xfs_btree_firstrec(tcur, level); |
| 3656 | XFS_WANT_CORRUPTED_GOTO(i == 1, error0); | 3656 | XFS_WANT_CORRUPTED_GOTO(cur->bc_mp, i == 1, error0); |
| 3657 | 3657 | ||
| 3658 | error = xfs_btree_decrement(tcur, level, &i); | 3658 | error = xfs_btree_decrement(tcur, level, &i); |
| 3659 | if (error) | 3659 | if (error) |
| 3660 | goto error0; | 3660 | goto error0; |
| 3661 | i = xfs_btree_firstrec(tcur, level); | 3661 | i = xfs_btree_firstrec(tcur, level); |
| 3662 | XFS_WANT_CORRUPTED_GOTO(i == 1, error0); | 3662 | XFS_WANT_CORRUPTED_GOTO(cur->bc_mp, i == 1, error0); |
| 3663 | 3663 | ||
| 3664 | /* Grab a pointer to the block. */ | 3664 | /* Grab a pointer to the block. */ |
| 3665 | left = xfs_btree_get_block(tcur, level, &lbp); | 3665 | left = xfs_btree_get_block(tcur, level, &lbp); |
