diff options
| author | Dave Chinner <dchinner@redhat.com> | 2016-08-26 16:01:30 +1000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-09-15 08:20:27 +0200 |
| commit | 2a2abe885a29d7133a4bf6ad6e84e80031ecd7ca (patch) | |
| tree | 46dd594f1115143ecc1fd7c6318326c0d4d9bd1a /fs | |
| parent | e227de882e47a2c23dc3b13d93ab4289cd29e179 (diff) | |
| download | linux-stable-2a2abe885a29d7133a4bf6ad6e84e80031ecd7ca.tar.gz linux-stable-2a2abe885a29d7133a4bf6ad6e84e80031ecd7ca.tar.bz2 linux-stable-2a2abe885a29d7133a4bf6ad6e84e80031ecd7ca.zip | |
xfs: fix superblock inprogress check
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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 12ca86778e02..85bdf3de2360 100644 --- a/fs/xfs/libxfs/xfs_sb.c +++ b/fs/xfs/libxfs/xfs_sb.c @@ -581,7 +581,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); } |