Re: [PATCH 1/2] xfs: skip scrub xref if corruption already noted

[Dave Chinner <david@fromorbit.com>]

On Mon, Apr 02, 2018 at 12:55:36PM -0700, Darrick J. Wong wrote:
> From: Darrick J. Wong <darrick.wong@oracle.com>
> 
> Don't bother looking for cross-referencing problems if the metadata is
> already corrupt or we've already found a cross-referencing problem.
> 
> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> ---
>  fs/xfs/scrub/alloc.c    |    4 +++-
>  fs/xfs/scrub/common.c   |    5 +++++
>  fs/xfs/scrub/ialloc.c   |    4 +++-
>  fs/xfs/scrub/refcount.c |    8 ++++++--
>  fs/xfs/scrub/rmap.c     |    8 ++++++--
>  fs/xfs/scrub/rtbitmap.c |    4 ++++
>  6 files changed, 27 insertions(+), 6 deletions(-)
> 
> 
> diff --git a/fs/xfs/scrub/alloc.c b/fs/xfs/scrub/alloc.c
> index 517c079..096bc53 100644
> --- a/fs/xfs/scrub/alloc.c
> +++ b/fs/xfs/scrub/alloc.c
> @@ -172,7 +172,9 @@ xfs_scrub_xref_is_used_space(
>  	bool				is_freesp;
>  	int				error;
>  
> -	if (!sc->sa.bno_cur)
> +	if (!sc->sa.bno_cur ||
> +	    (sc->sm->sm_flags & (XFS_SCRUB_OFLAG_CORRUPT |
> +				 XFS_SCRUB_OFLAG_XCORRUPT)))

Can you put this check in a static inline?

	if (xfs_scrub_object_is_corrupt(sc))
		return;

Looks a bunch neater here.

Otherwise it looks fine.

-Dave.
-- 
Dave Chinner
david@fromorbit.com