Commit f3d7ebde authored by Dave Chinner's avatar Dave Chinner Committed by Dave Chinner

xfs: fix superblock inprogress check

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.

cc: <stable@vger.kernel.org>
Signed-off-by: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarDave Chinner <david@fromorbit.com>
parent 5b5c2dbd
...@@ -583,7 +583,8 @@ xfs_sb_verify( ...@@ -583,7 +583,8 @@ xfs_sb_verify(
* Only check the in progress field for the primary superblock as * Only check the in progress field for the primary superblock as
* mkfs.xfs doesn't clear it from secondary superblocks. * 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); check_version);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment