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_alloc_btree.c | |
| parent | 20b83944361908be78c941e0fb76d508124637ec (diff) | |
| parent | ce748eaa65f2e9392ba82726503c8d994ffd6393 (diff) | |
Merge branch 'xfs-meta-uuid' into for-next
Diffstat (limited to 'fs/xfs/libxfs/xfs_alloc_btree.c')
| -rw-r--r-- | fs/xfs/libxfs/xfs_alloc_btree.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/xfs/libxfs/xfs_alloc_btree.c b/fs/xfs/libxfs/xfs_alloc_btree.c index 59d521c09a17..90de071dd4c2 100644 --- a/fs/xfs/libxfs/xfs_alloc_btree.c +++ b/fs/xfs/libxfs/xfs_alloc_btree.c @@ -295,7 +295,7 @@ xfs_allocbt_verify( case cpu_to_be32(XFS_ABTB_CRC_MAGIC): if (!xfs_sb_version_hascrc(&mp->m_sb)) return false; - if (!uuid_equal(&block->bb_u.s.bb_uuid, &mp->m_sb.sb_uuid)) + if (!uuid_equal(&block->bb_u.s.bb_uuid, &mp->m_sb.sb_meta_uuid)) return false; if (block->bb_u.s.bb_blkno != cpu_to_be64(bp->b_bn)) return false; @@ -313,7 +313,7 @@ xfs_allocbt_verify( case cpu_to_be32(XFS_ABTC_CRC_MAGIC): if (!xfs_sb_version_hascrc(&mp->m_sb)) return false; - if (!uuid_equal(&block->bb_u.s.bb_uuid, &mp->m_sb.sb_uuid)) + if (!uuid_equal(&block->bb_u.s.bb_uuid, &mp->m_sb.sb_meta_uuid)) return false; if (block->bb_u.s.bb_blkno != cpu_to_be64(bp->b_bn)) return false; |