From: Dave Chinner <dchinner@redhat.com>
Date: Mon, 3 Aug 2015 22:36:45 +0000 (+1000)
Subject: libxfs: fix uuid check durign inode allocation
X-Git-Tag: v4.2.0-rc1~1^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=299c0388ab029b71750a13d2021c2eb5c50f1208;p=thirdparty%2Fxfsprogs-dev.git

libxfs: fix uuid check durign inode allocation

Needs to check sb_meta_uuid now that we the sb_uuid can change on v5
filesystems.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
---

diff --git a/libxfs/util.c b/libxfs/util.c
index 719a5b717..f427d22a7 100644
--- a/libxfs/util.c
+++ b/libxfs/util.c
@@ -262,7 +262,7 @@ libxfs_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;