diff options
| author | Dave Chinner <dchinner@redhat.com> | 2015-08-19 10:31:18 +1000 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2015-08-19 10:31:18 +1000 |
| commit | bbf155add09e1f0179eca89e0999cf28d335ca0a (patch) | |
| tree | 5e5b0d7f703d65a34d5cc1994e8c4e5b2ab209ac | |
| parent | c400ee3ed1b13d45adde68e12254dc6ab6977b59 (diff) | |
| download | linux-bbf155add09e1f0179eca89e0999cf28d335ca0a.tar.bz2 | |
xfs: fix sb_meta_uuid usage
After changing the UUID on a v5 filesystem, xfstests fails
immediately on a debug kernel with:
XFS: Assertion failed: uuid_equal(&ip->i_d.di_uuid, &mp->m_sb.sb_uuid), file: fs/xfs/xfs_inode.c, line: 799
This needs to check against the sb_meta_uuid, not the user visible
UUID that was changed.
Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
| -rw-r--r-- | fs/xfs/xfs_inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c index 3da9f4da4f3d..3e343c7f347a 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c @@ -787,7 +787,7 @@ xfs_ialloc( if (ip->i_d.di_version == 3) { ASSERT(ip->i_d.di_ino == ino); - ASSERT(uuid_equal(&ip->i_d.di_uuid, &mp->m_sb.sb_uuid)); + ASSERT(uuid_equal(&ip->i_d.di_uuid, &mp->m_sb.sb_meta_uuid)); ip->i_d.di_crc = 0; ip->i_d.di_changecount = 1; ip->i_d.di_lsn = 0; |