lkml.org 
[lkml]   [2017]   [Feb]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.10 158/319] xfs: fix superblock inprogress check
    Date
    From: Dave Chinner <dchinner@redhat.com>

    commit f3d7ebdeb2c297bd26272384e955033493ca291c upstream.

    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@redhat.com>
    Reviewed-by: Brian Foster <bfoster@redhat.com>
    Reviewed-by: Christoph Hellwig <hch@lst.de>
    Signed-off-by: Dave Chinner <david@fromorbit.com>
    [wt: s/xfs_sb.c/xfs_mount.c in 3.10]

    Signed-off-by: Willy Tarreau <w@1wt.eu>
    ---
    fs/xfs/xfs_mount.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c
    index e8e310c..363c4cc 100644
    --- a/fs/xfs/xfs_mount.c
    +++ b/fs/xfs/xfs_mount.c
    @@ -689,7 +689,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.rc2.1.gbe9624a
    \
     
     \ /
      Last update: 2017-02-05 20:41    [W:2.076 / U:0.236 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site