diff options
| author | Dave Chinner <david@fromorbit.com> | 2015-07-29 11:54:21 +1000 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2015-07-29 11:54:21 +1000 |
| commit | 5461ad99cab98d19f2570c468cdd6c42b6d66795 (patch) | |
| tree | 7050a1529a6da548bc17d93c866e5a4ddd167f48 /fs/xfs/libxfs/xfs_bmap_btree.c | |
| parent | 20b83944361908be78c941e0fb76d508124637ec (diff) | |
| parent | ce748eaa65f2e9392ba82726503c8d994ffd6393 (diff) | |
| download | linux-5461ad99cab98d19f2570c468cdd6c42b6d66795.tar.gz linux-5461ad99cab98d19f2570c468cdd6c42b6d66795.tar.bz2 linux-5461ad99cab98d19f2570c468cdd6c42b6d66795.zip | |
Merge branch 'xfs-meta-uuid' into for-next
Diffstat (limited to 'fs/xfs/libxfs/xfs_bmap_btree.c')
| -rw-r--r-- | fs/xfs/libxfs/xfs_bmap_btree.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/xfs/libxfs/xfs_bmap_btree.c b/fs/xfs/libxfs/xfs_bmap_btree.c index 2c44c8e50782..6b0cf6546a82 100644 --- a/fs/xfs/libxfs/xfs_bmap_btree.c +++ b/fs/xfs/libxfs/xfs_bmap_btree.c @@ -349,7 +349,8 @@ xfs_bmbt_to_bmdr( if (xfs_sb_version_hascrc(&mp->m_sb)) { ASSERT(rblock->bb_magic == cpu_to_be32(XFS_BMAP_CRC_MAGIC)); - ASSERT(uuid_equal(&rblock->bb_u.l.bb_uuid, &mp->m_sb.sb_uuid)); + ASSERT(uuid_equal(&rblock->bb_u.l.bb_uuid, + &mp->m_sb.sb_meta_uuid)); ASSERT(rblock->bb_u.l.bb_blkno == cpu_to_be64(XFS_BUF_DADDR_NULL)); } else @@ -647,7 +648,7 @@ xfs_bmbt_verify( case cpu_to_be32(XFS_BMAP_CRC_MAGIC): if (!xfs_sb_version_hascrc(&mp->m_sb)) return false; - if (!uuid_equal(&block->bb_u.l.bb_uuid, &mp->m_sb.sb_uuid)) + if (!uuid_equal(&block->bb_u.l.bb_uuid, &mp->m_sb.sb_meta_uuid)) return false; if (be64_to_cpu(block->bb_u.l.bb_blkno) != bp->b_bn) return false; |