xfs
[Top] [All Lists]

[PATCH 1/4] xfs: fix sb_meta_uuid usage

To: xfs@xxxxxxxxxxx
Subject: [PATCH 1/4] xfs: fix sb_meta_uuid usage
From: Dave Chinner <david@xxxxxxxxxxxxx>
Date: Mon, 3 Aug 2015 17:40:22 +1000
Delivered-to: xfs@xxxxxxxxxxx
In-reply-to: <1438587625-31437-1-git-send-email-david@xxxxxxxxxxxxx>
References: <1438587625-31437-1-git-send-email-david@xxxxxxxxxxxxx>
From: Dave Chinner <dchinner@xxxxxxxxxx>

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@xxxxxxxxxx>
---
 fs/xfs/xfs_inode.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
index fb52ff0..4156e37 100644
--- a/fs/xfs/xfs_inode.c
+++ b/fs/xfs/xfs_inode.c
@@ -796,7 +796,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;
-- 
2.1.4

<Prev in Thread] Current Thread [Next in Thread>