Commit bbf155ad authored by Dave Chinner's avatar Dave Chinner Committed by Dave Chinner

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: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarEric Sandeen <sandeen@redhat.com>
Signed-off-by: default avatarDave Chinner <david@fromorbit.com>
parent c400ee3e
...@@ -787,7 +787,7 @@ xfs_ialloc( ...@@ -787,7 +787,7 @@ xfs_ialloc(
if (ip->i_d.di_version == 3) { if (ip->i_d.di_version == 3) {
ASSERT(ip->i_d.di_ino == ino); 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_crc = 0;
ip->i_d.di_changecount = 1; ip->i_d.di_changecount = 1;
ip->i_d.di_lsn = 0; ip->i_d.di_lsn = 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment