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_attr_remote.c | |
| parent | Merge branch 'xfs-misc-fixes-for-4.3' into for-next (diff) | |
| parent | xfs: create new metadata UUID field and incompat flag (diff) | |
| download | linux-dev-5461ad99cab98d19f2570c468cdd6c42b6d66795.tar.xz linux-dev-5461ad99cab98d19f2570c468cdd6c42b6d66795.zip | |
Merge branch 'xfs-meta-uuid' into for-next
Diffstat (limited to 'fs/xfs/libxfs/xfs_attr_remote.c')
| -rw-r--r-- | fs/xfs/libxfs/xfs_attr_remote.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/xfs/libxfs/xfs_attr_remote.c b/fs/xfs/libxfs/xfs_attr_remote.c index 89356aa786ed..f38f9bd81557 100644 --- a/fs/xfs/libxfs/xfs_attr_remote.c +++ b/fs/xfs/libxfs/xfs_attr_remote.c @@ -100,7 +100,7 @@ xfs_attr3_rmt_verify( return false; if (rmt->rm_magic != cpu_to_be32(XFS_ATTR3_RMT_MAGIC)) return false; - if (!uuid_equal(&rmt->rm_uuid, &mp->m_sb.sb_uuid)) + if (!uuid_equal(&rmt->rm_uuid, &mp->m_sb.sb_meta_uuid)) return false; if (be64_to_cpu(rmt->rm_blkno) != bno) return false; @@ -222,7 +222,7 @@ xfs_attr3_rmt_hdr_set( rmt->rm_magic = cpu_to_be32(XFS_ATTR3_RMT_MAGIC); rmt->rm_offset = cpu_to_be32(offset); rmt->rm_bytes = cpu_to_be32(size); - uuid_copy(&rmt->rm_uuid, &mp->m_sb.sb_uuid); + uuid_copy(&rmt->rm_uuid, &mp->m_sb.sb_meta_uuid); rmt->rm_owner = cpu_to_be64(ino); rmt->rm_blkno = cpu_to_be64(bno); |