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_dir2_node.c | |
| parent | 20b83944361908be78c941e0fb76d508124637ec (diff) | |
| parent | ce748eaa65f2e9392ba82726503c8d994ffd6393 (diff) | |
| download | linux-5461ad99cab98d19f2570c468cdd6c42b6d66795.tar.bz2 | |
Merge branch 'xfs-meta-uuid' into for-next
Diffstat (limited to 'fs/xfs/libxfs/xfs_dir2_node.c')
| -rw-r--r-- | fs/xfs/libxfs/xfs_dir2_node.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/xfs/libxfs/xfs_dir2_node.c b/fs/xfs/libxfs/xfs_dir2_node.c index d68326a0d51c..6687489412a0 100644 --- a/fs/xfs/libxfs/xfs_dir2_node.c +++ b/fs/xfs/libxfs/xfs_dir2_node.c @@ -93,7 +93,7 @@ xfs_dir3_free_verify( if (hdr3->magic != cpu_to_be32(XFS_DIR3_FREE_MAGIC)) return false; - if (!uuid_equal(&hdr3->uuid, &mp->m_sb.sb_uuid)) + if (!uuid_equal(&hdr3->uuid, &mp->m_sb.sb_meta_uuid)) return false; if (be64_to_cpu(hdr3->blkno) != bp->b_bn) return false; @@ -226,7 +226,7 @@ xfs_dir3_free_get_buf( hdr3->hdr.blkno = cpu_to_be64(bp->b_bn); hdr3->hdr.owner = cpu_to_be64(dp->i_ino); - uuid_copy(&hdr3->hdr.uuid, &mp->m_sb.sb_uuid); + uuid_copy(&hdr3->hdr.uuid, &mp->m_sb.sb_meta_uuid); } else hdr.magic = XFS_DIR2_FREE_MAGIC; dp->d_ops->free_hdr_to_disk(bp->b_addr, &hdr); |