diff options
author | Dave Chinner <dchinner@redhat.com> | 2015-03-24 23:53:48 -0400 |
---|---|---|
committer | Dave Chinner <david@fromorbit.com> | 2015-03-24 23:53:48 -0400 |
commit | d64588ca28bcd58f100f7933d0c18c8b504162bb (patch) | |
tree | 8dad5dd17067d857810c6259d83a24caf781d501 /fs/xfs | |
parent | 964aa8d9e4d36e0e54a88683d14c7d5b9d02aed8 (diff) |
xfs: remove xfs_bmap_sanity_check()
This code is redundant now that we have verifiers that sanity check
the buffers as they are read from disk.
Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Carlos Maiolino <cmaiolino@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
Diffstat (limited to 'fs/xfs')
-rw-r--r-- | fs/xfs/libxfs/xfs_bmap.c | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c index b8e97fd0bac1..990595548958 100644 --- a/fs/xfs/libxfs/xfs_bmap.c +++ b/fs/xfs/libxfs/xfs_bmap.c | |||
@@ -244,30 +244,6 @@ xfs_bmap_forkoff_reset( | |||
244 | } | 244 | } |
245 | } | 245 | } |
246 | 246 | ||
247 | /* | ||
248 | * Debug/sanity checking code | ||
249 | */ | ||
250 | |||
251 | STATIC int | ||
252 | xfs_bmap_sanity_check( | ||
253 | struct xfs_mount *mp, | ||
254 | struct xfs_buf *bp, | ||
255 | int level) | ||
256 | { | ||
257 | struct xfs_btree_block *block = XFS_BUF_TO_BLOCK(bp); | ||
258 | |||
259 | if (block->bb_magic != cpu_to_be32(XFS_BMAP_CRC_MAGIC) && | ||
260 | block->bb_magic != cpu_to_be32(XFS_BMAP_MAGIC)) | ||
261 | return 0; | ||
262 | |||
263 | if (be16_to_cpu(block->bb_level) != level || | ||
264 | be16_to_cpu(block->bb_numrecs) == 0 || | ||
265 | be16_to_cpu(block->bb_numrecs) > mp->m_bmap_dmxr[level != 0]) | ||
266 | return 0; | ||
267 | |||
268 | return 1; | ||
269 | } | ||
270 | |||
271 | #ifdef DEBUG | 247 | #ifdef DEBUG |
272 | STATIC struct xfs_buf * | 248 | STATIC struct xfs_buf * |
273 | xfs_bmap_get_bp( | 249 | xfs_bmap_get_bp( |
@@ -410,9 +386,6 @@ xfs_bmap_check_leaf_extents( | |||
410 | goto error_norelse; | 386 | goto error_norelse; |
411 | } | 387 | } |
412 | block = XFS_BUF_TO_BLOCK(bp); | 388 | block = XFS_BUF_TO_BLOCK(bp); |
413 | XFS_WANT_CORRUPTED_GOTO( | ||
414 | xfs_bmap_sanity_check(mp, bp, level), | ||
415 | error0); | ||
416 | if (level == 0) | 389 | if (level == 0) |
417 | break; | 390 | break; |
418 | 391 | ||
@@ -1311,9 +1284,6 @@ xfs_bmap_read_extents( | |||
1311 | if (error) | 1284 | if (error) |
1312 | return error; | 1285 | return error; |
1313 | block = XFS_BUF_TO_BLOCK(bp); | 1286 | block = XFS_BUF_TO_BLOCK(bp); |
1314 | XFS_WANT_CORRUPTED_GOTO( | ||
1315 | xfs_bmap_sanity_check(mp, bp, level), | ||
1316 | error0); | ||
1317 | if (level == 0) | 1287 | if (level == 0) |
1318 | break; | 1288 | break; |
1319 | pp = XFS_BMBT_PTR_ADDR(mp, block, 1, mp->m_bmap_dmxr[1]); | 1289 | pp = XFS_BMBT_PTR_ADDR(mp, block, 1, mp->m_bmap_dmxr[1]); |
@@ -1345,9 +1315,6 @@ xfs_bmap_read_extents( | |||
1345 | XFS_ERRLEVEL_LOW, ip->i_mount, block); | 1315 | XFS_ERRLEVEL_LOW, ip->i_mount, block); |
1346 | goto error0; | 1316 | goto error0; |
1347 | } | 1317 | } |
1348 | XFS_WANT_CORRUPTED_GOTO( | ||
1349 | xfs_bmap_sanity_check(mp, bp, 0), | ||
1350 | error0); | ||
1351 | /* | 1318 | /* |
1352 | * Read-ahead the next leaf block, if any. | 1319 | * Read-ahead the next leaf block, if any. |
1353 | */ | 1320 | */ |