xfs
[Top] [All Lists]

Re: [PATCH] xfs: remove xfs_bmap_sanity_check()

To: Dave Chinner <david@xxxxxxxxxxxxx>
Subject: Re: [PATCH] xfs: remove xfs_bmap_sanity_check()
From: Carlos Maiolino <cmaiolino@xxxxxxxxxx>
Date: Wed, 25 Feb 2015 09:57:46 -0300
Cc: xfs@xxxxxxxxxxx
Delivered-to: xfs@xxxxxxxxxxx
In-reply-to: <1424846470-7623-1-git-send-email-david@xxxxxxxxxxxxx>
Mail-followup-to: Dave Chinner <david@xxxxxxxxxxxxx>, xfs@xxxxxxxxxxx
References: <1424846470-7623-1-git-send-email-david@xxxxxxxxxxxxx>
User-agent: Mutt/1.5.23 (2014-03-12)
Looks good to me, consider adding:

Reviewed-by: Carlos Maiolino <cmaiolino@xxxxxxxxxx>


On Wed, Feb 25, 2015 at 05:41:10PM +1100, Dave Chinner wrote:
> From: Dave Chinner <dchinner@xxxxxxxxxx>
> 
> 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@xxxxxxxxxx>
> ---
>  fs/xfs/libxfs/xfs_bmap.c | 32 --------------------------------
>  1 file changed, 32 deletions(-)
> 
> diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
> index 8ae3775..b872e9c 100644
> --- a/fs/xfs/libxfs/xfs_bmap.c
> +++ b/fs/xfs/libxfs/xfs_bmap.c
> @@ -244,30 +244,6 @@ xfs_bmap_forkoff_reset(
>       }
>  }
>  
> -/*
> - * Debug/sanity checking code
> - */
> -
> -STATIC int
> -xfs_bmap_sanity_check(
> -     struct xfs_mount        *mp,
> -     struct xfs_buf          *bp,
> -     int                     level)
> -{
> -     struct xfs_btree_block  *block = XFS_BUF_TO_BLOCK(bp);
> -
> -     if (block->bb_magic != cpu_to_be32(XFS_BMAP_CRC_MAGIC) &&
> -         block->bb_magic != cpu_to_be32(XFS_BMAP_MAGIC))
> -             return 0;
> -
> -     if (be16_to_cpu(block->bb_level) != level ||
> -         be16_to_cpu(block->bb_numrecs) == 0 ||
> -         be16_to_cpu(block->bb_numrecs) > mp->m_bmap_dmxr[level != 0])
> -             return 0;
> -
> -     return 1;
> -}
> -
>  #ifdef DEBUG
>  STATIC struct xfs_buf *
>  xfs_bmap_get_bp(
> @@ -410,9 +386,6 @@ xfs_bmap_check_leaf_extents(
>                               goto error_norelse;
>               }
>               block = XFS_BUF_TO_BLOCK(bp);
> -             XFS_WANT_CORRUPTED_GOTO(mp,
> -                     xfs_bmap_sanity_check(mp, bp, level),
> -                     error0);
>               if (level == 0)
>                       break;
>  
> @@ -1312,8 +1285,6 @@ xfs_bmap_read_extents(
>               if (error)
>                       return error;
>               block = XFS_BUF_TO_BLOCK(bp);
> -             XFS_WANT_CORRUPTED_GOTO(mp,
> -                     xfs_bmap_sanity_check(mp, bp, level), error0);
>               if (level == 0)
>                       break;
>               pp = XFS_BMBT_PTR_ADDR(mp, block, 1, mp->m_bmap_dmxr[1]);
> @@ -1346,9 +1317,6 @@ xfs_bmap_read_extents(
>                               XFS_ERRLEVEL_LOW, ip->i_mount, block);
>                       goto error0;
>               }
> -             XFS_WANT_CORRUPTED_GOTO(mp,
> -                     xfs_bmap_sanity_check(mp, bp, 0),
> -                     error0);
>               /*
>                * Read-ahead the next leaf block, if any.
>                */
> -- 
> 2.0.0
> 
> _______________________________________________
> xfs mailing list
> xfs@xxxxxxxxxxx
> http://oss.sgi.com/mailman/listinfo/xfs

-- 
Carlos

<Prev in Thread] Current Thread [Next in Thread>