diff options
| author | Dave Chinner <dchinner@redhat.com> | 2016-08-26 16:01:30 +1000 |
|---|---|---|
| committer | Sasha Levin <alexander.levin@verizon.com> | 2016-09-12 20:41:16 -0400 |
| commit | 4ff77f223a63b18745c4a202970682f138d056cc (patch) | |
| tree | f8710a143531d062c0bd1d9f2a053db6a86f97fa /fs | |
| parent | b735daae7a6afccbdd2338f11d818dfaac2e9fef (diff) | |
| download | lwn-4ff77f223a63b18745c4a202970682f138d056cc.tar.gz lwn-4ff77f223a63b18745c4a202970682f138d056cc.zip | |
xfs: fix superblock inprogress check
[ Upstream commit f3d7ebdeb2c297bd26272384e955033493ca291c ]
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: 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>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/xfs/libxfs/xfs_sb.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/xfs/libxfs/xfs_sb.c b/fs/xfs/libxfs/xfs_sb.c index acfcdc625aca..0c95d77bd8e1 100644 --- a/fs/xfs/libxfs/xfs_sb.c +++ b/fs/xfs/libxfs/xfs_sb.c @@ -606,7 +606,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); } |