xfs
[Top] [All Lists]

Re: [PATCH] xfs: fix superblock inprogress check

To: Dave Chinner <david@xxxxxxxxxxxxx>
Subject: Re: [PATCH] xfs: fix superblock inprogress check
From: Brian Foster <bfoster@xxxxxxxxxx>
Date: Wed, 24 Aug 2016 14:07:38 -0400
Cc: linux-xfs@xxxxxxxxxxxxxxx, xfs@xxxxxxxxxxx
Delivered-to: xfs@xxxxxxxxxxx
In-reply-to: <1471844367-9679-1-git-send-email-david@xxxxxxxxxxxxx>
References: <1471844367-9679-1-git-send-email-david@xxxxxxxxxxxxx>
User-agent: Mutt/1.6.2 (2016-07-01)
On Mon, Aug 22, 2016 at 03:39:27PM +1000, Dave Chinner wrote:
> From: Dave Chinner <dchinner@xxxxxxxxxx>
> 
> From inspection, the superblock sb_inprogress check is done in the
> verifier and triggered only for the primary superblock via a
> "bp->b_bn == XFS_SB_DADDR" check.
> 
> Unfortunately, the primary superblock is an uncached buffer, and
> hence it is configured by xfs_buf_read_uncached() with:
> 
>       bp->b_bn = XFS_BUF_DADDR_NULL;  /* always null for uncached buffers */
> 
> And so this check never triggers. Fix it.
> 
> Signed-off-by: Dave Chinner <dchinner@xxxxxxxxxx>
> ---

Reviewed-by: Brian Foster <bfoster@xxxxxxxxxx>

>  fs/xfs/libxfs/xfs_sb.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/fs/xfs/libxfs/xfs_sb.c b/fs/xfs/libxfs/xfs_sb.c
> index 0e3d4f5..4aecc5f 100644
> --- a/fs/xfs/libxfs/xfs_sb.c
> +++ b/fs/xfs/libxfs/xfs_sb.c
> @@ -583,7 +583,8 @@ xfs_sb_verify(
>        * Only check the in progress field for the primary superblock as
>        * mkfs.xfs doesn't clear it from secondary superblocks.
>        */
> -     return xfs_mount_validate_sb(mp, &sb, bp->b_bn == XFS_SB_DADDR,
> +     return xfs_mount_validate_sb(mp, &sb,
> +                                  bp->b_maps[0].bm_bn == XFS_SB_DADDR,
>                                    check_version);
>  }
>  
> -- 
> 2.8.0.rc3
> 
> _______________________________________________
> xfs mailing list
> xfs@xxxxxxxxxxx
> http://oss.sgi.com/mailman/listinfo/xfs

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