Blame SOURCES/xfsprogs-4.15.0-xfs_copy-accept-CRC-version-of-ABTB_MAGIC-in-ASSERT.patch

e59f31
From d0ca5d8a3875a423b522ee9767cbeb3d47bed420 Mon Sep 17 00:00:00 2001
e59f31
From: Eric Sandeen <sandeen@redhat.com>
e59f31
Date: Thu, 25 Jan 2018 13:55:01 -0600
e59f31
Subject: [PATCH] xfs_copy: accept CRC version of ABTB_MAGIC in ASSERT
e59f31
e59f31
Not sure how this was missed for so long, but to handle CRC
e59f31
filesystems, this ASSERT on block magic must accept CRC magic
e59f31
as well.
e59f31
e59f31
Reported-by: Radek Burkat <radek@pinkbike.com>
e59f31
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
e59f31
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
e59f31
Reviewed-by: Bill O'Donnell <billodo@redhat.com>
e59f31
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
e59f31
---
e59f31
 copy/xfs_copy.c | 3 ++-
e59f31
 1 file changed, 2 insertions(+), 1 deletion(-)
e59f31
e59f31
diff --git a/copy/xfs_copy.c b/copy/xfs_copy.c
e59f31
index fb37375..16ee4d9 100644
e59f31
--- a/copy/xfs_copy.c
e59f31
+++ b/copy/xfs_copy.c
e59f31
@@ -1140,7 +1140,8 @@ main(int argc, char **argv)
e59f31
 				 ((char *) btree_buf.data +
e59f31
 				  pos - btree_buf.position);
e59f31
 
e59f31
-			ASSERT(be32_to_cpu(block->bb_magic) == XFS_ABTB_MAGIC);
e59f31
+			ASSERT(be32_to_cpu(block->bb_magic) == XFS_ABTB_MAGIC ||
e59f31
+			       be32_to_cpu(block->bb_magic) == XFS_ABTB_CRC_MAGIC);
e59f31
 		}
e59f31
 
e59f31
 		/*
e59f31
-- 
e59f31
2.9.5
e59f31